From ea3d3520c398a8aff4775aad3a87dcdde89e2e75 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Wed, 18 Dec 2019 16:37:14 +0800 Subject: [PATCH] Support accessibility shorcut secondary action (4/n) Replace metrics constants of different edit dialogs. Bug: 142531156 Test: Maunal Change-Id: I52b3d481d815edab17b954283ae5e366723a842c --- .../ToggleAccessibilityServicePreferenceFragment.java | 8 +++----- .../accessibility/ToggleDaltonizerPreferenceFragment.java | 3 +-- .../ToggleScreenMagnificationPreferenceFragment.java | 3 +-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index e0a2052991f..e54446f0b69 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -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; } diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index 7716c2dbe67..f093dc7f329 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -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; } diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index ac54c386d80..43619337165 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -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; }