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 am: 0493422

Browse Source 
am: 0df85e3

* commit '0df85e3e235e666b4122a77acfb3ff8fea0bd375':
  Always update value of screenshot preference

Change-Id: I6bb2472b151626d1a5a946e6cbb659e0dc64da07
This commit is contained in:
Jorim Jaggi
2016-04-12 18:55:47 +00:00
committed by android-build-merger
parent c72a8de8dc 0df85e3e23
commit 918dbcb0d4
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() {