From d339b245b9871c4e86322613fdca47a508ec8906 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 15 Dec 2014 09:13:50 -0800
Subject: Get rid of extra settings header now that all will look the same

---
 res/values/strings.xml |   2 +-
 res/xml/settings.xml   | 790 ++++++++++++++++++++++++-------------------------
 2 files changed, 394 insertions(+), 398 deletions(-)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33a40981..3bcdec17 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -256,7 +256,7 @@
 
     <string name="error.label">Error</string>
 
-    <string name="settings.title">DSub settings</string>
+    <string name="settings.title">Settings</string>
     <string name="settings.test_connection_title">Test connection</string>
 	<string name="settings.servers_add">Add Server</string>
 	<string name="settings.servers_remove">Remove Server</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index f22a9c3f..0f044476 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -4,421 +4,417 @@
 	xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub"
 	android:title="@string/settings.title">
 
-	<PreferenceCategory
-		android:title="@string/menu.settings">
+	<PreferenceScreen
+		android:title="@string/settings.servers_title">
 
-		<PreferenceScreen
+		<PreferenceCategory
+			android:key="server"
 			android:title="@string/settings.servers_title">
 
-			<PreferenceCategory
-				android:key="server"
-				android:title="@string/settings.servers_title">
-
-				<Preference
-					android:key="serverAdd"
-					android:order="1000000"
-					android:title="@string/settings.servers_add"/>
-			</PreferenceCategory>
-
-		</PreferenceScreen>
-
-		<PreferenceScreen
-			android:title="@string/settings.appearance_title">
-
-			<PreferenceCategory
-					android:title="@string/settings.appearance_title">
-
-				<ListPreference
-					android:title="@string/settings.theme_title"
-					android:key="theme"
-					android:defaultValue="light"
-					android:entryValues="@array/themeValues"
-					android:entries="@array/themeNames"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.theme_fullscreen"
-					android:summary="@string/settings.theme_fullscreen_summary"
-					android:key="fullScreen"
-					android:defaultValue="false"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.track_title"
-					android:summary="@string/settings.track_summary"
-					android:key="displayTrack"
-					android:defaultValue="false"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.hide_widget_title"
-					android:summary="@string/settings.hide_widget_summary"
-					android:key="hideWidget"
-					android:defaultValue="false"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.custom_sort"
-					android:summary="@string/settings.custom_sort_summary"
-					android:key="customSortEnabled"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.open_to_library"
-					android:summary="@string/settings.open_to_library_summary"
-					android:key="openToLibrary"
-					android:defaultValue="false"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.override_system_language"
-					android:summary="@string/settings.override_system_language_summary"
-					android:key="overrideSystemLanguage"
-					android:defaultValue="false"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.large_album_art"
-					android:summary="@string/settings.large_album_art_summary"
-					android:key="largeAlbumArt"
-					android:defaultValue="true"/>
-			</PreferenceCategory>
-
-			<PreferenceCategory
-				android:title="@string/settings.menu_options.title">
-
-				<CheckBoxPreference
-					android:title="@string/common.play_next"
-					android:summary="@string/settings.menu_options.play_next_summary"
-					android:key="showPlayNext"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/common.play_last"
-					android:summary="@string/settings.menu_options.play_last_summary"
-					android:key="showPlayLast"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/common.star"
-					android:summary="@string/settings.menu_options.star_summary"
-					android:key="showStar"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/menu.share"
-					android:summary="@string/settings.menu_options.shared_summary"
-					android:key="showShared"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/menu.rate"
-					android:summary="@string/settings.menu_options.rate_summary"
-					android:key="showRating"
-					android:defaultValue="true"/>
-
-			</PreferenceCategory>
-		</PreferenceScreen>
-
-		<PreferenceScreen
+			<Preference
+				android:key="serverAdd"
+				android:order="1000000"
+				android:title="@string/settings.servers_add"/>
+		</PreferenceCategory>
+
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.appearance_title">
+
+		<PreferenceCategory
+				android:title="@string/settings.appearance_title">
+
+			<ListPreference
+				android:title="@string/settings.theme_title"
+				android:key="theme"
+				android:defaultValue="light"
+				android:entryValues="@array/themeValues"
+				android:entries="@array/themeNames"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.theme_fullscreen"
+				android:summary="@string/settings.theme_fullscreen_summary"
+				android:key="fullScreen"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.track_title"
+				android:summary="@string/settings.track_summary"
+				android:key="displayTrack"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.hide_widget_title"
+				android:summary="@string/settings.hide_widget_summary"
+				android:key="hideWidget"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.custom_sort"
+				android:summary="@string/settings.custom_sort_summary"
+				android:key="customSortEnabled"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.open_to_library"
+				android:summary="@string/settings.open_to_library_summary"
+				android:key="openToLibrary"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.override_system_language"
+				android:summary="@string/settings.override_system_language_summary"
+				android:key="overrideSystemLanguage"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.large_album_art"
+				android:summary="@string/settings.large_album_art_summary"
+				android:key="largeAlbumArt"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.menu_options.title">
+
+			<CheckBoxPreference
+				android:title="@string/common.play_next"
+				android:summary="@string/settings.menu_options.play_next_summary"
+				android:key="showPlayNext"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/common.play_last"
+				android:summary="@string/settings.menu_options.play_last_summary"
+				android:key="showPlayLast"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/common.star"
+				android:summary="@string/settings.menu_options.star_summary"
+				android:key="showStar"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/menu.share"
+				android:summary="@string/settings.menu_options.shared_summary"
+				android:key="showShared"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/menu.rate"
+				android:summary="@string/settings.menu_options.rate_summary"
+				android:key="showRating"
+				android:defaultValue="true"/>
+
+		</PreferenceCategory>
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.drawer_items_title">
+
+		<PreferenceCategory
 			android:title="@string/settings.drawer_items_title">
 
