From 82ab953ed8d2dbf723d6f4ae3fce3607f4bddd9e Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 10 Dec 2019 20:36:44 +0100
Subject: [PATCH] S/MIME section

---
 .../res/layout/fragment_options_privacy.xml   | 26 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index b564203ba5..b467b08673 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -229,6 +229,29 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBiometricsTimeout" />
 
+        <View
+            android:id="@+id/vSeparatorSmime"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="12dp"
+            android:background="?attr/colorSeparator"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/spBiometricsTimeout" />
+
+        <TextView
+            android:id="@+id/tvSmime"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="48dp"
+            android:text="@string/title_advanced_smime"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textColor="?android:attr/textColorPrimary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/vSeparatorSmime" />
+
         <Button
             android:id="@+id/btnManageCertificates"
             style="?android:attr/buttonStyleSmall"
@@ -239,7 +262,7 @@
             android:minHeight="0dp"
             android:text="@string/title_advanced_manage_certificates"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/spBiometricsTimeout" />
+            app:layout_constraintTop_toBottomOf="@id/tvSmime" />
 
         <Button
             android:id="@+id/btnImportKey"
@@ -269,6 +292,7 @@
             android:id="@+id/tvKeySize"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
             android:text="@string/title_advanced_aes_key_size"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc67cd7fad..0b39c20447 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -343,6 +343,7 @@
     <string name="title_advanced_secure">Hide from recent apps screen and prevent taking screenshots</string>
     <string name="title_advanced_pin">PIN</string>
     <string name="title_advanced_biometrics_timeout">Biometric authentication timeout</string>
+    <string name="title_advanced_smime" translatable="false">S/MIME</string>
     <string name="title_advanced_manage_certificates">Manage public keys</string>
     <string name="title_advanced_import_key">Import private key</string>
     <string name="title_advanced_manage_keys">Manage private keys</string>