From 24f850e5393b35ad36e006df4e2f43f62ef729ea Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sat, 27 Feb 2010 22:35:54 -0600
Subject: [PATCH] Organize preferences

---
 res/values/strings.xml  |  4 +++
 res/xml/preferences.xml | 60 ++++++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 946884d2..03b4db04 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13,6 +13,10 @@
 	<string name="paused">(Paused)</string>
 	<string name="widget_start_service">Click to start the music service.</string>
 
+	<string name="pref_output">Audio Output</string>
+	<string name="pref_notifications">Notifications</string>
+	<string name="pref_misc">Miscellaneous Features</string>
+
 	<string name="headset_only_title">Disallow Use of Speaker</string>
 	<string name="headset_only_summary">Do not play music when the speaker would be used</string>
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 39798610..4d26de55 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,31 +1,37 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <PreferenceScreen
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:persistent="true">    
-	<CheckBoxPreference
-		android:key="headset_only"
-		android:title="@string/headset_only_title"
-		android:defaultValue="false"
-		android:summary="@string/headset_only_summary" />
-	<CheckBoxPreference
-		android:key="headset_pause"
-		android:title="@string/headset_pause_title"
-		android:defaultValue="true"
-		android:summary="@string/headset_pause_summary" />
-	<CheckBoxPreference
-		android:key="remote_player"
-		android:title="@string/remote_player_title"
-		android:defaultValue="true"
-		android:summaryOn="@string/remote_player_summary_on"
-		android:summaryOff="@string/remote_player_summary_off" />
-	<CheckBoxPreference
-		android:key="notify_while_paused"
-		android:title="@string/notify_while_paused_title"
-		android:defaultValue="true"
-		android:summary="@string/notify_while_paused_summary" />
-	<CheckBoxPreference
-		android:key="scrobble"
-		android:title="@string/scrobble_title"
-		android:defaultValue="true"
-		android:summary="@string/scrobble_summary" />
+	android:persistent="true">
+	<PreferenceCategory android:title="@string/pref_output">
+		<CheckBoxPreference
+			android:key="headset_only"
+			android:title="@string/headset_only_title"
+			android:defaultValue="false"
+			android:summary="@string/headset_only_summary" />
+		<CheckBoxPreference
+			android:key="headset_pause"
+			android:title="@string/headset_pause_title"
+			android:defaultValue="true"
+			android:summary="@string/headset_pause_summary" />
+	</PreferenceCategory>
+	<PreferenceCategory android:title="@string/pref_notifications">
+		<CheckBoxPreference
+			android:key="remote_player"
+			android:title="@string/remote_player_title"
+			android:defaultValue="true"
+			android:summaryOn="@string/remote_player_summary_on"
+			android:summaryOff="@string/remote_player_summary_off" />
+		<CheckBoxPreference
+			android:key="notify_while_paused"
+			android:title="@string/notify_while_paused_title"
+			android:defaultValue="true"
+			android:summary="@string/notify_while_paused_summary" />
+	</PreferenceCategory>
+	<PreferenceCategory android:title="@string/pref_misc">
+		<CheckBoxPreference
+			android:key="scrobble"
+			android:title="@string/scrobble_title"
+			android:defaultValue="true"
+			android:summary="@string/scrobble_summary" />
+	</PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file