-			<PreferenceCategory
-				android:title="@string/settings.drawer_items_title">
-
-				<CheckBoxPreference
-					android:title="@string/settings.podcasts_enabled"
-					android:summary="@string/settings.podcasts_enabled_summary"
-					android:key="podcastsEnabled"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.bookmarks_enabled"
-					android:summary="@string/settings.bookmarks_enabled_summary"
-					android:key="bookmarksEnabled"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.shares_enabled"
-					android:summary="@string/settings.shares_enabled_summary"
-					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"
-					android:key="adminEnabled"
-					android:defaultValue="true"/>
-			</PreferenceCategory>
+			<CheckBoxPreference
+				android:title="@string/settings.podcasts_enabled"
+				android:summary="@string/settings.podcasts_enabled_summary"
+				android:key="podcastsEnabled"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.bookmarks_enabled"
+				android:summary="@string/settings.bookmarks_enabled_summary"
+				android:key="bookmarksEnabled"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.shares_enabled"
+				android:summary="@string/settings.shares_enabled_summary"
+				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"
+				android:key="adminEnabled"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/button_bar.chat">
+
+			<github.daneren2005.dsub.view.SeekBarPreference
+				android:title="@string/settings.chat_refresh"
+				android:key="chatRefreshRate"
+				android:defaultValue="30"
+				android:dialogLayout="@layout/seekbar_preference"
+				myns:max="120"
+				myns:display="%.0f seconds"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.cache_screen_title">
+
+		<PreferenceCategory
+				android:title="@string/settings.network_title">
+
+			<ListPreference
+				android:title="@string/settings.max_bitrate_wifi"
+				android:key="maxBitrateWifi"
+				android:defaultValue="0"
+				android:entryValues="@array/maxBitrateValues"
+				android:entries="@array/maxBitrateNames"/>
+
+			<ListPreference
+				android:title="@string/settings.max_bitrate_mobile"
+				android:key="maxBitrateMobile"
+				android:defaultValue="0"
+				android:entryValues="@array/maxBitrateValues"
+				android:entries="@array/maxBitrateNames"/>
+
+			<ListPreference
+				android:title="@string/settings.max_video_bitrate_wifi"
+				android:key="maxVideoBitrateWifi"
+				android:defaultValue="0"
+				android:entryValues="@array/maxVideoBitrateValues"
+				android:entries="@array/maxVideoBitrateNames"/>
+
+			<ListPreference
+				android:title="@string/settings.max_video_bitrate_mobile"
+				android:key="maxVideoBitrateMobile"
+				android:defaultValue="0"
+				android:entryValues="@array/maxVideoBitrateValues"
+				android:entries="@array/maxVideoBitrateNames"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.wifi_required_title"
+				android:summary="@string/settings.wifi_required_summary"
+				android:key="wifiRequiredForDownload"
+				android:defaultValue="false"/>
+
+			<ListPreference
+				android:title="@string/settings.network_timeout_title"
+				android:key="networkTimeout"
+				android:defaultValue="15000"
+				android:entryValues="@array/networkTimeoutValues"
+				android:entries="@array/networkTimeoutNames"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.cache_title">
+
+			<EditTextPreference
+				android:title="@string/settings.cache_size"
+				android:key="cacheSize"
+				android:defaultValue="2000"
+				android:digits="0123456789"/>
+
+			<EditTextPreference
+				android:title="@string/settings.cache_location"
+				android:key="cacheLocation"/>
+
+			<ListPreference
+				android:title="@string/settings.preload_wifi"
+				android:key="preloadCountWifi"
+				android:defaultValue="3"
+				android:entryValues="@array/preloadCountValues"
+				android:entries="@array/preloadCountNames"/>
+
+			<ListPreference
+				android:title="@string/settings.preload_mobile"
+				android:key="preloadCountMobile"
+				android:defaultValue="3"
+				android:entryValues="@array/preloadCountValues"
+				android:entries="@array/preloadCountNames"/>
+
+			<Preference
+				android:key="clearCache"
+				android:title="@string/settings.cache_clear"
+				android:persistent="false"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.hide_media_title"
+				android:summary="@string/settings.hide_media_summary"
+				android:key="hideMedia"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.screen_lit_title"
+				android:summary="@string/settings.screen_lit_summary"
+				android:key="screenLitOnDownload"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.sync_title">
+		<PreferenceCategory
+			android:title="@string/settings.sync_title">
 
