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
This commit is contained in:
Jorim Jaggi
2016-04-12 18:13:00 +00:00
committed by Android (Google) Code Review
parent 7f6ba63fcf aa337e39d5
commit 0493422de2
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); mContextPref.setOnPreferenceChangeListener(this);
mScreenshotPref = (SwitchPreference) findPreference(KEY_SCREENSHOT); mScreenshotPref = (SwitchPreference) findPreference(KEY_SCREENSHOT);
mScreenshotPref.setChecked(Settings.Secure.getInt(getContentResolver(),
Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);
mScreenshotPref.setOnPreferenceChangeListener(this); mScreenshotPref.setOnPreferenceChangeListener(this);
mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT); mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT);
@@ -134,9 +132,8 @@ public class ManageAssist extends SettingsPreferenceFragment
} }
mScreenshotPref.setEnabled(mContextPref.isChecked()); mScreenshotPref.setEnabled(mContextPref.isChecked());
if (!mContextPref.isChecked()) { mScreenshotPref.setChecked(mContextPref.isChecked() && Settings.Secure.getInt(
mScreenshotPref.setChecked(false); getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);
}
} }
private boolean isCurrentAssistVoiceService() { private boolean isCurrentAssistVoiceService() {