summaryrefslogtreecommitdiff
path: root/app/src/main/res/xml
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2015-06-16 20:17:04 -0400
committerTom Hennen <TomHennen@users.noreply.github.com>2015-06-16 20:17:04 -0400
commitec4ed747b6de9ab98d3ad31a0256a77b8e8cc25c (patch)
tree7dfa03fff2e7a7a9fc0d32b74e313668e9b6bcb2 /app/src/main/res/xml
parentf88c80cced6c3b529a6ef1addafaa930fb41d58f (diff)
parent3d102449bc2bf78b6c5645ee738e6658c9cb155f (diff)
downloadAntennaPod-ec4ed747b6de9ab98d3ad31a0256a77b8e8cc25c.zip
Merge pull request #881 from AntennaPod/develop1.2
Release of 1.2
Diffstat (limited to 'app/src/main/res/xml')
-rw-r--r--app/src/main/res/xml/preferences.xml25
1 files changed, 17 insertions, 8 deletions
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6d14349d5..e848915cf 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"
@@ -59,6 +63,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"
@@ -70,14 +81,12 @@
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" />
+ <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">