diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-07-31 13:10:17 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-07-31 13:10:17 -0700 |
| commit | 0d5ea40198f1503ae0ad243663d1c6ba2a4dca99 (patch) | |
| tree | 0e136575fdcb2d0b9b0f355861930acfd48a1d9c /app/src/main/res | |
| parent | 67cd4eb3447794c94b96946e64d8e2720acbc51f (diff) | |
| parent | 9f597b5135b85b99755cd791e32796b89fbf81dd (diff) | |
| download | dsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.tar.gz dsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.tar.bz2 dsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.zip | |
Merge branch 'master' into SlideUpPanel2
Conflicts:
app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
app/src/main/res/values-de/strings.xml
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/values-de/strings.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/arrays.xml | 13 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/xml/settings.xml | 7 |
4 files changed, 30 insertions, 0 deletions
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 327df3cb..45b89df9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -636,5 +636,10 @@ <string name="details.year">Jahr</string> <string name="details.version">Version</string> <string name="playlist.mine">Meine Wiedergabelisten</string> + <string name="settings.keep_played_count_none">Alle abgespielten Lieder entfernen</string> + <string name="settings.keep_played_count_one">Das letzte abgespielte Lied behalten</string> + <string name="settings.keep_played_count_three">3 abgespielte Lieder behalten</string> + <string name="settings.keep_played_count_two">2 abgespielte Lieder behalten</string> + <string name="settings.keep_played_count_title">Abgespielte Lieder behalten</string> </resources> diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index d876ecdb..a7dd932d 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -163,6 +163,19 @@ <item>@string/settings.temp_loss_nothing</item> </string-array> + <string-array name="keepPlayedCountValues"> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + </string-array> + <string-array name="keepPlayedCountNames"> + <item>@string/settings.keep_played_count_none</item> + <item>@string/settings.keep_played_count_one</item> + <item>@string/settings.keep_played_count_two</item> + <item>@string/settings.keep_played_count_three</item> + </string-array> + <string-array name="disconnectPauseValues"> <item>0</item> <item>3</item> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ec6c45b4..1cb85711 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -371,6 +371,11 @@ <string name="settings.temp_loss_pause_lower">Pause, lower volume when requested</string> <string name="settings.temp_loss_lower">Always lower volume</string> <string name="settings.temp_loss_nothing">Do Nothing</string> + <string name="settings.keep_played_count_title">Keep played songs</string> + <string name="settings.keep_played_count_none">Remove all played songs</string> + <string name="settings.keep_played_count_one">Keep last played songs</string> + <string name="settings.keep_played_count_two">Keep 2 played songs</string> + <string name="settings.keep_played_count_three">Keep 3 played songs</string> <string name="settings.disconnect_pause_title">Pause on Disconnect</string> <string name="settings.disconnect_pause_both">Pause</string> <string name="settings.disconnect_pause_neither">Do Nothing</string> diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index b1cbdd8c..b23825bf 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -335,6 +335,13 @@ myns:max="100"/> <ListPreference + android:title="@string/settings.keep_played_count_title" + android:key="keepPlayedCount" + android:defaultValue="0" + android:entryValues="@array/keepPlayedCountValues" + android:entries="@array/keepPlayedCountNames"/> + + <ListPreference android:title="@string/settings.temp_loss_title" android:key="tempLoss" android:defaultValue="1" |