diff options
author | Scott Jackson <daneren2005@gmail.com> | 2012-11-12 09:54:22 -0800 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2012-11-12 09:54:22 -0800 |
commit | 3a64650fa51b5caf330bcd8b0fa6d8e514397e6f (patch) | |
tree | 8f5e25ba292c34e1683db602f5ca63eb77df98de /subsonic-android/res | |
parent | 4e4dc1bb43066da355da90c1f2c220a9b4e56e23 (diff) | |
download | dsub-3a64650fa51b5caf330bcd8b0fa6d8e514397e6f.tar.gz dsub-3a64650fa51b5caf330bcd8b0fa6d8e514397e6f.tar.bz2 dsub-3a64650fa51b5caf330bcd8b0fa6d8e514397e6f.zip |
Added option to either pause or lower volume on transient loss of audio focus
Diffstat (limited to 'subsonic-android/res')
-rw-r--r-- | subsonic-android/res/values/arrays.xml | 11 | ||||
-rw-r--r-- | subsonic-android/res/values/strings.xml | 4 | ||||
-rw-r--r-- | subsonic-android/res/xml/settings.xml | 7 |
3 files changed, 22 insertions, 0 deletions
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml index 0ebb02bd..dcec441f 100644 --- a/subsonic-android/res/values/arrays.xml +++ b/subsonic-android/res/values/arrays.xml @@ -91,5 +91,16 @@ <item>@string/settings.network_timeout_45000</item> <item>@string/settings.network_timeout_60000</item> </string-array> + + <string-array name="tempLossValues"> + <item>0</item> + <item>2</item> + <item>4</item> + </string-array> + <string-array name="tempLossNames"> + <item>@string/settings.temp_loss_pause</item> + <item>@string/settings.temp_loss_half</item> + <item>@string/settings.temp_loss_fourth</item> + </string-array> </resources>
\ No newline at end of file diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index 61c705ba..074d9686 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -225,6 +225,10 @@ <string name="settings.sleep_timer_off">Off</string>
<string name="settings.sleep_timer_on">On</string>
<string name="settings.sleep_timer_always_on">Always On</string>
+ <string name="settings.temp_loss_title">Temperary Loss of Focus</string>
+ <string name="settings.temp_loss_pause">Pause Playback</string>
+ <string name="settings.temp_loss_half">Half volume</string>
+ <string name="settings.temp_loss_fourth">Fourth Volume</string>
<string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string>
diff --git a/subsonic-android/res/xml/settings.xml b/subsonic-android/res/xml/settings.xml index 294f7601..f79063cc 100644 --- a/subsonic-android/res/xml/settings.xml +++ b/subsonic-android/res/xml/settings.xml @@ -161,6 +161,13 @@ android:key="sleepTimerDuration" android:defaultValue="60" android:digits="0123456789"/> + + <ListPreference + android:title="@string/settings.temp_loss_title" + android:key="tempLoss" + android:defaultValue="0" + android:entryValues="@array/tempLossValues" + android:entries="@array/tempLossNames"/> </PreferenceCategory> <PreferenceCategory |