PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support accessibility shorcut secondary action (4/n)

Browse Source 
Replace metrics constants of different edit dialogs.

Bug: 142531156
Test: Maunal
Change-Id: I52b3d481d815edab17b954283ae5e366723a842c
This commit is contained in:
Kevin Chang
2019-12-18 16:37:14 +08:00
parent b945785ddb
commit ea3d3520c3
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
View File

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

3
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

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

3
src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
View File

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