diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-08-05 12:36:18 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-08-05 12:36:18 +0200 |
commit | 3f55a61c250c5b9dd81dd4dcfd4c9531369d2152 (patch) | |
tree | 91cd1cb9076fe04a5a063938d8584c99bdc91649 /src/main/java/de/pixart/messenger/ui/SettingsActivity.java | |
parent | 7414a4e5a2567b312099e82f818d46608d8bbdfb (diff) |
introduced config flag to show attachment button instead of quick actions
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/SettingsActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/SettingsActivity.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java index 5f10ceea6..9ee11bd0b 100644 --- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java @@ -116,6 +116,7 @@ public class SettingsActivity extends XmppActivity implements } PreferenceScreen mainPreferenceScreen = (PreferenceScreen) mSettingsFragment.findPreference("main_screen"); + PreferenceScreen UIPreferenceScreen = (PreferenceScreen) mSettingsFragment.findPreference("userinterface"); //this feature is only available on Huawei Android 6. PreferenceScreen huaweiPreferenceScreen = (PreferenceScreen) mSettingsFragment.findPreference("huawei"); @@ -172,6 +173,12 @@ public class SettingsActivity extends XmppActivity implements quickAction.setEntryValues(entryValues.toArray(new CharSequence[entryValues.size()])); } + if (Config.QUICK_SHARE_ATTACHMENT_CHOICE) { + if (UIPreferenceScreen != null && quickAction != null) { + UIPreferenceScreen.removePreference(quickAction); + } + } + final Preference removeCertsPreference = mSettingsFragment.findPreference("remove_trusted_certificates"); if (removeCertsPreference != null) { removeCertsPreference.setOnPreferenceClickListener(preference -> { |