-			<PreferenceCategory
-				android:title="@string/button_bar.chat">
+			<CheckBoxPreference
+				android:title="@string/settings.sync_enabled"
+				android:summary="@string/settings.sync_enabled_summary"
+				android:key="syncEnabled"
+				android:defaultValue="true"/>
+
+			<ListPreference
+				android:title="@string/settings.sync_interval"
+				android:key="syncInterval"
+				android:defaultValue="60"
+				android:entryValues="@array/syncIntervalValues"
+				android:entries="@array/syncIntervalNames"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.sync_wifi"
+				android:summary="@string/settings.sync_wifi_summary"
+				android:key="syncWifi"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.sync_notification"
+				android:summary="@string/settings.sync_notification_summary"
+				android:key="syncNotification"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.sync_starred"
+				android:summary="@string/settings.sync_starred_summary"
+				android:key="syncStarred"
+				android:defaultValue="false"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.sync_most_recent"
+				android:summary="@string/settings.sync_most_recent_summary"
+				android:key="syncMostRecent"
+				android:defaultValue="false"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
+
+	<PreferenceScreen
+		android:title="@string/settings.playback_title">
+
+		<PreferenceCategory
+				android:title="@string/settings.playback_title">
 
 				<github.daneren2005.dsub.view.SeekBarPreference
-					android:title="@string/settings.chat_refresh"
-					android:key="chatRefreshRate"
-					android:defaultValue="30"
+					android:title="@string/settings.playlist_random_size_title"
+					android:key="randomSize"
+					android:defaultValue="20"
 					android:dialogLayout="@layout/seekbar_preference"
