From bc3058918042da953bdc703d89ff3d5d1e20283b Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Thu, 31 Jan 2019 08:41:12 -0800
Subject: [PATCH] For #288: Adds advanced settings

---
 app/src/main/res/values/strings.xml  | 15 ++++++++++
 app/src/main/res/xml/preferences.xml | 42 ++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b0f386528..863ef10bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,6 +39,21 @@
     <!-- Preference for settings related to changing the default browser -->
     <string name="preferences_set_as_default_browser">Set as default browser</string>
 
+    <!-- Preference category for advanced settings -->
+    <string name="preferences_category_advanced">Advanced</string>
+
+    <!-- Preference for advanced site permissions -->
+    <string name="preferences_site_permissions">Site permissions</string>
+
+    <!-- Preference for accessibility -->
+    <string name="preferences_accessibility">Accessibility</string>
+
+    <!-- Preference for language -->
+    <string name="preferences_language">Language</string>
+
+    <!-- Preference for data choices -->
+    <string name="preferences_data_choices">Data choices</string>
+
     <!-- Menu option on the toolbar that takes you to settings page-->
     <string name="settings">Settings</string>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 44e86a467..dfad75e93 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -5,25 +5,43 @@
 
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory android:title="Basics">
+    <PreferenceCategory android:title="@string/preferences_category_basics">
         <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_search"
-            android:key="@string/pref_key_search_engine"
-            android:title="@string/preferences_search_engine" />
+                android:icon="@drawable/mozac_ic_search"
+                android:key="@string/pref_key_search_engine"
+                android:title="@string/preferences_search_engine"/>
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_login"
-            android:key="@string/pref_key_passwords"
-            android:title="@string/preferences_passwords" />
+                android:icon="@drawable/ic_login"
+                android:key="@string/pref_key_passwords"
+                android:title="@string/preferences_passwords"/>
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_formfill"
-            android:key="@string/pref_key_credit_cards_addresses"
-            android:title="@string/preferences_credit_cards_addresses" />
+                android:icon="@drawable/ic_formfill"
+                android:key="@string/pref_key_credit_cards_addresses"
+                android:title="@string/preferences_credit_cards_addresses"/>
 
         <androidx.preference.Preference
-            android:key="@string/pref_key_make_default_browser"
-            android:title="@string/preferences_set_as_default_browser" />
+                android:key="@string/pref_key_make_default_browser"
+                android:title="@string/preferences_set_as_default_browser"/>
+    </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/preferences_category_advanced">
+        <androidx.preference.Preference
+                android:icon="@drawable/ic_permission"
+                android:key="@string/pref_key_site_permissions"
+                android:title="@string/preferences_site_permissions"/>
+        <androidx.preference.Preference
+                android:icon="@drawable/ic_accessibility"
+                android:key="@string/pref_key_accessibility"
+                android:title="@string/preferences_accessibility"/>
+        <androidx.preference.Preference
+                android:icon="@drawable/ic_language"
+                android:key="@string/pref_key_language"
+                android:title="@string/preferences_language"/>
+        <androidx.preference.Preference
+                android:icon="@drawable/ic_data_collection"
+                android:key="@string/pref_key_data_choices"
+                android:title="@string/preferences_data_choices"/>
     </PreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file