From 2eb3cf8b9c68990c09318a038538fdbc9c9a383b Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 3 Jul 2014 17:39:38 -0700
Subject: Move Drawer options to it's own section

---
 res/values/strings.xml |  2 +-
 res/xml/settings.xml   | 32 +++++++++++++++-----------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 53e5e6b5..5a755f6a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -410,7 +410,7 @@
 	<string name="settings.browse_by_tags_summary">Browse by tags instead of by folder structure.  Requires Subsonic 4.7+</string>
 	<string name="settings.override_system_language">Override System Language</string>
 	<string name="settings.override_system_language_summary">Display app in english even if the system language is something DSub has a translation for.  May need to clear the app from memory for changes to take affect.</string>
-	<string name="settings.drawer_items_title">Drawer Items</string>
+	<string name="settings.drawer_items_title">Drawer Tabs</string>
 	<string name="settings.play_now_after">Play Now - After</string>
 	<string name="settings.play_now_after_summary">Play Now context menu for a song plays everything after selected item (like the Subsonic web GUI)</string>
 	<string name="settings.large_album_art">Large Album Art</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 05761c2c..4e385145 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -102,22 +102,10 @@
 				android:defaultValue="true"/>
 
 		</PreferenceCategory>
+	</PreferenceScreen>
 
-		<PreferenceCategory
-			android:title="@string/button_bar.chat">
-
-			<CheckBoxPreference
-				android:title="@string/settings.chat_enabled"
-				android:summary="@string/settings.chat_enabled_summary"
-				android:key="chatEnabled"
-				android:defaultValue="true"/>
-
-			<EditTextPreference
-				android:title="@string/settings.chat_refresh"
-				android:key="chatRefreshRate"
-				android:defaultValue="30"
-				android:digits="0123456789"/>
-		</PreferenceCategory>
+	<PreferenceScreen
+		android:title="@string/settings.drawer_items_title">
 
 		<PreferenceCategory
 			android:title="@string/settings.drawer_items_title">
@@ -140,6 +128,12 @@
 				android:key="sharedEnabled"
 				android:defaultValue="true"/>
 
+			<CheckBoxPreference
+				android:title="@string/settings.chat_enabled"
+				android:summary="@string/settings.chat_enabled_summary"
+				android:key="chatEnabled"
+				android:defaultValue="true"/>
+
 			<CheckBoxPreference
 				android:title="@string/settings.admin_enabled"
 				android:summary="@string/settings.admin_enabled_summary"
@@ -148,9 +142,13 @@
 		</PreferenceCategory>
 
 		<PreferenceCategory
-			android:title="@string/settings.other_title">
-
+			android:title="@string/button_bar.chat">
 
+			<EditTextPreference
+				android:title="@string/settings.chat_refresh"
+				android:key="chatRefreshRate"
+				android:defaultValue="30"
+				android:digits="0123456789"/>
 		</PreferenceCategory>
 	</PreferenceScreen>
 
-- 
cgit v1.2.3