-					myns:max="120"
-					myns:display="%.0f seconds"/>
-			</PreferenceCategory>
-		</PreferenceScreen>
-
-		<PreferenceScreen
-			android:title="@string/settings.cache_screen_title">
-
-			<PreferenceCategory
-					android:title="@string/settings.network_title">
-
-				<ListPreference
-					android:title="@string/settings.max_bitrate_wifi"
-					android:key="maxBitrateWifi"
-					android:defaultValue="0"
-					android:entryValues="@array/maxBitrateValues"
-					android:entries="@array/maxBitrateNames"/>
+					myns:max="100"/>
 
 				<ListPreference
-					android:title="@string/settings.max_bitrate_mobile"
-					android:key="maxBitrateMobile"
-					android:defaultValue="0"
-					android:entryValues="@array/maxBitrateValues"
-					android:entries="@array/maxBitrateNames"/>
-
-				<ListPreference
-					android:title="@string/settings.max_video_bitrate_wifi"
-					android:key="maxVideoBitrateWifi"
-					android:defaultValue="0"
-					android:entryValues="@array/maxVideoBitrateValues"
-					android:entries="@array/maxVideoBitrateNames"/>
+					android:title="@string/settings.temp_loss_title"
+					android:key="tempLoss"
+					android:defaultValue="1"
+					android:entryValues="@array/tempLossValues"
+					android:entries="@array/tempLossNames"/>
 
 				<ListPreference
-					android:title="@string/settings.max_video_bitrate_mobile"
-					android:key="maxVideoBitrateMobile"
+					android:title="@string/settings.disconnect_pause_title"
+					android:key="pauseOnDisconnect"
 					android:defaultValue="0"
-					android:entryValues="@array/maxVideoBitrateValues"
-					android:entries="@array/maxVideoBitrateNames"/>
+					android:entryValues="@array/disconnectPauseValues"
+					android:entries="@array/disconnectPauseNames"/>
 
 				<CheckBoxPreference
-					android:title="@string/settings.wifi_required_title"
-					android:summary="@string/settings.wifi_required_summary"
-					android:key="wifiRequiredForDownload"
+					android:title="@string/settings.persistent_title"
+					android:summary="@string/settings.persistent_summary"
+					android:key="persistentNotification"
 					android:defaultValue="false"/>
 
-				<ListPreference
-					android:title="@string/settings.network_timeout_title"
-					android:key="networkTimeout"
-					android:defaultValue="15000"
-					android:entryValues="@array/networkTimeoutValues"
-					android:entries="@array/networkTimeoutNames"/>
-			</PreferenceCategory>
-
-			<PreferenceCategory
-				android:title="@string/settings.cache_title">
-
-				<EditTextPreference
-					android:title="@string/settings.cache_size"
-					android:key="cacheSize"
-					android:defaultValue="2000"
-                    android:digits="0123456789"/>
-
-				<EditTextPreference
-					android:title="@string/settings.cache_location"
-					android:key="cacheLocation"/>
-
-				<ListPreference
-					android:title="@string/settings.preload_wifi"
-					android:key="preloadCountWifi"
-					android:defaultValue="3"
-					android:entryValues="@array/preloadCountValues"
-					android:entries="@array/preloadCountNames"/>
-
-				<ListPreference
-					android:title="@string/settings.preload_mobile"
-					android:key="preloadCountMobile"
-					android:defaultValue="3"
-					android:entryValues="@array/preloadCountValues"
-					android:entries="@array/preloadCountNames"/>
-
-				<Preference
-					android:key="clearCache"
-					android:title="@string/settings.cache_clear"
-					android:persistent="false"/>
-			</PreferenceCategory>
-
-			<PreferenceCategory
-				android:title="@string/settings.other_title">
-
 				<CheckBoxPreference
-					android:title="@string/settings.hide_media_title"
-					android:summary="@string/settings.hide_media_summary"
-					android:key="hideMedia"
+					android:title="@string/settings.play_now_after"
+					android:summary="@string/settings.play_now_after_summary"
+					android:key="playNowAfter"
 					android:defaultValue="false"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.screen_lit_title"
