diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2012-10-17 20:48:31 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2012-10-17 20:48:31 -0700 |
| commit | 1bd41a3b92d871445dbdc17e3f86ee1504f23a90 (patch) | |
| tree | 524e2f45b4c7cf9a7a827d8b49c84c7c098046e3 /subsonic-android/res | |
| parent | 3ff9f2d3214e280df56a988db744c210ab53ad5e (diff) | |
| download | dsub-1bd41a3b92d871445dbdc17e3f86ee1504f23a90.tar.gz dsub-1bd41a3b92d871445dbdc17e3f86ee1504f23a90.tar.bz2 dsub-1bd41a3b92d871445dbdc17e3f86ee1504f23a90.zip | |
Reworked Sleep Timer
Diffstat (limited to 'subsonic-android/res')
| -rw-r--r-- | subsonic-android/res/menu/nowplaying.xml | 4 | ||||
| -rw-r--r-- | subsonic-android/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | subsonic-android/res/xml/settings.xml | 7 |
3 files changed, 6 insertions, 7 deletions
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 @@ -26,6 +26,10 @@ 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 > 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" |