Merge remote-tracking branch 'upstream/develop' into feat/simple-adjust-volume-per-feed

6 files changed, 66 insertions, 28 deletions

diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
index 2e58d3445..9f2a0ba82 100644
--- a/app/src/main/res/xml/feed_settings.xml
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -4,22 +4,26 @@
 
     <SwitchPreference
             android:key="keepUpdated"
+            android:icon="?attr/navigation_refresh"
             android:title="@string/keep_updated"
             android:summary="@string/keep_updated_summary"/>
 
     <Preference
             android:key="authentication"
+            android:icon="?attr/ic_key"
             android:title="@string/authentication_label"
             android:summary="@string/authentication_descr"/>
 
     <ListPreference
             android:key="feedPlaybackSpeed"
+            android:icon="?attr/ic_settings_speed"
             android:title="@string/playback_speed"
             android:summary="@string/pref_feed_playback_speed_sum"/>
 
     <ListPreference
             android:entries="@array/spnAutoDeleteItems"
             android:entryValues="@array/spnAutoDeleteValues"
+            android:icon="?attr/content_discard"
             android:title="@string/auto_delete_label"
             android:key="autoDelete"/>
 
diff --git a/app/src/main/res/xml/player_widget_info.xml b/app/src/main/res/xml/player_widget_info.xml
index 1dbfabcd6..79cdd4a69 100644
--- a/app/src/main/res/xml/player_widget_info.xml
+++ b/app/src/main/res/xml/player_widget_info.xml
@@ -6,6 +6,7 @@
                     android:previewImage="@drawable/ic_widget_preview"
                     android:minHeight="40dp"
                     android:minWidth="250dp"
-                    android:minResizeWidth="40dp">
+                    android:minResizeWidth="40dp"
+                    android:configure="de.danoeh.antennapod.activity.WidgetConfigActivity">
 
 </appwidget-provider>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_about.xml b/app/src/main/res/xml/preferences_about.xml
new file mode 100644
index 000000000..9b8d744e1
--- /dev/null
+++ b/app/src/main/res/xml/preferences_about.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <Preference
+            android:layout="@layout/about_teaser"/>
+    <Preference
+            android:key="about_version"
+            android:title="@string/antennapod_version"
+            android:icon="?attr/ic_unfav"
+            android:summary="1.7.2 (asd8qs)"/>
+    <Preference
+            android:key="about_developers"
+            android:icon="?attr/ic_settings"
+            android:summary="@string/developers_summary"
+            android:title="@string/developers"/>
+    <Preference
+            android:key="about_translators"
+            android:icon="?attr/ic_chat"
+            android:summary="@string/translators_summary"
+            android:title="@string/translators"/>
+    <Preference
+            android:key="about_privacy_policy"
+            android:icon="?attr/ic_questionmark"
+            android:summary="https://antennapod.org/privacy.html"
+            android:title="@string/privacy_policy"/>
+    <Preference
+            android:key="about_licenses"
+            android:icon="?attr/action_about"
+            android:summary="@string/licenses_summary"
+            android:title="@string/licenses"/>
+
+</PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_autodownload.xml b/app/src/main/res/xml/preferences_autodownload.xml
index a4967c839..333224aa0 100644
--- a/app/src/main/res/xml/preferences_autodownload.xml
+++ b/app/src/main/res/xml/preferences_autodownload.xml
@@ -15,16 +15,14 @@
             android:key="prefEpisodeCacheSize"
             android:title="@string/pref_episode_cache_title"
             android:summary="@string/pref_episode_cache_summary"
-            android:entryValues="@array/episode_cache_size_values"
-            app:useStockLayout="true"/>
+            android:entryValues="@array/episode_cache_size_values"/>
     <ListPreference
             android:defaultValue="-1"
             android:entries="@array/episode_cleanup_entries"
             android:key="prefEpisodeCleanup"
             android:title="@string/pref_episode_cleanup_title"
             android:summary="@string/pref_episode_cleanup_summary"
-            android:entryValues="@array/episode_cleanup_values"
-            app:useStockLayout="true"/>
+            android:entryValues="@array/episode_cleanup_values"/>
     <SwitchPreference
             android:key="prefEnableAutoDownloadOnBattery"
             android:title="@string/pref_automatic_download_on_battery_title"
diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml
index d609d3daa..7a7535dda 100644
--- a/app/src/main/res/xml/preferences_playback.xml
+++ b/app/src/main/res/xml/preferences_playback.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory android:title="@string/interruptions">
         <SwitchPreference
