diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2019-03-04 18:57:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-04 18:57:37 +0100 |
commit | c0f534e8252169f4affa4ae30dd7ee3955ff6039 (patch) | |
tree | 8850733f81e5f807517bddc6ca3f02bcec9e24cd /app/src/main | |
parent | cfa9304c824f755c9fd2b92c5134778a1a0e4d1f (diff) | |
parent | 579b263a867bb59c8c4485d1fad7e6b6e528a67e (diff) | |
download | AntennaPod-c0f534e8252169f4affa4ae30dd7ee3955ff6039.zip |
Merge pull request #3050 from ByteHamster/add-backup-keyword
Add backup keyword to search
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java | 35 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences_storage.xml | 13 |
2 files changed, 21 insertions, 27 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java index ed6c1698a..a157a2cfa 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -581,31 +581,24 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc config.setFragmentContainerViewId(R.id.content); config.setBreadcrumbsEnabled(true); - config.index() - .addBreadcrumb(getTitleOfPage(R.xml.preferences_user_interface)) - .addFile(R.xml.preferences_user_interface); - config.index() - .addBreadcrumb(getTitleOfPage(R.xml.preferences_playback)) - .addFile(R.xml.preferences_playback); - config.index() - .addBreadcrumb(getTitleOfPage(R.xml.preferences_network)) - .addFile(R.xml.preferences_network); - config.index() - .addBreadcrumb(getTitleOfPage(R.xml.preferences_storage)) - .addFile(R.xml.preferences_storage); - config.index() + config.index(R.xml.preferences_user_interface) + .addBreadcrumb(getTitleOfPage(R.xml.preferences_user_interface)); + config.index(R.xml.preferences_playback) + .addBreadcrumb(getTitleOfPage(R.xml.preferences_playback)); + config.index(R.xml.preferences_network) + .addBreadcrumb(getTitleOfPage(R.xml.preferences_network)); + config.index(R.xml.preferences_storage) + .addBreadcrumb(getTitleOfPage(R.xml.preferences_storage)); + config.index(R.xml.preferences_autodownload) .addBreadcrumb(getTitleOfPage(R.xml.preferences_network)) .addBreadcrumb(R.string.automation) - .addBreadcrumb(getTitleOfPage(R.xml.preferences_autodownload)) - .addFile(R.xml.preferences_autodownload); - config.index() + .addBreadcrumb(getTitleOfPage(R.xml.preferences_autodownload)); + config.index(R.xml.preferences_gpodder) .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations)) - .addBreadcrumb(getTitleOfPage(R.xml.preferences_gpodder)) - .addFile(R.xml.preferences_gpodder); - config.index() + .addBreadcrumb(getTitleOfPage(R.xml.preferences_gpodder)); + config.index(R.xml.preferences_flattr) .addBreadcrumb(getTitleOfPage(R.xml.preferences_integrations)) - .addBreadcrumb(getTitleOfPage(R.xml.preferences_flattr)) - .addFile(R.xml.preferences_flattr); + .addBreadcrumb(getTitleOfPage(R.xml.preferences_flattr)); } public PreferenceFragmentCompat openScreen(int preferences, AppCompatActivity activity) { diff --git a/app/src/main/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml index 989bb68d7..9f394ad12 100644 --- a/app/src/main/res/xml/preferences_storage.xml +++ b/app/src/main/res/xml/preferences_storage.xml @@ -1,7 +1,7 @@ <?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"> + xmlns:search="http://schemas.android.com/apk/com.bytehamster.lib.preferencesearch"> <Preference android:title="@string/choose_data_directory" @@ -26,11 +26,11 @@ android:summary="@string/pref_favorite_keeps_episodes_sum" android:title="@string/pref_favorite_keeps_episodes_title"/> <SwitchPreference - android:defaultValue="false" - android:enabled="true" - android:key="prefDeleteRemovesFromQueue" - android:summary="@string/pref_delete_removes_from_queue_sum" - android:title="@string/pref_delete_removes_from_queue_title"/> + android:defaultValue="false" + android:enabled="true" + android:key="prefDeleteRemovesFromQueue" + android:summary="@string/pref_delete_removes_from_queue_sum" + android:title="@string/pref_delete_removes_from_queue_title"/> <PreferenceCategory android:title="@string/import_export_pref"> <Preference @@ -44,6 +44,7 @@ android:title="@string/html_export_label"/> <Preference android:key="importExport" + search:keywords="@string/import_export_search_keywords" android:title="@string/import_export"/> </PreferenceCategory> </PreferenceScreen> |