diff options
author | Martin Fietz <Martin.Fietz@gmail.com> | 2017-10-20 20:39:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-20 20:39:11 +0200 |
commit | 7aae71e3bab10d5dff640ac1d85bf6433b6775bf (patch) | |
tree | 00e528eafa96a81948cfb659c3545f6df0094294 /app/src/main/res | |
parent | 77858ec8dfe0340478daed5a5cc1ab8692bcb30e (diff) | |
parent | 3eb637d690ec21cc9b98da1dde324c3ff2f07770 (diff) | |
download | AntennaPod-7aae71e3bab10d5dff640ac1d85bf6433b6775bf.zip |
Merge branch 'develop' into htmlpatch
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/xml/preferences.xml | 11 | ||||
-rw-r--r-- | app/src/main/res/xml/provider_paths.xml | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 0f1175ca3..e81115627 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -136,6 +136,12 @@ android:summary="@string/pref_skip_keeps_episodes_sum" android:title="@string/pref_skip_keeps_episodes_title"/> <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:defaultValue="true" + android:enabled="true" + android:key="prefFavoriteKeepsEpisode" + android:summary="@string/pref_favorite_keeps_episodes_sum" + android:title="@string/pref_favorite_keeps_episodes_title"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:defaultValue="false" android:enabled="true" android:key="prefAutoDelete" @@ -219,6 +225,11 @@ android:summary="@string/pref_automatic_download_on_battery_sum" android:defaultValue="true"/> <de.danoeh.antennapod.preferences.SwitchCompatPreference + android:key="prefEnableAutoDownloadOnMobile" + android:title="@string/pref_autodl_allow_on_mobile_title" + android:summary="@string/pref_autodl_allow_on_mobile_sum" + android:defaultValue="false"/> + <de.danoeh.antennapod.preferences.SwitchCompatPreference android:key="prefEnableAutoDownloadWifiFilter" android:title="@string/pref_autodl_wifi_filter_title" android:summary="@string/pref_autodl_wifi_filter_sum"/> diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml new file mode 100644 index 000000000..4ff893110 --- /dev/null +++ b/app/src/main/res/xml/provider_paths.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<paths xmlns:android="http://schemas.android.com/apk/res/android"> + <external-path name="external_files" path="."/> +</paths> |