Merge "Uniform the settings enum proto for accessibility tutorial." into rvc-dev

This commit is contained in:
PETER LIANG
2020-04-22 11:42:27 +00:00
committed by Android (Google) Code Review

View File

@@ -191,9 +191,7 @@ public class ToggleAccessibilityServicePreferenceFragment extends
case DialogEnums.DISABLE_WARNING_FROM_TOGGLE: case DialogEnums.DISABLE_WARNING_FROM_TOGGLE:
return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE; return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL: case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
return AccessibilityUtil.isGestureNavigateEnabled(getPrefContext()) return SettingsEnums.DIALOG_ACCESSIBILITY_TUTORIAL;
? SettingsEnums.DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION
: SettingsEnums.DIALOG_TOGGLE_SCREEN_ACCESSIBILITY_BUTTON;
default: default:
return super.getDialogMetricsCategory(dialogId); return super.getDialogMetricsCategory(dialogId);
} }