PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always update value of screenshot preference" into nyc-dev

Browse Source 
am: 0493422

* commit '0493422de2a6c1f6ed5443ac6ebaa72fc844cef4':
  Always update value of screenshot preference

Change-Id: I9d00cfce4dbd8b9baf8aa4ce103e6dcd11c5496a
This commit is contained in:
Jorim Jaggi
2016-04-12 18:50:26 +00:00
committed by android-build-merger
parent 0ec0ffde58 0493422de2
commit 0df85e3e23
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/applications/ManageAssist.java
View File

@@ -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() {