aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/res
diff options
context:
space:
mode:
Diffstat (limited to 'subsonic-android/res')
-rw-r--r--subsonic-android/res/layout/start_timer.xml27
-rw-r--r--subsonic-android/res/values/strings.xml1
-rw-r--r--subsonic-android/res/xml/settings.xml6
3 files changed, 28 insertions, 6 deletions
diff --git a/subsonic-android/res/layout/start_timer.xml b/subsonic-android/res/layout/start_timer.xml
new file mode 100644
index 00000000..3b607a44
--- /dev/null
+++ b/subsonic-android/res/layout/start_timer.xml
@@ -0,0 +1,27 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:id="@+id/timer_length_label"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="4dp"
+ android:textSize="20dp"
+ android:text="@string/download.timer_length" />
+ <EditText
+ android:id="@+id/timer_length"
+ android:inputType="number"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginLeft="4dp"
+ android:hint="@string/download.timer_length" />
+ </LinearLayout>
+</LinearLayout> \ No newline at end of file
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index bc8f31f7..6ada14a8 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -135,6 +135,7 @@
<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.timer_length">Timer Length</string>
<string name="download.start_timer">Start Timer</string>
<string name="download.stop_timer">Stop Timer</string>
<string name="download.need_download">Video needs to be downloaded first</string>
diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml
index f79063cc..393d7cba 100644
--- a/subsonic-android/res/xml/settings.xml
+++ b/subsonic-android/res/xml/settings.xml
@@ -155,12 +155,6 @@
android:key="randomSize"
android:defaultValue="20"
android:digits="0123456789"/>
-
- <EditTextPreference
- android:title="@string/settings.sleep_timer_duration_title"
- android:key="sleepTimerDuration"
- android:defaultValue="60"
- android:digits="0123456789"/>
<ListPreference
android:title="@string/settings.temp_loss_title"