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

Merge "Add metrics and code change for magnification dialog"

Browse Source
This commit is contained in:
Kevin Chang
2019-10-16 08:12:47 +00:00
committed by Android (Google) Code Review
parent 5f39bd261f efd66bb814
commit b9cf6af2f0
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
ToggleFeaturePreferenceFragment implements SwitchBar.OnSwitchChangeListener { ToggleFeaturePreferenceFragment implements SwitchBar.OnSwitchChangeListener {
private static final int DIALOG_ID_GESTURE_NAVIGATION_TUTORIAL = 1; private static final int DIALOG_ID_GESTURE_NAVIGATION_TUTORIAL = 1;
private static final int DIALOG_ID_ACCESSIBILITY_BUTTON_TUTORIAL = 2;
private Dialog mDialog; private Dialog mDialog;
@@ -172,14 +173,17 @@ public class ToggleScreenMagnificationPreferenceFragment extends
@Override @Override
public Dialog onCreateDialog(int dialogId) { public Dialog onCreateDialog(int dialogId) {
if (dialogId == DIALOG_ID_GESTURE_NAVIGATION_TUTORIAL) { switch (dialogId) {
if (isGestureNavigateEnabled()) { case DIALOG_ID_GESTURE_NAVIGATION_TUTORIAL:
mDialog = AccessibilityGestureNavigationTutorial mDialog = AccessibilityGestureNavigationTutorial
.showGestureNavigationTutorialDialog(getActivity()); .showGestureNavigationTutorialDialog(getActivity());
} else { break;
case DIALOG_ID_ACCESSIBILITY_BUTTON_TUTORIAL:
mDialog = AccessibilityGestureNavigationTutorial mDialog = AccessibilityGestureNavigationTutorial
.showAccessibilityButtonTutorialDialog(getActivity()); .showAccessibilityButtonTutorialDialog(getActivity());
} break;
default:
throw new IllegalArgumentException();
} }
return mDialog; return mDialog;
@@ -193,7 +197,14 @@ public class ToggleScreenMagnificationPreferenceFragment extends
@Override @Override
public int getDialogMetricsCategory(int dialogId) { public int getDialogMetricsCategory(int dialogId) {
return SettingsEnums.ACCESSIBILITY_TOGGLE_SCREEN_MAGNIFICATION; switch (dialogId) {
case DIALOG_ID_GESTURE_NAVIGATION_TUTORIAL:
return SettingsEnums.DIALOG_TOGGLE_SCREEN_MAGNIFICATION_GESTURE_NAVIGATION;
case DIALOG_ID_ACCESSIBILITY_BUTTON_TUTORIAL:
return SettingsEnums.DIALOG_TOGGLE_SCREEN_MAGNIFICATION_ACCESSIBILITY_BUTTON;
default:
return 0;
}
} }
@Override @Override
@@ -206,7 +217,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
if (enabled && TextUtils.equals( if (enabled && TextUtils.equals(
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED,
preferenceKey)) { preferenceKey)) {
showDialog(DIALOG_ID_GESTURE_NAVIGATION_TUTORIAL); showDialog(isGestureNavigateEnabled() ? DIALOG_ID_GESTURE_NAVIGATION_TUTORIAL
: DIALOG_ID_ACCESSIBILITY_BUTTON_TUTORIAL);
} }
MagnificationPreferenceFragment.setChecked(getContentResolver(), preferenceKey, enabled); MagnificationPreferenceFragment.setChecked(getContentResolver(), preferenceKey, enabled);
updateConfigurationWarningIfNeeded(); updateConfigurationWarningIfNeeded();