aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2017-06-13 11:59:45 -0700
committerScott Jackson <daneren2005@gmail.com>2017-06-13 11:59:45 -0700
commit9ff3e1a006a1071a0c5cb6d95a7383318d26a685 (patch)
treef7033bd9314568d2b89d489cb4f25e82f388398f /app/src/main/res
parent0666f94a98aa4bb9eb4bd46135ea69840b2e7e4f (diff)
parentd9531316f27b766c840503392c96520c1de0af8a (diff)
downloaddsub-9ff3e1a006a1071a0c5cb6d95a7383318d26a685.tar.gz
dsub-9ff3e1a006a1071a0c5cb6d95a7383318d26a685.tar.bz2
dsub-9ff3e1a006a1071a0c5cb6d95a7383318d26a685.zip
Merge branch 'KBerstene-feature/rewindjumppreferences' into edge
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/xml/settings_playback.xml14
2 files changed, 16 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 81ee6c7a..5adf4499 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -491,6 +491,8 @@
<string name="settings.casting_cache_summary">Cache currently playing songs while casting</string>
<string name="settings.casting.dlna_casting_enabled">DLNA Enabled</string>
<string name="settings.casting.dlna_casting_enabled.summary">If you are having battery drain problems on Android 7.0 try turning this off</string>
+ <string name="settings.rewind_interval">Rewind Interval</string>
+ <string name="settings.fastforward_interval">Fast Forward Interval</string>
<string name="shuffle.title">Shuffle By</string>
<string name="shuffle.startYear">Start Year:</string>
diff --git a/app/src/main/res/xml/settings_playback.xml b/app/src/main/res/xml/settings_playback.xml
index da31d071..edaf3013 100644
--- a/app/src/main/res/xml/settings_playback.xml
+++ b/app/src/main/res/xml/settings_playback.xml
@@ -52,6 +52,20 @@
android:defaultValue="all"
android:entryValues="@array/songPressActionValues"
android:entries="@array/songPressActionNames"/>
+
+ <github.daneren2005.dsub.view.SeekBarPreference
+ android:title="@string/settings.rewind_interval"
+ android:key="rewindInterval"
+ android:defaultValue="10"
+ android:dialogLayout="@layout/seekbar_preference"
+ myns:max="60"/>
+
+ <github.daneren2005.dsub.view.SeekBarPreference
+ android:title="@string/settings.fastforward_interval"
+ android:key="fastforwardInterval"
+ android:defaultValue="30"
+ android:dialogLayout="@layout/seekbar_preference"
+ myns:max="60"/>
</PreferenceCategory>
<PreferenceCategory