Merge branch 'develop' into folders

6 files changed, 63 insertions, 22 deletions

diff --git a/app/src/main/res/xml/actions.xml b/app/src/main/res/xml/actions.xml
new file mode 100644
index 000000000..20dc3dc9b
--- /dev/null
+++ b/app/src/main/res/xml/actions.xml
@@ -0,0 +1,25 @@
+<?xml version ="1.0" encoding ="utf-8"?>
+<actions>
+    <action intentName="actions.intent.OPEN_APP_FEATURE">
+        <fulfillment urlTemplate="https://antennapod.org/deeplink/main{?page}">
+            <parameter-mapping intentParameter="feature" urlParameter="page" />
+        </fulfillment>
+        <parameter name="feature">
+            <entity-set-reference entitySetId="featureEntitySet" />
+        </parameter>
+    </action>
+
+    <action intentName="actions.intent.GET_THING">
+        <fulfillment urlTemplate="https://antennapod.org/deeplink/search{?query}">
+            <parameter-mapping intentParameter="thing.name" urlParameter="query"/>
+        </fulfillment>
+    </action>
+
+    <entity-set entitySetId="featureEntitySet">
+        <entity identifier="QUEUE" name="@string/queue_label" />
+        <entity identifier="EPISODES" name="@string/episodes_label" />
+        <entity identifier="DOWNLOADS" name="@string/downloads_label" />
+        <entity identifier="SUBSCRIPTIONS" name="@string/subscriptions_label" />
+        <entity identifier="HISTORY" name="@string/playback_history_label" />
+    </entity-set>
+</actions>
diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
index a0142b7b9..8a63ac8e9 100644
--- a/app/src/main/res/xml/feed_settings.xml
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -9,6 +9,14 @@
             android:title="@string/keep_updated"
             android:summary="@string/keep_updated_summary"/>
 
+    <SwitchPreferenceCompat
+            android:key="episodeNotification"
+            android:defaultValue="false"
+            android:dependency="keepUpdated"
+            android:icon="?attr/ic_notifications"
+            android:title="@string/episode_notification"
+            android:summary="@string/episode_notification_summary"/>
+
     <Preference
             android:key="authentication"
             android:icon="?attr/ic_key"
diff --git a/app/src/main/res/xml/player_widget_info.xml b/app/src/main/res/xml/player_widget_info.xml
index 79cdd4a69..803cc89ed 100644
--- a/app/src/main/res/xml/player_widget_info.xml
+++ b/app/src/main/res/xml/player_widget_info.xml
@@ -8,5 +8,4 @@
                     android:minWidth="250dp"
                     android:minResizeWidth="40dp"
                     android:configure="de.danoeh.antennapod.activity.WidgetConfigActivity">
-
-</appwidget-provider>
\ No newline at end of file
+</appwidget-provider>
diff --git a/app/src/main/res/xml/preferences_gpodder.xml b/app/src/main/res/xml/preferences_gpodder.xml
index 7bddbf245..a210b8e11 100644
--- a/app/src/main/res/xml/preferences_gpodder.xml
+++ b/app/src/main/res/xml/preferences_gpodder.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <PreferenceScreen
+    <Preference
+            android:key="pref_gpodnet_description"
+            android:icon="@drawable/gpodder_icon"
+            android:summary="@string/gpodnet_description"/>
+    <Preference
             android:key="pref_gpodnet_authenticate"
             android:title="@string/pref_gpodnet_authenticate_title"
-            android:summary="@string/pref_gpodnet_authenticate_sum">
-        <intent android:action=".activity.gpoddernet.GpodnetAuthenticationActivity"/>
-    </PreferenceScreen>
+            android:summary="@string/pref_gpodnet_authenticate_sum"/>
     <Preference
             android:key="pref_gpodnet_setlogin_information"
             android:title="@string/pref_gpodnet_setlogin_information_title"
@@ -23,8 +24,5 @@
     <Preference
             android:key="pref_gpodnet_logout"
             android:title="@string/pref_gpodnet_logout_title"/>
-    <Preference
-            android:key="pref_gpodnet_hostname"
-            android:title="@string/pref_gpodnet_sethostname_title"/>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml
index d2999c59d..2be8492eb 100644
--- a/app/src/main/res/xml/preferences_playback.xml
+++ b/app/src/main/res/xml/preferences_playback.xml
@@ -44,18 +44,6 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/playback_control">
-        <SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:enabled="true"
-                android:key="prefHardwareForwardButtonSkips"
-                android:summary="@string/pref_hardwareForwardButtonSkips_sum"
-                android:title="@string/pref_hardwareForwardButtonSkips_title"/>
-        <SwitchPreferenceCompat
-                android:defaultValue="false"
-                android:enabled="true"
-                android:key="prefHardwarePreviousButtonRestarts"
-                android:summary="@string/pref_hardwarePreviousButtonRestarts_sum"
-                android:title="@string/pref_hardwarePreviousButtonRestarts_title"/>
         <Preference
                 android:key="prefPlaybackFastForwardDeltaLauncher"
                 android:summary="@string/pref_fast_forward_sum"
@@ -80,6 +68,23 @@
                 android:title="@string/pref_stream_over_download_title"/>
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/reassign_hardware_buttons">
+        <ListPreference
+                android:defaultValue="@string/keycode_media_fast_forward"
+                android:entries="@array/button_action_options"
+                android:entryValues="@array/button_action_values"
+                android:key="prefHardwareForwardButton"
+                android:title="@string/pref_hardware_forward_button_title"
+                android:summary="@string/pref_hardware_forward_button_summary"/>
+        <ListPreference
+                android:defaultValue="@string/keycode_media_rewind"
+                android:entries="@array/button_action_options"
+                android:entryValues="@array/button_action_values"
+                android:key="prefHardwarePreviousButton"
+                android:title="@string/pref_hardware_previous_button_title"
+                android:summary="@string/pref_hardware_previous_button_summary"/>
+    </PreferenceCategory>
+
     <PreferenceCategory android:title="@string/queue_label">
         <SwitchPreferenceCompat
                 android:defaultValue="true"
diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml
index a3cb53307..f8e80cdff 100644
--- a/app/src/main/res/xml/preferences_user_interface.xml
+++ b/app/src/main/res/xml/preferences_user_interface.xml
@@ -21,6 +21,12 @@
                 android:summary="@string/pref_episode_cover_summary"
                 android:defaultValue="true"
                 android:enabled="true"/>
+        <SwitchPreferenceCompat
+                android:title="@string/pref_show_remain_time_title"
+                android:key="showTimeLeft"
+                android:summary="@string/pref_show_remain_time_summary"
+                android:defaultValue="false"
+                android:enabled="true"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/subscriptions_label">
         <Preference