@@ -42,8 +40,7 @@
                 android:entryValues="@array/video_background_behavior_values"
                 android:key="prefVideoBehavior"
                 android:summary="@string/pref_videoBehavior_sum"
-                android:title="@string/pref_videoBehavior_title"
-                app:useStockLayout="true"/>
+                android:title="@string/pref_videoBehavior_title"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/playback_control">
@@ -76,6 +73,11 @@
                 android:key="prefPlaybackTimeRespectsSpeed"
                 android:summary="@string/pref_playback_time_respects_speed_sum"
                 android:title="@string/pref_playback_time_respects_speed_title"/>
+        <SwitchPreference
+                android:defaultValue="false"
+                android:key="prefStreamOverDownload"
+                android:summary="@string/pref_stream_over_download_sum"
+                android:title="@string/pref_stream_over_download_title"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/queue_label">
@@ -85,12 +87,12 @@
                 android:key="prefEnqueueDownloaded"
                 android:summary="@string/pref_enqueue_downloaded_summary"
                 android:title="@string/pref_enqueue_downloaded_title" />
-        <SwitchPreference
-                android:defaultValue="false"
-                android:enabled="true"
-                android:key="prefQueueAddToFront"
-                android:summary="@string/pref_queueAddToFront_sum"
-                android:title="@string/pref_queueAddToFront_title"/>
+        <ListPreference
+                android:defaultValue="BACK"
+                android:entries="@array/enqueue_location_options"
+                android:entryValues="@array/enqueue_location_values"
+                android:key="prefEnqueueLocation"
+                android:title="@string/pref_enqueue_location_title"/>
         <SwitchPreference
                 android:defaultValue="true"
                 android:enabled="true"
@@ -103,8 +105,7 @@
                 android:entryValues="@array/smart_mark_as_played_values"
                 android:key="prefSmartMarkAsPlayedSecs"
                 android:summary="@string/pref_smart_mark_as_played_sum"
-                android:title="@string/pref_smart_mark_as_played_title"
-                app:useStockLayout="true"/>
+                android:title="@string/pref_smart_mark_as_played_title"/>
         <SwitchPreference
                 android:defaultValue="true"
                 android:enabled="true"
@@ -120,8 +121,7 @@
                 android:key="prefMediaPlayer"
                 android:title="@string/media_player"
                 android:summary="@string/pref_media_player_message"
-                android:entryValues="@array/media_player_values"
-                app:useStockLayout="true"/>
+                android:entryValues="@array/media_player_values"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/experimental_pref">
diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml
index c48e9adc8..20a06c4c4 100644
--- a/app/src/main/res/xml/preferences_user_interface.xml
+++ b/app/src/main/res/xml/preferences_user_interface.xml
@@ -10,8 +10,7 @@
                 android:title="@string/pref_set_theme_title"
                 android:key="prefTheme"
                 android:summary="@string/pref_set_theme_sum"
-                android:defaultValue="system"
-                app:useStockLayout="true"/>
+                android:defaultValue="system"/>
         <Preference
                 android:key="prefHiddenDrawerItems"
                 android:summary="@string/pref_nav_drawer_items_sum"
@@ -22,16 +21,20 @@
                 android:title="@string/pref_nav_drawer_feed_order_title"
                 android:key="prefDrawerFeedOrder"
                 android:summary="@string/pref_nav_drawer_feed_order_sum"
-                android:defaultValue="0"
-                app:useStockLayout="true"/>
+                android:defaultValue="0"/>
         <ListPreference
                 android:entryValues="@array/nav_drawer_feed_counter_values"
                 android:entries="@array/nav_drawer_feed_counter_options"
                 android:title="@string/pref_nav_drawer_feed_counter_title"
                 android:key="prefDrawerFeedIndicator"
                 android:summary="@string/pref_nav_drawer_feed_counter_sum"
-                android:defaultValue="0"
-                app:useStockLayout="true"/>
+                android:defaultValue="0"/>
+        <SwitchPreference
+                android:title="@string/pref_episode_cover_title"
+                android:key="prefEpisodeCover"
+                android:summary="@string/pref_episode_cover_summary"
+                android:defaultValue="true"
+                android:enabled="true"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/external_elements">
         <SwitchPreference
@@ -64,7 +67,6 @@
                 android:key="prefBackButtonBehavior"
                 android:title="@string/pref_back_button_behavior_title"
                 android:summary="@string/pref_back_button_behavior_sum"
-                android:defaultValue="default"
-                app:useStockLayout="true"/>
+                android:defaultValue="default"/>
     </PreferenceCategory>
 </PreferenceScreen>