Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a26009e0 authored Dec 19, 2019 by Kevin Chang Committed by Android (Google) Code Review Dec 19, 2019

Merge "Support accessibility shorcut secondary action (4/n)"

parents 04def022 ea3d3520

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -252,12 +252,10 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP
		return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
		case DIALOG_ID_LAUNCH_ACCESSIBILITY_TUTORIAL:
		return isGestureNavigateEnabled()
		? SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE
		: SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
		// TODO(b/142531156): Create a settings enum to replace it.
		? SettingsEnums.DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION
		: SettingsEnums.DIALOG_TOGGLE_SCREEN_ACCESSIBILITY_BUTTON;
		case DIALOG_ID_EDIT_SHORTCUT:
		return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_ENABLE;
		// TODO(b/142531156): Create a settings enum to replace it.
		return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_EDIT_SHORTCUT;
		default:
		return 0;
		}

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -145,8 +145,7 @@ public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePrefe
		@Override
		public int getDialogMetricsCategory(int dialogId) {
		if (dialogId == DIALOG_ID_EDIT_SHORTCUT) {
		return SettingsEnums.ACCESSIBILITY_TOGGLE_DALTONIZER;
		// TODO(b/142531156): Create a settings enum to replace it.
		return SettingsEnums.DIALOG_DALTONIZER_EDIT_SHORTCUT;
		}
		return 0;
		}

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -241,8 +241,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
		case DIALOG_ID_ACCESSIBILITY_BUTTON_TUTORIAL:
		return SettingsEnums.DIALOG_TOGGLE_SCREEN_MAGNIFICATION_ACCESSIBILITY_BUTTON;
		case DIALOG_ID_EDIT_SHORTCUT:
		return SettingsEnums.DIALOG_TOGGLE_SCREEN_MAGNIFICATION_ACCESSIBILITY_BUTTON;
		// TODO(b/142531156): Create a settings enum to replace it.
		return SettingsEnums.DIALOG_MAGNIFICATION_EDIT_SHORTCUT;
		default:
		return 0;
		}