Merge "Fix InvisibleToggle type service does not turn on or turn off correctly... (981d10db) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accessibility/InvisibleToggleAccessibilityServicePreferenceFragment.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.settings.accessibility;

		import android.accessibilityservice.AccessibilityServiceInfo;
		import android.content.DialogInterface;
		import android.view.View;

		import com.android.settings.R;
		@@ -68,4 +69,17 @@ public class InvisibleToggleAccessibilityServicePreferenceFragment extends
		true);
		}
		}

		/**
		* {@inheritDoc}
		*
		* Enables accessibility service when shortcutPreference is checked.
		*/
		@Override
		protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
		super.callOnAlertDialogCheckboxClicked(dialog, which);

		final boolean enabled = mShortcutPreference.isChecked();
		AccessibilityUtils.setAccessibilityServiceState(getContext(), mComponentName, enabled);
		}
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -597,7 +597,13 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
		return shortcut.getType();
		}

		private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
		/**
		* This method will be invoked when a button in the edit shortcut dialog is clicked.
		*
		* @param dialog The dialog that received the click
		* @param which The button that was clicked
		*/
		protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
		if (mComponentName == null) {
		return;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
		return shortcut.getType();
		}

		private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
		@Override
		protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
		updateUserShortcutType(/* saveChanges= */ true);
		optInAllMagnificationValuesToSettings(getPrefContext(), mUserShortcutType);
		optOutAllMagnificationValuesFromSettings(getPrefContext(), ~mUserShortcutType);