From aa337e39d53995757dc039d0dd5b910b4e14cb00 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Mon, 11 Apr 2016 19:17:59 -0700 Subject: [PATCH] Always update value of screenshot preference Bug: 26014678 Change-Id: I6127dee5c911171bc9b708dfe1e9ee21b17d0833 --- src/com/android/settings/applications/ManageAssist.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java index 7af967cddb..6fe966dc1c 100644 --- a/src/com/android/settings/applications/ManageAssist.java +++ b/src/com/android/settings/applications/ManageAssist.java @@ -60,8 +60,6 @@ public class ManageAssist extends SettingsPreferenceFragment mContextPref.setOnPreferenceChangeListener(this); mScreenshotPref = (SwitchPreference) findPreference(KEY_SCREENSHOT); - mScreenshotPref.setChecked(Settings.Secure.getInt(getContentResolver(), - Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0); mScreenshotPref.setOnPreferenceChangeListener(this); mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT); @@ -134,9 +132,8 @@ public class ManageAssist extends SettingsPreferenceFragment } mScreenshotPref.setEnabled(mContextPref.isChecked()); - if (!mContextPref.isChecked()) { - mScreenshotPref.setChecked(false); - } + mScreenshotPref.setChecked(mContextPref.isChecked() && Settings.Secure.getInt( + getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0); } private boolean isCurrentAssistVoiceService() { -- 2.11.0