From 1bd41a3b92d871445dbdc17e3f86ee1504f23a90 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Wed, 17 Oct 2012 20:48:31 -0700
Subject: Reworked Sleep Timer

---
 subsonic-android/res/menu/nowplaying.xml | 4 ++++
 subsonic-android/res/values/strings.xml  | 2 ++
 subsonic-android/res/xml/settings.xml    | 7 -------
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/menu/nowplaying.xml b/subsonic-android/res/menu/nowplaying.xml
index 859fb108..62097751 100644
--- a/subsonic-android/res/menu/nowplaying.xml
+++ b/subsonic-android/res/menu/nowplaying.xml
@@ -25,6 +25,10 @@
         android:title="@string/download.menu_screen_on"
         android:showAsAction="ifRoom|withText"/>
 		
+	<item
+        android:id="@+id/menu_toggle_timer"
+        android:title="@string/download.start_timer"/>
+		
 	<item
         android:id="@+id/menu_toggle_now_playing"
         android:title="@string/download.show_downloading"/>
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index fa632b24..5e6b7371 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -122,6 +122,8 @@
     <string name="download.jukebox_not_authorized">Remote control is not allowed. Please enable jukebox mode in <b>Users &gt; Settings</b> on your Subsonic server.</string>
 	<string name="download.show_downloading">Show Downloading</string>
 	<string name="download.show_now_playing">Show Now Playing</string>
+	<string name="download.start_timer">Start Timer</string>
+	<string name="download.stop_timer">Stop Timer</string>
     
 	<string name="starring_content_starred">Starred \"%s\"</string>
 	<string name="starring_content_unstarred">Unstarred \"%s\"</string>
diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index 2764091d..294f7601 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -155,13 +155,6 @@
                 android:key="randomSize"
                 android:defaultValue="20"
 				android:digits="0123456789"/>
-				
-			<ListPreference
-				android:title="@string/settings.sleep_timer_title"
-				android:key="sleepTimer"
-				android:defaultValue="0"
-				android:entryValues="@array/sleepTimerValues"
-				android:entries="@array/sleepTimerNames"/>
 
 			<EditTextPreference
 				android:title="@string/settings.sleep_timer_duration_title"
-- 
cgit v1.2.3