From d9d673387823978803dd899502e1b8593c1ccb17 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sat, 23 Jan 2021 19:23:13 +0100
Subject: [PATCH] Improve preference organization and add summaries to the
 sections

---
 .../beemdevelopment/aegis/OverallTest.java    |   2 +-
 ...a => ImportExportPreferencesFragment.java} |   4 +-
 app/src/main/res/values-ar-rSA/strings.xml    |   6 +-
 app/src/main/res/values-cs-rCZ/strings.xml    |   6 +-
 app/src/main/res/values-de-rDE/strings.xml    |   6 +-
 app/src/main/res/values-el-rGR/strings.xml    |   6 +-
 app/src/main/res/values-es-rES/strings.xml    |   6 +-
 app/src/main/res/values-eu-rES/strings.xml    |   6 +-
 app/src/main/res/values-fa-rIR/strings.xml    |   6 +-
 app/src/main/res/values-fi-rFI/strings.xml    |   6 +-
 app/src/main/res/values-fr-rFR/strings.xml    |   6 +-
 app/src/main/res/values-hi-rIN/strings.xml    |   6 +-
 app/src/main/res/values-hu-rHU/strings.xml    |   6 +-
 app/src/main/res/values-in-rID/strings.xml    |   6 +-
 app/src/main/res/values-it-rIT/strings.xml    |   6 +-
 app/src/main/res/values-ja-rJP/strings.xml    |   6 +-
 app/src/main/res/values-kn-rIN/strings.xml    |   4 +-
 app/src/main/res/values-nl-rNL/strings.xml    |   6 +-
 app/src/main/res/values-pl-rPL/strings.xml    |   6 +-
 app/src/main/res/values-pt-rBR/strings.xml    |   6 +-
 app/src/main/res/values-pt-rPT/strings.xml    |   6 +-
 app/src/main/res/values-ro-rRO/strings.xml    |   6 +-
 app/src/main/res/values-ru-rRU/strings.xml    |   6 +-
 app/src/main/res/values-sk-rSK/strings.xml    |   6 +-
 app/src/main/res/values-tr-rTR/strings.xml    |   6 +-
 app/src/main/res/values-zh-rCN/strings.xml    |   6 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   6 +-
 app/src/main/res/values/strings.xml           |  19 ++-
 app/src/main/res/xml/preferences.xml          |  25 ++--
 .../main/res/xml/preferences_appearance.xml   |  80 ++++++-----
 app/src/main/res/xml/preferences_backups.xml  |  64 +++++----
 app/src/main/res/xml/preferences_behavior.xml |   2 +-
 ...ools.xml => preferences_import_export.xml} |   2 +-
 app/src/main/res/xml/preferences_security.xml | 133 ++++++++++--------
 34 files changed, 259 insertions(+), 220 deletions(-)
 rename app/src/main/java/com/beemdevelopment/aegis/ui/fragments/{ToolsPreferencesFragment.java => ImportExportPreferencesFragment.java} (99%)
 rename app/src/main/res/xml/{preferences_tools.xml => preferences_import_export.xml} (90%)

diff --git a/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java b/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java
index 7e585274..8c1b9c9f 100644
--- a/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java
+++ b/app/src/androidTest/java/com/beemdevelopment/aegis/OverallTest.java
@@ -127,7 +127,7 @@ public class OverallTest extends AegisTest {
 
         openContextualActionModeOverflowMenu();
         onView(withText(R.string.action_settings)).perform(click());
-        onView(withId(androidx.preference.R.id.recycler_view)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText(R.string.pref_security_group_title)), click()));
+        onView(withId(androidx.preference.R.id.recycler_view)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText(R.string.pref_section_security_title)), click()));
         onView(withId(androidx.preference.R.id.recycler_view)).perform(RecyclerViewActions.actionOnItem(hasDescendant(withText(R.string.pref_encryption_title)), click()));
         onView(withId(android.R.id.button1)).perform(click());
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/ToolsPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/ImportExportPreferencesFragment.java
similarity index 99%
rename from app/src/main/java/com/beemdevelopment/aegis/ui/fragments/ToolsPreferencesFragment.java
rename to app/src/main/java/com/beemdevelopment/aegis/ui/fragments/ImportExportPreferencesFragment.java
index 1dfab1ce..9330b3b8 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/ToolsPreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/ImportExportPreferencesFragment.java
@@ -51,7 +51,7 @@ import java.util.List;
 
 import javax.crypto.Cipher;
 
