am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev (22064d8b) · Commits · e / os / android_packages_apps_Settings

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.app.AlertDialog;
		import android.content.ComponentName;
		import android.content.DialogInterface;
		import android.os.Bundle;
		import android.os.Handler;
		import android.preference.Preference;
		import android.preference.SwitchPreference;
		import android.provider.Settings;
		@@ -45,6 +46,7 @@ public class ManageAssist extends SettingsPreferenceFragment
		private SwitchPreference mContextPref;
		private SwitchPreference mScreenshotPref;
		private VoiceInputListPreference mVoiceInputPref;
		private Handler mHandler = new Handler();

		@Override
		public void onCreate(Bundle icicle) {
		@@ -78,6 +80,7 @@ public class ManageAssist extends SettingsPreferenceFragment
		if (preference == mContextPref) {
		Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSIST_STRUCTURE_ENABLED,
		(boolean) newValue ? 1 : 0);
		postUpdateUi();
		return true;
		}
		if (preference == mScreenshotPref) {
		@@ -102,6 +105,15 @@ public class ManageAssist extends SettingsPreferenceFragment
		return false;
		}

		private void postUpdateUi() {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		updateUi();
		}
		});
		}

		private void updateUi() {
		mDefaultAssitPref.refreshAssistApps();
		mVoiceInputPref.refreshVoiceInputs();
		@@ -122,6 +134,11 @@ public class ManageAssist extends SettingsPreferenceFragment
		getPreferenceScreen().addPreference(mVoiceInputPref);
		mVoiceInputPref.setAssistRestrict(currentAssist);
		}

		mScreenshotPref.setEnabled(mContextPref.isChecked());
		if (!mContextPref.isChecked()) {
		mScreenshotPref.setChecked(false);
		}
		}

		private boolean isCurrentAssistVoiceService() {