Merge "Assist and Voice Input SwitchPreferences animate with talkback" into nyc-mr1-dev (1c4c0af6) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/ManageAssist.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ public class ManageAssist extends SettingsPreferenceFragment
		if (preference == mContextPref) {
		Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED,
		(boolean) newValue ? 1 : 0);
		postUpdateUi();
		postGuardScreenshotPref();
		return true;
		}
		if (preference == mScreenshotPref) {
		@@ -101,15 +101,23 @@ public class ManageAssist extends SettingsPreferenceFragment
		return false;
		}

		private void postUpdateUi() {
		private void postGuardScreenshotPref() {
		mHandler.post(new Runnable() {
		@Override
		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() {
		mDefaultAssitPref.refreshAssistApps();
		mVoiceInputPref.refreshVoiceInputs();
		@@ -131,9 +139,7 @@ public class ManageAssist extends SettingsPreferenceFragment
		mVoiceInputPref.setAssistRestrict(currentAssist);
		}

		mScreenshotPref.setEnabled(mContextPref.isChecked());
		mScreenshotPref.setChecked(mContextPref.isChecked() && Settings.Secure.getInt(
		getContentResolver(), Settings.Secure.ASSIST_SCREENSHOT_ENABLED, 1) != 0);
		guardScreenshotPref();
		}

		private boolean isCurrentAssistVoiceService() {