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

Merge "Assist and Voice Input SwitchPreferences animate with talkback" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-28 17:58:00 +00:00
committed by Android (Google) Code Review
parent 3edc1645a5 91e3e434cf
commit 1c4c0af613
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ public class ManageAssist extends SettingsPreferenceFragment
if (preference == mContextPref) { if (preference == mContextPref) {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED, Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED,
(boolean) newValue ? 1 : 0); (boolean) newValue ? 1 : 0);
postUpdateUi(); postGuardScreenshotPref();
return true; return true;
} }
if (preference == mScreenshotPref) { if (preference == mScreenshotPref) {
@@ -101,15 +101,23 @@ public class ManageAssist extends SettingsPreferenceFragment
return false; return false;
} }
private void postUpdateUi() { private void postGuardScreenshotPref() {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
updateUi(); guardScreenshotPref();
} }
}); });
} }
private void guardScreenshotPref() {
boolean isChecked = mContextPref.isChecked();
boolean screenshotPrefWasSet = Settings.Secure.getInt(
getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0;
mScreenshotPref.setEnabled(isChecked);
mScreenshotPref.setChecked(isChecked && screenshotPrefWasSet);
}
private void updateUi() { private void updateUi() {
mDefaultAssitPref.refreshAssistApps(); mDefaultAssitPref.refreshAssistApps();
mVoiceInputPref.refreshVoiceInputs(); mVoiceInputPref.refreshVoiceInputs();
@@ -131,9 +139,7 @@ public class ManageAssist extends SettingsPreferenceFragment
mVoiceInputPref.setAssistRestrict(currentAssist); mVoiceInputPref.setAssistRestrict(currentAssist);
} }
mScreenshotPref.setEnabled(mContextPref.isChecked()); guardScreenshotPref();
mScreenshotPref.setChecked(mContextPref.isChecked() && Settings.Secure.getInt(
getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);
} }
private boolean isCurrentAssistVoiceService() { private boolean isCurrentAssistVoiceService() {