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

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

Browse Source
This commit is contained in:
Kevin Chang
2019-12-19 02:13:40 +00:00
committed by Android (Google) Code Review
parent 04def02253 ea3d3520c3
commit a26009e04c
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;
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;
}

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

@@ -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;
}

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

@@ -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;
}