commit 5bba72a33ce0be2ca251a033c93f7fbb1b7da6d9
author jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 22:03:53 2015 +0200
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 22:10:20 2015 +0200
tree 29e0a7d57d9a81c24ecb286f5dea32a621f519f3
parent db2f050bc845bf44ebf71bbd4cc70f6d1da53669

gello: CyanogenMod style [2/2]

- Material dark theme
- Update colors palette
- Card-like tabs
- Updated menu entries
- Reordered settings

Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

res/xml/general_preferences.xml

diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index d704526..6d7e5b4 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -36,27 +36,6 @@
             android:summary="@string/pref_content_search_engine_summary"
             android:title="@string/pref_content_search_engine" />
 
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="false"
-            android:key="fullscreen"
-            android:summary="@string/pref_lab_fullscreen_summary"
-            android:title="@string/pref_lab_fullscreen" />
-
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="false"
-            android:key="nightmode_enabled"
-            android:summary="@string/pref_nightmode_enabled_summary"
-            android:title="@string/pref_nightmode_enabled" />
-
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="false"
-            android:key="powersave_enabled"
-            android:summary="@string/pref_powersave_enabled_summary"
-            android:title="@string/pref_powersave_enabled" />
-
         <com.android.browser.mdm.MdmCheckBoxPreference
             android:layout="@layout/swe_preference"
             android:key="autofill_enabled"
@@ -71,26 +50,9 @@
             android:summary="@string/pref_autofill_profile_editor_summary" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/pref_extras_title"
+    <PreferenceCategory android:title="@string/pref_interface_title"
         android:layout="@layout/swe_preference_category"
-        android:key="advanced">
-
-        <PreferenceScreen android:title="@string/pref_privacy_security_title"
-            android:summary="@string/pref_privacy_security_title_summary"
-            android:layout="@layout/swe_preference"
-            android:key="privacy_security" />
-
-        <PreferenceScreen
-            android:layout="@layout/swe_preference"
-            android:key="accessibility_menu"
-            android:summary="@string/pref_accessibility_title_summary"
-            android:title="@string/pref_accessibility_title"/>
-
-
-        <PreferenceScreen android:title="@string/pref_content_title"
-            android:summary="@string/pref_content_title_summary"
-            android:layout="@layout/swe_preference"
-            android:key="content_settings" />
+        android:key="interface">
 
         <ListPreference
             android:layout="@layout/swe_preference"
@@ -102,6 +64,55 @@
             android:key="edge_swiping_action"
             android:title="@string/pref_edge_swipe_title" />
 
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="false"
+            android:key="fullscreen"
+            android:summary="@string/pref_lab_fullscreen_summary"
+            android:title="@string/pref_lab_fullscreen" />
+
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="false"
+            android:key="nightmode_enabled"
+            android:summary="@string/pref_nightmode_enabled_summary"
+            android:title="@string/pref_nightmode_enabled" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_security_title"
+        android:layout="@layout/swe_preference_category"
+        android:key="security">
+
+        <PreferenceScreen android:title="@string/pref_privacy_security_title"
+            android:summary="@string/pref_privacy_security_title_summary"
+            android:layout="@layout/swe_preference"
+            android:key="privacy_security" />
+
+        <PreferenceScreen android:title="@string/pref_content_title"
+            android:summary="@string/pref_content_title_summary"
+            android:layout="@layout/swe_preference"
+            android:key="content_settings" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_extras_title"
+        android:layout="@layout/swe_preference_category"
+        android:key="advanced">
+
+        <SwitchPreference
+            android:layout="@layout/swe_preference"
+            android:defaultValue="false"
+            android:key="powersave_enabled"
+            android:summary="@string/pref_powersave_enabled_summary"
+            android:title="@string/pref_powersave_enabled" />
+
+        <PreferenceScreen
+            android:layout="@layout/swe_preference"
+            android:key="accessibility_menu"
+            android:summary="@string/pref_accessibility_title_summary"
+            android:title="@string/pref_accessibility_title"/>
+
         <com.android.browser.BrowserYesNoPreference
             android:layout="@layout/swe_preference"
             android:key="reset_default_preferences"