Restructure global settings

--HG--
extra : amend_source : 1b4e0ac86c557993b0195c4b1bad968f3f27aac1

1 files changed, 50 insertions, 43 deletions

diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 9aa62956..ec016aa9 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -1,49 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="netchangereconnect"
-        android:summary="@string/netchange_summary"
-        android:title="@string/netchange" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="showlogwindow"
-        android:summary="@string/show_log_summary"
-        android:title="@string/show_log_window" />
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="usesystemproxy"
-        android:summary="@string/use_system_proxy_summary"
-        android:title="@string/use_system_proxy" />
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="restartvpnonboot"
-        android:summary="@string/onbootrestartsummary"
-        android:title="@string/onbootrestart" />
-    
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="screenoff"
-        android:summary="@string/screenoff_summary"
-        android:title="@string/screenoff_title" />
-
-    <Preference
-        android:key="clearapi"
-        android:persistent="false"
-        android:title="Clear allowed external apps" />
-
-    <PreferenceCategory android:title="Device specifics Hacks" >
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/appbehaviour">
         <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="useCM9Fix"
-            android:summary="@string/owner_fix_summary"
-            android:title="@string/owner_fix" />
+                android:defaultValue="true"
+                android:key="showlogwindow"
+                android:summary="@string/show_log_summary"
+                android:title="@string/show_log_window"/>
+
+        <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="restartvpnonboot"
+                android:summary="@string/onbootrestartsummary"
+                android:title="@string/onbootrestart"/>
+
+        <Preference
+                android:key="clearapi"
+                android:persistent="false"
+                android:title="Clear allowed external apps"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/vpnbehaviour">
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="usesystemproxy"
+                android:summary="@string/use_system_proxy_summary"
+                android:title="@string/use_system_proxy"/>
+        <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="netchangereconnect"
+                android:summary="@string/netchange_summary"
+                android:title="@string/netchange"/>
+
+
+        <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="screenoff"
+                android:summary="@string/screenoff_summary"
+                android:title="@string/screenoff_title"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/device_specific">
+        <CheckBoxPreference
+                android:defaultValue="false"
+                android:key="useCM9Fix"
+                android:summary="@string/owner_fix_summary"
+                android:title="@string/owner_fix"/>
         <CheckBoxPreference
-            android:defaultValue="false"
-            android:key="loadTunModule"
-            android:summary="@string/setting_loadtun_summary"
-            android:title="@string/setting_loadtun" />
+                android:defaultValue="false"
+                android:key="loadTunModule"
+                android:summary="@string/setting_loadtun_summary"
+                android:title="@string/setting_loadtun"/>
     </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file