Merge branch 'playback-speed' into speed

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/de/danoeh/antennapod/activity/PreferenceActivity.java
	src/de/danoeh/antennapod/service/PlaybackService.java

5 files changed, 29 insertions, 13 deletions

diff --git a/res/layout-land/audioplayer_activity.xml b/res/layout-land/audioplayer_activity.xml
index 521dbc68a..1e671c745 100644
--- a/res/layout-land/audioplayer_activity.xml
+++ b/res/layout-land/audioplayer_activity.xml
@@ -92,14 +92,12 @@
                 android:layout_width="80dp"
                 android:layout_height="match_parent"
                 android:layout_centerHorizontal="true"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
                 android:background="?attr/borderless_button"
                 android:src="?attr/av_pause" />
 
             <ImageButton
                 android:id="@+id/butRev"
-                android:layout_width="80dp"
+                android:layout_width="60dp"
                 android:layout_height="match_parent"
                 android:layout_toLeftOf="@id/butPlay"
                 android:background="?attr/borderless_button"
@@ -107,11 +105,22 @@
 
             <ImageButton
                 android:id="@+id/butFF"
-                android:layout_width="80dp"
+                android:layout_width="60dp"
                 android:layout_height="match_parent"
                 android:layout_toRightOf="@id/butPlay"
                 android:background="?attr/borderless_button"
                 android:src="?attr/av_fast_forward" />
+
+            <Button
+                android:id="@+id/butPlaybackSpeed"
+                android:layout_width="60dp"
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@id/butFF"
+                android:background="?attr/borderless_button"
+                android:src="?attr/av_fast_forward"
+                android:textColor="@color/gray"
+                android:textSize="@dimen/text_size_medium"
+                android:visibility="gone" />
         </RelativeLayout>
 
         <RelativeLayout
diff --git a/res/layout/audioplayer_activity.xml b/res/layout/audioplayer_activity.xml
index bf7540ed1..857d7140f 100644
--- a/res/layout/audioplayer_activity.xml
+++ b/res/layout/audioplayer_activity.xml
@@ -79,8 +79,6 @@
             android:layout_width="80dp"
             android:layout_height="match_parent"
             android:layout_centerHorizontal="true"
-            android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
             android:background="?attr/borderless_button"
             android:src="?attr/av_pause" />
 
@@ -99,6 +97,17 @@
             android:layout_toRightOf="@id/butPlay"
             android:background="?attr/borderless_button"
             android:src="?attr/av_fast_forward" />
+
+        <Button
+            android:id="@+id/butPlaybackSpeed"
+            android:layout_width="80dp"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@id/butFF"
+            android:background="?attr/borderless_button"
+            android:src="?attr/av_fast_forward"
+            android:textColor="@color/gray"
+            android:textSize="@dimen/text_size_medium"
+            android:visibility="gone" />
     </RelativeLayout>
 
     <RelativeLayout
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 9881ae2bd..63c2e1db3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -20,7 +20,6 @@
         <item>12</item>
         <item>24</item>
     </string-array>
-    
     <string-array name="episode_cache_size_entries">
         <item>@string/pref_episode_cache_unlimited</item>
         <item>10</item>
@@ -30,7 +29,6 @@
         <item>80</item>
         <item>100</item>
     </string-array>
-    
     <string-array name="episode_cache_size_values">
         <item>-1</item>
         <item>10</item>
@@ -40,7 +38,6 @@
         <item>80</item>
         <item>100</item>
     </string-array>
-    
     <string-array name="playback_speed_values">
         <item>1.0</item>
         <item>1.10</item>
@@ -58,16 +55,13 @@
     <string-array name="autodl_select_networks_default_entries">
         <item>N/A</item>
     </string-array>
-    
     <string-array name="autodl_select_networks_default_values">
         <item>0</item>
     </string-array>
-    
     <string-array name="theme_options">
         <item>@string/pref_theme_title_light</item>
         <item>@string/pref_theme_title_dark</item>
     </string-array>
-    
     <string-array name="theme_values">
         <item>0</item>
         <item>1</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 21ddf829b..207c5a371 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -190,8 +190,12 @@
     <string name="pref_theme_title_light">Light</string>
     <string name="pref_theme_title_dark">Dark</string>
     <string name="pref_episode_cache_unlimited">Unlimited</string>
+    <string name="pref_update_interval_hours_plural">hours</string>
+    <string name="pref_update_interval_hours_singular">hour</string>
+    <string name="pref_update_interval_hours_manual">Manual</string>
     <string name="pref_playback_speed_title">Playback Speed</string>
     <string name="pref_playback_speed_sum">Change the speed of audio playback using a 3rd party control</string>
+   
 
     <!-- Search -->
     <string name="search_hint">Search for Feeds or Episodes</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 39c9fba64..cf3219681 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -26,7 +26,7 @@
     <PreferenceCategory android:title="@string/network_pref" >
         <ListPreference
             android:defaultValue="0"
-            android:entries="@array/update_intervall_options"
+            android:entries="@array/update_intervall_values"
             android:entryValues="@array/update_intervall_values"
             android:key="prefAutoUpdateIntervall"
             android:summary="@string/pref_autoUpdateIntervall_sum"