From aa50f8da9dd1d0759ed336faa2aae94621f6e26d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 8 Nov 2019 14:14:28 +0100 Subject: [PATCH] move foreground setting and backup setting to main settings screen --- .../conversations/utils/Compatibility.java | 2 +- src/main/res/values/strings.xml | 2 ++ src/main/res/xml/preferences.xml | 31 ++++++++++--------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/utils/Compatibility.java b/src/main/java/eu/siacs/conversations/utils/Compatibility.java index 9e63ee3c3..4a2a14111 100644 --- a/src/main/java/eu/siacs/conversations/utils/Compatibility.java +++ b/src/main/java/eu/siacs/conversations/utils/Compatibility.java @@ -93,7 +93,7 @@ public class Compatibility { public static void removeUnusedPreferences(SettingsFragment settingsFragment) { List categories = Arrays.asList( (PreferenceCategory) settingsFragment.findPreference("notification_category"), - (PreferenceCategory) settingsFragment.findPreference("other_expert_category")); + (PreferenceCategory) settingsFragment.findPreference("advanced")); for (String key : (runsTwentySix() ? UNUSED_SETTINGS_POST_TWENTYSIX : UNUESD_SETTINGS_PRE_TWENTYSIX)) { Preference preference = settingsFragment.findPreference(key); if (preference != null) { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 75a929e3f..d9b957ec1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -880,4 +880,6 @@ Local server Most users should choose ‘jabber.network’ for better suggestions from the entirety of the public XMPP ecosystem. Channel discovery method + Backup + About diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index b071233aa..31c2f8b08 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -184,6 +184,14 @@ android:summary="@string/pref_font_size_summary" android:title="@string/pref_font_size" /> + + + @@ -193,6 +201,12 @@ android:summary="@string/pref_never_send_crash_summary" android:title="@string/pref_never_send_crash" /> + + - - - - - + + +