-public class ToolsPreferencesFragment extends PreferencesFragment {
+public class ImportExportPreferencesFragment extends PreferencesFragment {
     // keep a reference to the type of database converter the user selected
     private Class<? extends DatabaseImporter> _importerType;
     private AegisImporter.State _importerState;
@@ -60,7 +60,7 @@ public class ToolsPreferencesFragment extends PreferencesFragment {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         super.onCreatePreferences(savedInstanceState, rootKey);
-        addPreferencesFromResource(R.xml.preferences_tools);
+        addPreferencesFromResource(R.xml.preferences_import_export);
 
         Preference importPreference = findPreference("pref_import");
         importPreference.setOnPreferenceClickListener(preference -> {
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 4d76a9a0..96c59b3f 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">حفظ</string>
     <string name="issuer">المصدِّر</string>
     <string name="settings">التفضيلات</string>
-    <string name="pref_appearance_group_title">المظهر</string>
-    <string name="pref_security_group_title">الأمان</string>
+    <string name="pref_section_appearance_title">المظهر</string>
+    <string name="pref_section_security_title">الأمان</string>
     <string name="pref_tools_group_title">الأدوات</string>
-    <string name="pref_backups_group_title">النسخ الاحتياطي</string>
+    <string name="pref_section_backups_title">النسخ الاحتياطي</string>
     <string name="pref_select_theme_title">النمط</string>
     <string name="pref_view_mode_title">وضع العرض</string>
     <string name="pref_lang_title">اللغة</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 2d56823a..fc1db622 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Uložit</string>
     <string name="issuer">Poskytovatel</string>
     <string name="settings">Předvolby</string>
-    <string name="pref_appearance_group_title">Vzhled</string>
-    <string name="pref_security_group_title">Zabezpečení</string>
+    <string name="pref_section_appearance_title">Vzhled</string>
+    <string name="pref_section_security_title">Zabezpečení</string>
     <string name="pref_tools_group_title">Nástroje</string>
-    <string name="pref_backups_group_title">Zálohy</string>
+    <string name="pref_section_backups_title">Zálohy</string>
     <string name="pref_select_theme_title">Vzhled</string>
     <string name="pref_view_mode_title">Režim zobrazení</string>
     <string name="pref_lang_title">Jazyk</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 7f958cee..b2f2fbff 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Speichern</string>
     <string name="issuer">Herausgeber</string>
     <string name="settings">Einstellungen</string>
-    <string name="pref_appearance_group_title">Erscheinungsbild</string>
-    <string name="pref_security_group_title">Sicherheit</string>
+    <string name="pref_section_appearance_title">Erscheinungsbild</string>
+    <string name="pref_section_security_title">Sicherheit</string>
     <string name="pref_tools_group_title">Werkzeuge</string>
-    <string name="pref_backups_group_title">Sicherungskopien</string>
+    <string name="pref_section_backups_title">Sicherungskopien</string>
     <string name="pref_select_theme_title">Design</string>
     <string name="pref_view_mode_title">Ansichtsmodus</string>
     <string name="pref_lang_title">Sprache</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 731399ca..74fb8e40 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Αποθήκευση</string>
     <string name="issuer">Εκδότης</string>
     <string name="settings">Προτιμήσεις</string>
-    <string name="pref_appearance_group_title">Εμφάνιση</string>
-    <string name="pref_security_group_title">Ασφάλεια</string>
+    <string name="pref_section_appearance_title">Εμφάνιση</string>
+    <string name="pref_section_security_title">Ασφάλεια</string>
     <string name="pref_tools_group_title">Εργαλεία</string>
-    <string name="pref_backups_group_title">Αντίγραφα Ασφαλείας</string>
+    <string name="pref_section_backups_title">Αντίγραφα Ασφαλείας</string>
     <string name="pref_select_theme_title">Θέμα</string>
     <string name="pref_view_mode_title">Τρόπος προβολής</string>
     <string name="pref_lang_title">Γλώσσα</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index a8c7c8a8..181848da 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Guardar</string>
     <string name="issuer">Emisor</string>
     <string name="settings">Preferencias</string>
-    <string name="pref_appearance_group_title">Apariencia</string>
-    <string name="pref_security_group_title">Seguridad</string>
+    <string name="pref_section_appearance_title">Apariencia</string>
+    <string name="pref_section_security_title">Seguridad</string>
     <string name="pref_tools_group_title">Herramientas</string>
-    <string name="pref_backups_group_title">Copias de seguridad</string>
+    <string name="pref_section_backups_title">Copias de seguridad</string>
     <string name="pref_select_theme_title">Tema</string>
     <string name="pref_view_mode_title">Modo de visualización</string>
     <string name="pref_lang_title">Idioma</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 04114748..3a895978 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Gorde</string>
     <string name="issuer">Igorlea</string>
     <string name="settings">Hobespenak</string>
-    <string name="pref_appearance_group_title">Itxura</string>
-    <string name="pref_security_group_title">Segurtasuna</string>
+    <string name="pref_section_appearance_title">Itxura</string>
+    <string name="pref_section_security_title">Segurtasuna</string>
     <string name="pref_tools_group_title">Tresnak</string>
-    <string name="pref_backups_group_title">Segurtasun-kopiak</string>
+    <string name="pref_section_backups_title">Segurtasun-kopiak</string>
     <string name="pref_select_theme_title">Itxura</string>
     <string name="pref_view_mode_title">Ikuspegia</string>
     <string name="pref_lang_title">Hizkuntza</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index e71a4241..bcbe7710 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">ذخیره</string>
     <string name="issuer">صادر کننده</string>
     <string name="settings">تنظیمات</string>
-    <string name="pref_appearance_group_title">ظاهر</string>
-    <string name="pref_security_group_title">امنیت</string>
+    <string name="pref_section_appearance_title">ظاهر</string>
+    <string name="pref_section_security_title">امنیت</string>
     <string name="pref_tools_group_title">ابزارها</string>
-    <string name="pref_backups_group_title">پشتیبان گیری</string>
+    <string name="pref_section_backups_title">پشتیبان گیری</string>
     <string name="pref_select_theme_title">پوسته</string>
     <string name="pref_view_mode_title">حالت نمایش</string>
     <string name="pref_lang_title">زبان</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 921e2f65..212ad5d4 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Tallenna</string>
     <string name="issuer">Myöntäjä</string>
     <string name="settings">Asetukset</string>
-    <string name="pref_appearance_group_title">Ulkoasu</string>
-    <string name="pref_security_group_title">Turvallisuus</string>
+    <string name="pref_section_appearance_title">Ulkoasu</string>
+    <string name="pref_section_security_title">Turvallisuus</string>
     <string name="pref_tools_group_title">Työkalut</string>
-    <string name="pref_backups_group_title">Varmuuskopiot</string>
+    <string name="pref_section_backups_title">Varmuuskopiot</string>
     <string name="pref_select_theme_title">Teema</string>
     <string name="pref_view_mode_title">Näyttötila</string>
     <string name="pref_lang_title">Kieli</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index d717634c..816a8c4c 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Enregistrer</string>
     <string name="issuer">Émetteur</string>
     <string name="settings">Préférences</string>
-    <string name="pref_appearance_group_title">Apparence</string>
-    <string name="pref_security_group_title">Sécurité</string>
+    <string name="pref_section_appearance_title">Apparence</string>
+    <string name="pref_section_security_title">Sécurité</string>
     <string name="pref_tools_group_title">Outils</string>
-    <string name="pref_backups_group_title">Sauvegardes</string>
+    <string name="pref_section_backups_title">Sauvegardes</string>
     <string name="pref_select_theme_title">Thème</string>
     <string name="pref_view_mode_title">Mode d\'affichage</string>
     <string name="pref_lang_title">Langue</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 049999d2..5d2d579a 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">सहेजें</string>
     <string name="issuer">ज़ारीकर्ता</string>
     <string name="settings">वरीयताएँ</string>
-    <string name="pref_appearance_group_title">रंगरूप</string>
-    <string name="pref_security_group_title">सुरक्षा</string>
+    <string name="pref_section_appearance_title">रंगरूप</string>
+    <string name="pref_section_security_title">सुरक्षा</string>
     <string name="pref_tools_group_title">टूल्स</string>
-    <string name="pref_backups_group_title">बैकअप्स</string>
+    <string name="pref_section_backups_title">बैकअप्स</string>
     <string name="pref_select_theme_title">थीम</string>
     <string name="pref_view_mode_title">देखने का प्रकार</string>
     <string name="pref_lang_title">भाषा</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index e6abb9c8..35f8b6e5 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -9,10 +9,10 @@
     <string name="save">Mentés</string>
     <string name="issuer">Kibocsátó</string>
     <string name="settings">Beállítások</string>
-    <string name="pref_appearance_group_title">Megjelenés</string>
-    <string name="pref_security_group_title">Biztonság</string>
+    <string name="pref_section_appearance_title">Megjelenés</string>
+    <string name="pref_section_security_title">Biztonság</string>
     <string name="pref_tools_group_title">Eszközök</string>
-    <string name="pref_backups_group_title">Biztonsági mentések</string>
+    <string name="pref_section_backups_title">Biztonsági mentések</string>
     <string name="pref_select_theme_title">Téma</string>
     <string name="pref_view_mode_title">Nézetmód</string>
     <string name="pref_lang_title">Nyelv</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 1457dcd9..972effa5 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Simpan</string>
     <string name="issuer">Penerbit</string>
     <string name="settings">Pilihan</string>
-    <string name="pref_appearance_group_title">Tampilan</string>
-    <string name="pref_security_group_title">Keamanan</string>
+    <string name="pref_section_appearance_title">Tampilan</string>
+    <string name="pref_section_security_title">Keamanan</string>
     <string name="pref_tools_group_title">Alat</string>
-    <string name="pref_backups_group_title">Cadangan</string>
+    <string name="pref_section_backups_title">Cadangan</string>
     <string name="pref_select_theme_title">Tema</string>
     <string name="pref_view_mode_title">Mode tampilan</string>
     <string name="pref_lang_title">Bahasa</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index f3a2323d..5cd3d2de 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Salva</string>
     <string name="issuer">Emittente</string>
     <string name="settings">Impostazioni</string>
-    <string name="pref_appearance_group_title">Aspetto</string>
-    <string name="pref_security_group_title">Sicurezza</string>
+    <string name="pref_section_appearance_title">Aspetto</string>
+    <string name="pref_section_security_title">Sicurezza</string>
     <string name="pref_tools_group_title">Strumenti</string>
-    <string name="pref_backups_group_title">Backup</string>
+    <string name="pref_section_backups_title">Backup</string>
     <string name="pref_select_theme_title">Tema</string>
     <string name="pref_view_mode_title">Visualizzazione</string>
     <string name="pref_lang_title">Seleziona lingua</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 0fe352fe..be5e881f 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">保存</string>
     <string name="issuer">発行者</string>
     <string name="settings">設定</string>
-    <string name="pref_appearance_group_title">外観</string>
-    <string name="pref_security_group_title">セキュリティ</string>
+    <string name="pref_section_appearance_title">外観</string>
+    <string name="pref_section_security_title">セキュリティ</string>
     <string name="pref_tools_group_title">ツール</string>
-    <string name="pref_backups_group_title">バックアップ</string>
+    <string name="pref_section_backups_title">バックアップ</string>
     <string name="pref_select_theme_title">テーマ</string>
     <string name="pref_view_mode_title">表示モード</string>
     <string name="pref_lang_title">言語</string>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
index 360ba10c..0cd4c488 100644
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@@ -9,8 +9,8 @@
     <string name="save">ಉಳಿಸು</string>
     <string name="issuer">ನೀಡುವವರು</string>
     <string name="settings">ಸಿದ್ಢತೆಗಳು</string>
-    <string name="pref_appearance_group_title">ನೋಟ</string>
-    <string name="pref_security_group_title">ಭದ್ರತೆ</string>
+    <string name="pref_section_appearance_title">ನೋಟ</string>
+    <string name="pref_section_security_title">ಭದ್ರತೆ</string>
     <string name="pref_tools_group_title">ಉಪಕರಣಗಳು</string>
     <string name="pref_select_theme_title">ಥೀಮ್</string>
     <string name="pref_view_mode_title">ವೀಕ್ಷಣೆಯ ರೀತಿ</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 94a6f99b..250c9012 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Opslaan</string>
     <string name="issuer">Uitgever</string>
     <string name="settings">Voorkeuren</string>
-    <string name="pref_appearance_group_title">Uiterlijk</string>
-    <string name="pref_security_group_title">Beveiliging</string>
+    <string name="pref_section_appearance_title">Uiterlijk</string>
+    <string name="pref_section_security_title">Beveiliging</string>
     <string name="pref_tools_group_title">Hulpmiddelen</string>
-    <string name="pref_backups_group_title">Back-ups</string>
+    <string name="pref_section_backups_title">Back-ups</string>
     <string name="pref_select_theme_title">Thema</string>
     <string name="pref_view_mode_title">Weergavemodus</string>
     <string name="pref_lang_title">Taal</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index c2d52915..2e88ce08 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Zapisz</string>
     <string name="issuer">Wydawca</string>
     <string name="settings">Ustawienia</string>
-    <string name="pref_appearance_group_title">Wygląd</string>
-    <string name="pref_security_group_title">Bezpieczeństwo</string>
+    <string name="pref_section_appearance_title">Wygląd</string>
+    <string name="pref_section_security_title">Bezpieczeństwo</string>
     <string name="pref_tools_group_title">Narzędzia</string>
-    <string name="pref_backups_group_title">Kopie zapasowe</string>
+    <string name="pref_section_backups_title">Kopie zapasowe</string>
     <string name="pref_select_theme_title">Motyw</string>
     <string name="pref_view_mode_title">Tryb wyświetlania</string>
     <string name="pref_lang_title">Język</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index cc3b7298..172abe4e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Salvar</string>
     <string name="issuer">Nome do serviço</string>
     <string name="settings">Preferências</string>
-    <string name="pref_appearance_group_title">Aparência</string>
-    <string name="pref_security_group_title">Segurança</string>
+    <string name="pref_section_appearance_title">Aparência</string>
+    <string name="pref_section_security_title">Segurança</string>
     <string name="pref_tools_group_title">Ferramentas</string>
-    <string name="pref_backups_group_title">Backups</string>
+    <string name="pref_section_backups_title">Backups</string>
     <string name="pref_select_theme_title">Tema</string>
     <string name="pref_view_mode_title">Modo de exibição</string>
     <string name="pref_lang_title">Idioma</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 053c7fb5..775052ba 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Salvar</string>
     <string name="issuer">Emissor</string>
     <string name="settings">Preferências</string>
-    <string name="pref_appearance_group_title">Aparência</string>
-    <string name="pref_security_group_title">Segurança</string>
+    <string name="pref_section_appearance_title">Aparência</string>
+    <string name="pref_section_security_title">Segurança</string>
     <string name="pref_tools_group_title">Ferramentas</string>
-    <string name="pref_backups_group_title">Backups</string>
+    <string name="pref_section_backups_title">Backups</string>
     <string name="pref_select_theme_title">Tema</string>
     <string name="pref_view_mode_title">Modo de exibição</string>
     <string name="pref_lang_title">Idioma</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 23574ab8..c2c1242e 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Salvează</string>
     <string name="issuer">Emitent</string>
     <string name="settings">Preferințe</string>
-    <string name="pref_appearance_group_title">Aspect</string>
-    <string name="pref_security_group_title">Securitate</string>
+    <string name="pref_section_appearance_title">Aspect</string>
+    <string name="pref_section_security_title">Securitate</string>
     <string name="pref_tools_group_title">Unelte</string>
-    <string name="pref_backups_group_title">Copii de rezervă</string>
+    <string name="pref_section_backups_title">Copii de rezervă</string>
     <string name="pref_select_theme_title">Temă</string>
     <string name="pref_view_mode_title">Mod de vizualizare</string>
     <string name="pref_lang_title">Limbă</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 81dcf940..047d14b0 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Сохранить</string>
     <string name="issuer">Эмитент</string>
     <string name="settings">Предпочтения</string>
-    <string name="pref_appearance_group_title">Внешний вид</string>
-    <string name="pref_security_group_title">Безопасность</string>
+    <string name="pref_section_appearance_title">Внешний вид</string>
+    <string name="pref_section_security_title">Безопасность</string>
     <string name="pref_tools_group_title">Инструменты</string>
-    <string name="pref_backups_group_title">Резервные копии</string>
+    <string name="pref_section_backups_title">Резервные копии</string>
     <string name="pref_select_theme_title">Тема</string>
     <string name="pref_view_mode_title">Режим отображения</string>
     <string name="pref_lang_title">Язык</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index ca53eb04..33efcc60 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">Uložiť</string>
     <string name="issuer">Vydavateľ</string>
     <string name="settings">Predvoľby</string>
-    <string name="pref_appearance_group_title">Vzhľad</string>
-    <string name="pref_security_group_title">Zabezpečenie</string>
+    <string name="pref_section_appearance_title">Vzhľad</string>
+    <string name="pref_section_security_title">Zabezpečenie</string>
     <string name="pref_tools_group_title">Nástroje</string>
-    <string name="pref_backups_group_title">Zálohy</string>
+    <string name="pref_section_backups_title">Zálohy</string>
     <string name="pref_select_theme_title">Téma</string>
     <string name="pref_view_mode_title">Režim zobrazenia</string>
     <string name="pref_lang_title">Jazyk</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 27406ae6..237d9276 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -9,10 +9,10 @@
     <string name="save">Kaydet</string>
     <string name="issuer">Sağlayıcı</string>
     <string name="settings">Ayarlar</string>
-    <string name="pref_appearance_group_title">Görünüm</string>
-    <string name="pref_security_group_title">Güvenlik</string>
+    <string name="pref_section_appearance_title">Görünüm</string>
+    <string name="pref_section_security_title">Güvenlik</string>
     <string name="pref_tools_group_title">Araçlar</string>
-    <string name="pref_backups_group_title">Yedekler</string>
+    <string name="pref_section_backups_title">Yedekler</string>
     <string name="pref_select_theme_title">Tema</string>
     <string name="pref_view_mode_title">Görüntüleme biçimi</string>
     <string name="pref_lang_title">Dil</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 53fa33a5..faf536de 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">保存</string>
     <string name="issuer">服务商</string>
     <string name="settings">偏好设置</string>
-    <string name="pref_appearance_group_title">外观</string>
-    <string name="pref_security_group_title">安全</string>
+    <string name="pref_section_appearance_title">外观</string>
+    <string name="pref_section_security_title">安全</string>
     <string name="pref_tools_group_title">工具</string>
-    <string name="pref_backups_group_title">备份</string>
+    <string name="pref_section_backups_title">备份</string>
     <string name="pref_select_theme_title">主题</string>
     <string name="pref_view_mode_title">视图模式</string>
     <string name="pref_lang_title">语言</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e09f0a7d..421c0a28 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -11,10 +11,10 @@
     <string name="save">儲存</string>
     <string name="issuer">服務商</string>
     <string name="settings">偏好設定</string>
-    <string name="pref_appearance_group_title">外觀</string>
-    <string name="pref_security_group_title">安全</string>
+    <string name="pref_section_appearance_title">外觀</string>
+    <string name="pref_section_security_title">安全</string>
     <string name="pref_tools_group_title">工具</string>
-    <string name="pref_backups_group_title">備份</string>
+    <string name="pref_section_backups_title">備份</string>
     <string name="pref_select_theme_title">主題</string>
     <string name="pref_view_mode_title">檢視模式</string>
     <string name="pref_lang_title">語言</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5b56a344..45817d11 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,11 +15,20 @@
     <string name="issuer">Issuer</string>
 
     <string name="settings">Preferences</string>
-    <string name="pref_behavior_group_title">Behavior</string>
-    <string name="pref_appearance_group_title">Appearance</string>
-    <string name="pref_security_group_title">Security</string>
-    <string name="pref_tools_group_title">Tools</string>
-    <string name="pref_backups_group_title">Backups</string>
+    <string name="pref_cat_appearance_app">App</string>
+    <string name="pref_cat_appearance_entries">Entries</string>
+    <string name="pref_cat_backups_android">Android</string>
+    <string name="pref_cat_backups_auto">Automatic backups</string>
+    <string name="pref_section_behavior_title">Behavior</string>
+    <string name="pref_section_behavior_summary">Customize the behavior when interacting with the entry list.</string>
+    <string name="pref_section_appearance_title">Appearance</string>
+    <string name="pref_section_appearance_summary">Adjust the theme, language and other settings that affect the appearance of the app.</string>
+    <string name="pref_section_security_title">Security</string>
+    <string name="pref_section_security_summary">Configure encryption, biometric unlock, auto lock and other security settings.</string>
+    <string name="pref_section_import_export_title">Import &amp; Export</string>
+    <string name="pref_section_import_export_summary">Import backups of Aegis or other authenticator apps. Create manual exports of your Aegis vault.</string>
+    <string name="pref_section_backups_title">Backups</string>
+    <string name="pref_section_backups_summary">Set up automatic backups to a location of your choosing or enable participation in Android\'s backup system.</string>
     <string name="pref_select_theme_title">Theme</string>
     <string name="pref_view_mode_title">View mode</string>
     <string name="pref_lang_title">Language</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 1dec9c13..09073a5d 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -4,29 +4,34 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/action_settings">
 
-    <Preference
-        android:fragment="com.beemdevelopment.aegis.ui.fragments.BehaviorPreferencesFragment"
-        app:icon="@drawable/ic_gesture_tap_24dp"
-        app:title="@string/pref_behavior_group_title" />
-
     <Preference
         android:fragment="com.beemdevelopment.aegis.ui.fragments.AppearancePreferencesFragment"
         app:icon="@drawable/ic_brush_black_24dp"
-        app:title="@string/pref_appearance_group_title" />
+        app:title="@string/pref_section_appearance_title"
+        app:summary="@string/pref_section_appearance_summary" />
+
+    <Preference
+        android:fragment="com.beemdevelopment.aegis.ui.fragments.BehaviorPreferencesFragment"
+        app:icon="@drawable/ic_gesture_tap_24dp"
+        app:title="@string/pref_section_behavior_title"
+        app:summary="@string/pref_section_behavior_summary" />
 
     <Preference
         android:fragment="com.beemdevelopment.aegis.ui.fragments.SecurityPreferencesFragment"
         app:icon="@drawable/ic_vpn_key_black_24dp"
-        app:title="@string/pref_security_group_title" />
+        app:title="@string/pref_section_security_title"
+        app:summary="@string/pref_section_security_summary" />
 
     <Preference
         android:fragment="com.beemdevelopment.aegis.ui.fragments.BackupsPreferencesFragment"
         app:icon="@drawable/ic_cloud_upload_outline_black_24dp"
-        app:title="@string/pref_backups_group_title" />
+        app:title="@string/pref_section_backups_title"
+        app:summary="@string/pref_section_backups_summary" />
 
     <Preference
-        android:fragment="com.beemdevelopment.aegis.ui.fragments.ToolsPreferencesFragment"
+        android:fragment="com.beemdevelopment.aegis.ui.fragments.ImportExportPreferencesFragment"
         app:icon="@drawable/ic_tools_black_24dp"
-        app:title="@string/pref_tools_group_title" />
+        app:title="@string/pref_section_import_export_title"
+        app:summary="@string/pref_section_import_export_summary" />
 
 </androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml
index e7959577..6524e4d9 100644
--- a/app/src/main/res/xml/preferences_appearance.xml
+++ b/app/src/main/res/xml/preferences_appearance.xml
@@ -1,45 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:title="@string/pref_appearance_group_title">
-    <Preference
-        android:defaultValue="false"
-        android:key="pref_dark_mode"
-        android:title="@string/pref_select_theme_title"
-        app:iconSpaceReserved="false"/>
+    android:title="@string/pref_section_appearance_title">
+    <PreferenceCategory
+        android:title="@string/pref_cat_appearance_app"
+        app:iconSpaceReserved="false">
+        <Preference
+            android:defaultValue="false"
+            android:key="pref_dark_mode"
+            android:title="@string/pref_select_theme_title"
+            app:iconSpaceReserved="false"/>
 
-    <Preference
-        android:defaultValue="false"
-        android:key="pref_view_mode"
-        android:title="@string/pref_view_mode_title"
-        app:iconSpaceReserved="false"/>
+        <ListPreference
+            android:key="pref_lang"
+            android:title="@string/pref_lang_title"
+            android:summary="%s"
+            android:entries="@array/pref_lang_entries"
+            android:entryValues="@array/pref_lang_values"
+            android:defaultValue="system"
+            app:iconSpaceReserved="false"/>
+    </PreferenceCategory>
 
-    <ListPreference
-        android:key="pref_lang"
-        android:title="@string/pref_lang_title"
-        android:summary="%s"
-        android:entries="@array/pref_lang_entries"
-        android:entryValues="@array/pref_lang_values"
-        android:defaultValue="system"
-        app:iconSpaceReserved="false"/>
+    <PreferenceCategory
+        android:title="@string/pref_cat_appearance_entries"
+        app:iconSpaceReserved="false">
+        <Preference
+            android:defaultValue="false"
+            android:key="pref_view_mode"
+            android:title="@string/pref_view_mode_title"
+            app:iconSpaceReserved="false"/>
 
-    <androidx.preference.SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="pref_code_group_size"
-        android:title="@string/pref_code_group_size_title"
-        android:summary="@string/pref_code_group_size_summary"
-        app:iconSpaceReserved="false"/>
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_code_group_size"
+            android:title="@string/pref_code_group_size_title"
+            android:summary="@string/pref_code_group_size_summary"
+            app:iconSpaceReserved="false"/>
 
-    <androidx.preference.SwitchPreferenceCompat
-        android:defaultValue="true"
-        android:key="pref_account_name"
-        android:title="@string/pref_account_name_title"
-        android:summary="@string/pref_account_name_summary"
-        app:iconSpaceReserved="false"/>
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="pref_account_name"
+            android:title="@string/pref_account_name_title"
+            android:summary="@string/pref_account_name_summary"
+            app:iconSpaceReserved="false"/>
 
-    <Preference
-        android:key="pref_groups"
-        android:title="@string/preference_manage_groups"
-        android:summary="@string/preference_manage_groups_summary"
-        app:iconSpaceReserved="false"/>
+        <Preference
+            android:key="pref_groups"
+            android:title="@string/preference_manage_groups"
+            android:summary="@string/preference_manage_groups_summary"
+            app:iconSpaceReserved="false"/>
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_backups.xml b/app/src/main/res/xml/preferences_backups.xml
index 364966a0..c258e64d 100644
--- a/app/src/main/res/xml/preferences_backups.xml
+++ b/app/src/main/res/xml/preferences_backups.xml
@@ -1,31 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:title="@string/pref_backups_group_title">
-    <androidx.preference.SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="pref_android_backups"
-        android:title="@string/pref_android_backups_title"
-        android:summary="@string/pref_android_backups_summary"
-        app:iconSpaceReserved="false"/>
-    <androidx.preference.SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="pref_backups"
-        android:title="@string/pref_backups_title"
-        android:summary="@string/pref_backups_summary"
-        app:iconSpaceReserved="false"/>
-    <Preference
-        android:key="pref_backups_location"
-        android:title="@string/pref_backups_location_title"
-        android:summary="@string/pref_backups_location_summary"
-        app:iconSpaceReserved="false"/>
-    <Preference
-        android:key="pref_backups_trigger"
-        android:title="@string/pref_backups_trigger_title"
-        android:summary="@string/pref_backups_trigger_summary"
-        app:iconSpaceReserved="false"/>
-    <Preference
-        android:key="pref_backups_versions"
-        android:title="@string/pref_backups_versions_title"
-        app:iconSpaceReserved="false"/>
-</PreferenceScreen>
\ No newline at end of file
+    android:title="@string/pref_section_backups_title">
+    <PreferenceCategory
+        android:title="@string/pref_cat_backups_auto"
+        app:iconSpaceReserved="false">
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_backups"
+            android:title="@string/pref_backups_title"
+            android:summary="@string/pref_backups_summary"
+            app:iconSpaceReserved="false"/>
+        <Preference
+            android:key="pref_backups_location"
+            android:title="@string/pref_backups_location_title"
+            android:summary="@string/pref_backups_location_summary"
+            app:iconSpaceReserved="false"/>
+        <Preference
+            android:key="pref_backups_trigger"
+            android:title="@string/pref_backups_trigger_title"
+            android:summary="@string/pref_backups_trigger_summary"
+            app:iconSpaceReserved="false"/>
+        <Preference
+            android:key="pref_backups_versions"
+            android:title="@string/pref_backups_versions_title"
+            app:iconSpaceReserved="false"/>
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/pref_cat_backups_android"
+        app:iconSpaceReserved="false">
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_android_backups"
+            android:title="@string/pref_android_backups_title"
+            android:summary="@string/pref_android_backups_summary"
+            app:iconSpaceReserved="false"/>
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_behavior.xml b/app/src/main/res/xml/preferences_behavior.xml
index 9633b72c..cc0dae33 100644
--- a/app/src/main/res/xml/preferences_behavior.xml
+++ b/app/src/main/res/xml/preferences_behavior.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:title="@string/pref_behavior_group_title">
+    android:title="@string/pref_section_behavior_title">
     <androidx.preference.SwitchPreferenceCompat
         android:defaultValue="false"
         android:key="pref_copy_on_tap"
diff --git a/app/src/main/res/xml/preferences_tools.xml b/app/src/main/res/xml/preferences_import_export.xml
similarity index 90%
rename from app/src/main/res/xml/preferences_tools.xml
rename to app/src/main/res/xml/preferences_import_export.xml
index 8a710f7b..25e8a554 100644
--- a/app/src/main/res/xml/preferences_tools.xml
+++ b/app/src/main/res/xml/preferences_import_export.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:title="@string/pref_tools_group_title">
+    android:title="@string/pref_section_import_export_title">
     <Preference
         android:key="pref_import"
         android:title="@string/pref_import_file_title"
diff --git a/app/src/main/res/xml/preferences_security.xml b/app/src/main/res/xml/preferences_security.xml
index f5524a5b..990212ea 100644
--- a/app/src/main/res/xml/preferences_security.xml
+++ b/app/src/main/res/xml/preferences_security.xml
@@ -1,72 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:title="@string/pref_security_group_title">
-    <androidx.preference.SwitchPreferenceCompat
-        android:defaultValue="@bool/pref_secure_screen_default"
-        android:key="pref_secure_screen"
-        android:title="@string/pref_secure_screen_title"
-        android:summary="@string/pref_secure_screen_summary"
-        app:iconSpaceReserved="false"/>
-    <androidx.preference.SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="pref_tap_to_reveal"
-        android:title="@string/pref_tap_to_reveal_title"
-        android:summary="@string/pref_tap_to_reveal_summary"
-        app:iconSpaceReserved="false"/>
-    <Preference
-        android:key="pref_tap_to_reveal_time"
-        android:title="@string/pref_tap_to_reveal_time_title"
-        android:dependency="pref_tap_to_reveal"
-        app:iconSpaceReserved="false"/>
-
-    <com.beemdevelopment.aegis.ui.preferences.SwitchPreference
-        android:key="pref_encryption"
+    android:title="@string/pref_section_security_title">
+    <PreferenceCategory
         android:title="@string/pref_encryption_title"
-        android:summary="@string/pref_encryption_summary"
-        android:persistent="false"
-        app:iconSpaceReserved="false"/>
+        app:iconSpaceReserved="false">
+        <com.beemdevelopment.aegis.ui.preferences.SwitchPreference
+            android:key="pref_encryption"
+            android:title="@string/pref_encryption_title"
+            android:summary="@string/pref_encryption_summary"
+            android:persistent="false"
+            app:iconSpaceReserved="false"/>
 
-    <Preference
-        android:key="pref_password"
-        android:title="@string/pref_set_password_title"
-        android:summary="@string/pref_set_password_summary"
-        android:dependency="pref_encryption"
-        app:iconSpaceReserved="false"/>
+        <Preference
+            android:key="pref_password"
+            android:title="@string/pref_set_password_title"
+            android:summary="@string/pref_set_password_summary"
+            android:dependency="pref_encryption"
+            app:iconSpaceReserved="false"/>
 
-    <com.beemdevelopment.aegis.ui.preferences.SwitchPreference
-        android:key="pref_biometrics"
-        android:title="@string/pref_biometrics_title"
-        android:summary="@string/pref_biometrics_summary"
-        android:persistent="false"
-        app:iconSpaceReserved="false"/>
+        <com.beemdevelopment.aegis.ui.preferences.SwitchPreference
+            android:key="pref_biometrics"
+            android:title="@string/pref_biometrics_title"
+            android:summary="@string/pref_biometrics_summary"
+            android:persistent="false"
+            app:iconSpaceReserved="false"/>
 
-    <androidx.preference.SwitchPreferenceCompat
-        android:defaultValue="true"
-        android:key="pref_password_reminder"
-        android:title="@string/pref_password_reminder_title"
-        android:summary="@string/pref_password_reminder_summary"
-        android:dependency="pref_biometrics"
-        app:iconSpaceReserved="false"/>
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="pref_password_reminder"
+            android:title="@string/pref_password_reminder_title"
+            android:summary="@string/pref_password_reminder_summary"
+            android:dependency="pref_biometrics"
+            app:iconSpaceReserved="false"/>
 
-    <androidx.preference.SwitchPreferenceCompat
-        android:key="pref_pin_keyboard"
-        android:dependency="pref_encryption"
-        android:title="@string/pref_pin_keyboard_title"
-        android:summary="@string/pref_pin_keyboard_summary"
-        app:iconSpaceReserved="false"/>
+        <Preference
+            android:key="pref_slots"
+            android:title="@string/pref_slots_title"
+            android:summary="@string/pref_slots_summary"
+            app:iconSpaceReserved="false"/>
+    </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/pref_section_behavior_title"
+        app:iconSpaceReserved="false">
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="@bool/pref_secure_screen_default"
+            android:key="pref_secure_screen"
+            android:title="@string/pref_secure_screen_title"
+            android:summary="@string/pref_secure_screen_summary"
+            app:iconSpaceReserved="false"/>
 
-    <Preference
-        android:key="pref_auto_lock"
-        android:dependency="pref_encryption"
-        android:persistent="false"
-        android:title="@string/pref_auto_lock_title"
-        android:summary="@string/pref_auto_lock_summary"
-        app:iconSpaceReserved="false"/>
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="pref_tap_to_reveal"
+            android:title="@string/pref_tap_to_reveal_title"
+            android:summary="@string/pref_tap_to_reveal_summary"
+            app:iconSpaceReserved="false"/>
 
-    <Preference
-        android:key="pref_slots"
-        android:title="@string/pref_slots_title"
-        android:summary="@string/pref_slots_summary"
-        app:iconSpaceReserved="false"/>
-</PreferenceScreen>
\ No newline at end of file
+        <Preference
+            android:key="pref_tap_to_reveal_time"
+            android:title="@string/pref_tap_to_reveal_time_title"
+            android:dependency="pref_tap_to_reveal"
+            app:iconSpaceReserved="false"/>
+
+        <Preference
+            android:key="pref_auto_lock"
+            android:dependency="pref_encryption"
+            android:persistent="false"
+            android:title="@string/pref_auto_lock_title"
+            android:summary="@string/pref_auto_lock_summary"
+            app:iconSpaceReserved="false"/>
+
+        <androidx.preference.SwitchPreferenceCompat
+            android:key="pref_pin_keyboard"
+            android:dependency="pref_encryption"
+            android:title="@string/pref_pin_keyboard_title"
+            android:summary="@string/pref_pin_keyboard_summary"
+            app:iconSpaceReserved="false"/>
+    </PreferenceCategory>
+</PreferenceScreen>