-					android:summary="@string/settings.screen_lit_summary"
-					android:key="screenLitOnDownload"
-					android:defaultValue="true"/>
-			</PreferenceCategory>
-		</PreferenceScreen>
-
-		<PreferenceScreen
-			android:title="@string/settings.sync_title">
-			<PreferenceCategory
-				android:title="@string/settings.sync_title">
-
-				<CheckBoxPreference
-					android:title="@string/settings.sync_enabled"
-					android:summary="@string/settings.sync_enabled_summary"
-					android:key="syncEnabled"
-					android:defaultValue="true"/>
-
-				<ListPreference
-					android:title="@string/settings.sync_interval"
-					android:key="syncInterval"
-					android:defaultValue="60"
-					android:entryValues="@array/syncIntervalValues"
-					android:entries="@array/syncIntervalNames"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.sync_wifi"
-					android:summary="@string/settings.sync_wifi_summary"
-					android:key="syncWifi"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.sync_notification"
-					android:summary="@string/settings.sync_notification_summary"
-					android:key="syncNotification"
-					android:defaultValue="true"/>
-			</PreferenceCategory>
-
-			<PreferenceCategory
-				android:title="@string/settings.other_title">
-
-				<CheckBoxPreference
-					android:title="@string/settings.sync_starred"
-					android:summary="@string/settings.sync_starred_summary"
-					android:key="syncStarred"
-					android:defaultValue="false"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.sync_most_recent"
-					android:summary="@string/settings.sync_most_recent_summary"
-					android:key="syncMostRecent"
-					android:defaultValue="false"/>
-			</PreferenceCategory>
-		</PreferenceScreen>
-
-		<PreferenceScreen
-			android:title="@string/settings.playback_title">
-
-			<PreferenceCategory
-					android:title="@string/settings.playback_title">
-
-					<github.daneren2005.dsub.view.SeekBarPreference
-						android:title="@string/settings.playlist_random_size_title"
-						android:key="randomSize"
-						android:defaultValue="20"
-						android:dialogLayout="@layout/seekbar_preference"
-						myns:max="100"/>
-
-					<ListPreference
-						android:title="@string/settings.temp_loss_title"
-						android:key="tempLoss"
-						android:defaultValue="1"
-						android:entryValues="@array/tempLossValues"
-						android:entries="@array/tempLossNames"/>
-
-					<ListPreference
-						android:title="@string/settings.disconnect_pause_title"
-						android:key="pauseOnDisconnect"
-						android:defaultValue="0"
-						android:entryValues="@array/disconnectPauseValues"
-						android:entries="@array/disconnectPauseNames"/>
-
-					<CheckBoxPreference
-						android:title="@string/settings.persistent_title"
-						android:summary="@string/settings.persistent_summary"
-						android:key="persistentNotification"
-						android:defaultValue="false"/>
-
-					<CheckBoxPreference
-						android:title="@string/settings.play_now_after"
-						android:summary="@string/settings.play_now_after_summary"
-						android:key="playNowAfter"
-						android:defaultValue="false"/>
-			</PreferenceCategory>
-
-			<PreferenceCategory
-				android:title="@string/settings.video_title">
-
-				<ListPreference
-					android:title="@string/settings.video_player"
-					android:key="videoPlayer"
-					android:defaultValue="raw"
-					android:entryValues="@array/videoPlayerValues"
-					android:entries="@array/videoPlayerNames"/>
-			</PreferenceCategory>
-
-			<PreferenceCategory
-				android:title="@string/settings.replay_gain">
-
-				<CheckBoxPreference
-					android:title="@string/settings.replay_gain"
-					android:summary="@string/settings.replay_gain_summary"
-					android:key="replayGain"
-					android:defaultValue="false"/>
-
-				<ListPreference
-					android:title="@string/settings.replay_gain_type"
-					android:key="replayGainType"
-					android:defaultValue="1"
-					android:entryValues="@array/replayGainTypeValues"
-					android:entries="@array/replayGainTypeNames"/>
-
-				<github.daneren2005.dsub.view.SeekBarPreference
-					android:key="replayGainBump2"
-					android:dialogLayout="@layout/seekbar_preference"
-					android:title="@string/settings.replay_gain_bump"
-					android:defaultValue="150"
-					myns:max="150"
-					myns:min="-150"
-					myns:stepSize="10"
-					myns:display="%+.1f dB"/>
-
-				<github.daneren2005.dsub.view.SeekBarPreference
-					android:key="replayGainUntagged2"
-					android:dialogLayout="@layout/seekbar_preference"
-					android:title="@string/settings.replay_gain_untagged"
-					android:defaultValue="150"
-					myns:max="0"
-					myns:min="-150"
-					myns:stepSize="10"
-					myns:display="%+.1f dB"/>
-			</PreferenceCategory>
-
-			<PreferenceCategory
-				android:title="@string/settings.other_title">
-
-				<CheckBoxPreference
-					android:title="@string/settings.scrobble_title"
-					android:summary="@string/settings.scrobble_summary"
-					android:key="scrobble"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.media_button_title"
-					android:summary="@string/settings.media_button_summary"
-					android:key="mediaButtons"
-					android:defaultValue="true"/>
-
-				<CheckBoxPreference
-					android:title="@string/settings.gapless_playback"
-					android:summary="@string/settings.gapless_playback_summary"
-					android:key="gaplessPlayback"
-					android:defaultValue="true"/>
-			</PreferenceCategory>
-		</PreferenceScreen>
-	</PreferenceCategory>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.video_title">
+
+			<ListPreference
+				android:title="@string/settings.video_player"
+				android:key="videoPlayer"
+				android:defaultValue="raw"
+				android:entryValues="@array/videoPlayerValues"
+				android:entries="@array/videoPlayerNames"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.replay_gain">
+
+			<CheckBoxPreference
+				android:title="@string/settings.replay_gain"
+				android:summary="@string/settings.replay_gain_summary"
+				android:key="replayGain"
+				android:defaultValue="false"/>
+
+			<ListPreference
+				android:title="@string/settings.replay_gain_type"
+				android:key="replayGainType"
+				android:defaultValue="1"
+				android:entryValues="@array/replayGainTypeValues"
+				android:entries="@array/replayGainTypeNames"/>
+
+			<github.daneren2005.dsub.view.SeekBarPreference
+				android:key="replayGainBump2"
+				android:dialogLayout="@layout/seekbar_preference"
+				android:title="@string/settings.replay_gain_bump"
+				android:defaultValue="150"
+				myns:max="150"
+				myns:min="-150"
+				myns:stepSize="10"
+				myns:display="%+.1f dB"/>
+
+			<github.daneren2005.dsub.view.SeekBarPreference
+				android:key="replayGainUntagged2"
+				android:dialogLayout="@layout/seekbar_preference"
+				android:title="@string/settings.replay_gain_untagged"
+				android:defaultValue="150"
+				myns:max="0"
+				myns:min="-150"
+				myns:stepSize="10"
+				myns:display="%+.1f dB"/>
+		</PreferenceCategory>
+
+		<PreferenceCategory
+			android:title="@string/settings.other_title">
+
+			<CheckBoxPreference
+				android:title="@string/settings.scrobble_title"
+				android:summary="@string/settings.scrobble_summary"
+				android:key="scrobble"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.media_button_title"
+				android:summary="@string/settings.media_button_summary"
+				android:key="mediaButtons"
+				android:defaultValue="true"/>
+
+			<CheckBoxPreference
+				android:title="@string/settings.gapless_playback"
+				android:summary="@string/settings.gapless_playback_summary"
+				android:key="gaplessPlayback"
+				android:defaultValue="true"/>
+		</PreferenceCategory>
+	</PreferenceScreen>
 </PreferenceScreen>
-- 
cgit v1.2.3