Merge branch 'seek' of git://github.com/dreiss/AntennaPod into dreiss-seek

3 files changed, 22 insertions, 0 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 69ea13e52..f09c76080 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string-array name="seek_delta_values">
+        <item>5</item>
+        <item>10</item>
+        <item>15</item>
+        <item>20</item>
+        <item>30</item>
+        <item>45</item>
+        <item>60</item>
+    </string-array>
+
     <string-array name="update_intervall_options">
         <item>Manual</item>
         <item>1 hour</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8f81955e2..28fb74691 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -147,6 +147,7 @@
     <string name="position_default_label">00:00:00</string>
     <string name="player_buffering_msg">Buffering</string>
     <string name="playbackservice_notification_title">Playing podcast</string>
+    <string name="unknown_media_key">AntennaPod - Unknown media key: %1$d</string>
 
     <!-- Queue operations -->
     <string name="clear_queue_label">Clear queue</string>
@@ -242,6 +243,8 @@
     <string name="pref_gpodnet_setlogin_information_sum">Change the login information for your gpodder.net account.</string>
     <string name="pref_playback_speed_title">Playback Speeds</string>
     <string name="pref_playback_speed_sum">Customize the speeds available for variable speed audio playback</string>
+    <string name="pref_seek_delta_title">Seek Time</string>
+    <string name="pref_seek_delta_sum">Seek this many seconds when rewinding or fast-forwarding</string>
     <string name="pref_gpodnet_sethostname_title">Set hostname</string>
     <string name="pref_gpodnet_sethostname_use_default_host">Use default host</string>
    
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 8e0b886de..0afbbaca7 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -34,6 +34,15 @@
             android:key="prefPauseForFocusLoss"
             android:summary="@string/pref_pausePlaybackForFocusLoss_sum"
             android:title="@string/pref_pausePlaybackForFocusLoss_title" />
+
+        <ListPreference
+            android:defaultValue="30"
+            android:entries="@array/seek_delta_values"
+            android:entryValues="@array/seek_delta_values"
+            android:key="prefSeekDeltaSecs"
+            android:summary="@string/pref_seek_delta_sum"
+            android:title="@string/pref_seek_delta_title" />
+
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/network_pref">
         <ListPreference