Nest all the prefs since there are so many

2 files changed, 27 insertions, 16 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a3e9fb4..b37bc5d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="quickdoc_exit">Close</string>
 
     <string name="pref_category_service_title">SoftKeys Service</string>
+    <string name="pref_category_service_summary">Configure the On Screen Service Behavior</string>
     <string name="pref_service_title">Run Service</string>
     <string name="pref_service_summary_on">Run SoftKeys Service</string>
     <string name="pref_service_summary_off">Just Use SoftKeys Launcher</string>
@@ -29,6 +30,7 @@
     <string name="pref_service_no_background_summary_off">Normal Background Containing Buttons</string>
     
     <string name="pref_category_virtual_title">Virtual Home Button</string>
+    <string name="pref_category_virtual_summary">Select Launcher</string>
     <string name="pref_launcher_title">Normal Press</string>
     <string name="pref_launcher_summary">Choose Launcher for Normal Press</string>
     <string name="pref_launcher2_title">Long Press</string>
@@ -38,6 +40,7 @@
     <string name="pref_return_home_after_back_summary_off">Do Not Return to SoftKeys After Back Key</string>
     
     <string name="pref_category_physical_title">Physical Home Button</string>
+    <string name="pref_category_physical_summary">Configure Behavior of Physical Device Home Button</string>
     <string name="pref_physical_note_title">NOTE:</string>    
     <string name="pref_physical_note_summary">For Single/Double Press While SoftKeys is Open</string>
     <string name="pref_homebutton_title">Single Press</string>
@@ -60,6 +63,7 @@
     <string name="pref_help_summary">View Included Help</string>
     
     <string name="pref_category_visual_title">Visuals and Layout</string>
+    <string name="pref_category_visual_summary">Choose Theme and Customize Button Setup</string>
     <string name="pref_theme_title">Theme</string>
     <string name="pref_theme_summary">Select Theme</string>
     <string name="pref_exitbutton_title">Exit Button</string>
@@ -90,7 +94,8 @@
     <string name="pref_recent_apps_summary_on">Show Recent Apps</string>
     <string name="pref_recent_apps_summary_off">Hide Recent Apps</string>
 
-    <string name="pref_notification_bar_title">Notification Bar</string>
+    <string name="pref_category_notification_bar_title">Notification Bar</string>
+    <string name="pref_category_notification_bar_summary">Put SoftKeys in the Notification Bar</string>
     <string name="pref_nb_softkeys_title">SoftKeys Button</string>
     <string name="pref_nb_softkeys_summary_on">Show SoftKeys Button</string>
     <string name="pref_nb_softkeys_summary_off">Do Not Show SoftKeys Button</string>
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index fff8425..1e713d7 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -18,8 +18,9 @@
 
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-   <PreferenceCategory
-   		android:title="@string/pref_category_service_title">
+   <PreferenceScreen
+   		android:title="@string/pref_category_service_title"
+   		android:summary="@string/pref_category_service_summary">
 
 		        <CheckBoxPreference
 		                        android:title="@string/pref_service_title"
@@ -77,10 +78,11 @@
 		                        android:key="service_no_background"
 		                        />
 		            
-	</PreferenceCategory>
+	</PreferenceScreen>
 	
-   <PreferenceCategory
-   		android:title="@string/pref_category_virtual_title">
+   <PreferenceScreen
+   		android:title="@string/pref_category_virtual_title"
+   		android:summary="@string/pref_category_virtual_summary">
                         
                 <ListPreference
                         android:title="@string/pref_launcher_title"
@@ -102,10 +104,11 @@
 		                        />
 		                        
 
-   </PreferenceCategory>
+   </PreferenceScreen>
    
-   <PreferenceCategory
-   		android:title="@string/pref_category_physical_title">
+   <PreferenceScreen
+   		android:title="@string/pref_category_physical_title"
+   		android:summary="@string/pref_category_physical_summary">
    		<!-- 
                  <Preference
                         android:title="@string/pref_physical_note_title"
@@ -149,10 +152,12 @@
                         android:defaultValue="200"
                          />
 
-        </PreferenceCategory>
+        </PreferenceScreen>
         
-   		<PreferenceCategory
-   			android:title="@string/pref_category_visual_title">
+        
+   		<PreferenceScreen
+   			android:title="@string/pref_category_visual_title"
+   			android:summary="@string/pref_category_visual_summary">
                         
                 <ListPreference
                         android:title="@string/pref_theme_title"
@@ -212,10 +217,11 @@
                  <ListPreference android:title="@string/pref_order_search_title" android:summary="@string/pref_order_search_summary" android:key="order_search" android:entries="@array/orderValues" android:entryValues="@array/orderValues" android:defaultValue="4" />
 				</PreferenceScreen>
 				
-        </PreferenceCategory>
+        </PreferenceScreen>
         
-        <PreferenceCategory
-        	android:title="@string/pref_notification_bar_title">
+        <PreferenceScreen
+        	android:title="@string/pref_category_notification_bar_title"
+        	android:summary="@string/pref_category_notification_bar_summary">
 		        <CheckBoxPreference
 		                        android:title="@string/pref_nb_softkeys_title"
 		                        android:summaryOn="@string/pref_nb_softkeys_summary_on"
@@ -252,7 +258,7 @@
 		                        android:defaultValue="false"
 		                        android:key="nb_search"
 		                        />
-        </PreferenceCategory>
+        </PreferenceScreen>
         
         <PreferenceCategory
         	android:title="@string/pref_category_info_title">