From 67cc7c98857b3fa0897ab96b2b87f52d99e4de2f Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Sat, 28 Mar 2015 10:59:07 +0100
Subject: Sync episode actions with gpodder, smart mark as played

* Create episode actions when episodes are downloaded, played, deleted and marked as read
* Sync (download and upload) episode actions
* MediaPlayerActivity deletes almost completely played episode on close
* Improved parsing of datetime strings
* Smart mark as played can be disabled or set in the preferences
---
 app/src/main/res/xml/preferences.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/src/main/res/xml')

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6d14349d5..eb6a3fe1f 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -59,6 +59,13 @@
             android:key="prefAutoDelete"
             android:summary="@string/pref_auto_delete_sum"
             android:title="@string/pref_auto_delete_title"/>
+        <ListPreference
+            android:defaultValue="30"
+            android:entries="@array/smart_mark_as_played_values"
+            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"/>
         <Preference
             android:key="prefPlaybackSpeedLauncher"
             android:summary="@string/pref_playback_speed_sum"
-- 
cgit v1.2.3


From fd30ec8189a1d9b47adfa31a9fe7dbc2085061f6 Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Mon, 6 Apr 2015 18:32:06 +0200
Subject: Set fast forward and rewind time

---
 app/src/main/res/xml/preferences.xml | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'app/src/main/res/xml')

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index eb6a3fe1f..f06f83914 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -78,14 +78,6 @@
             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
-- 
cgit v1.2.3


From 158821c0e1953b72dc89bc5896684de3ba1ce1fb Mon Sep 17 00:00:00 2001
From: Martin Fietz <marf@hadiko-99-4.hadiko.uni-karlsruhe.de>
Date: Fri, 17 Apr 2015 11:12:54 +0200
Subject: Preference: Change nav drawer

Preference
---
 app/src/main/res/xml/preferences.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/src/main/res/xml')

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index f06f83914..c1eb857d5 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -9,6 +9,10 @@
             android:key="prefTheme"
             android:summary="@string/pref_set_theme_sum"
             android:defaultValue="0"/>
+        <Preference
+            android:key="prefHiddenDrawerItems"
+            android:summary="@string/pref_nav_drawer_items_sum"
+            android:title="@string/pref_nav_drawer_items_title" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:enabled="true"
-- 
cgit v1.2.3


From db0ce285a35841e1a781794b9214099bce38244d Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Sun, 3 May 2015 15:16:47 -0400
Subject: Optionally resume playback after call.

Defaults to true.

fixes AntennaPod/AntennaPod#753
---
 app/src/main/res/xml/preferences.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/src/main/res/xml')

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index c1eb857d5..e848915cf 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -81,6 +81,12 @@
             android:key="prefPauseForFocusLoss"
             android:summary="@string/pref_pausePlaybackForFocusLoss_sum"
             android:title="@string/pref_pausePlaybackForFocusLoss_title" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="prefResumeAfterCall"
+            android:summary="@string/pref_resumeAfterCall_sum"
+            android:title="@string/pref_resumeAfterCall_title"/>
 
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/network_pref">
-- 
cgit v1.2.3