Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d am: 37927b4f20

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: I2705eda70ae39caca148594155224beb8609d55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Hsu
2022-05-12 14:00:44 +00:00
committed by Automerger Merge Worker

View File

@@ -147,8 +147,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
return AccessibilityGestureNavigationTutorial return AccessibilityGestureNavigationTutorial
.showAccessibilityGestureTutorialDialog(getPrefContext()); .showAccessibilityGestureTutorialDialog(getPrefContext());
case DialogEnums.MAGNIFICATION_EDIT_SHORTCUT: case DialogEnums.MAGNIFICATION_EDIT_SHORTCUT:
final CharSequence dialogTitle = getPrefContext().getString( final CharSequence dialogTitle = getShortcutTitle();
R.string.accessibility_shortcut_title, mPackageName);
final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent()) final int dialogType = WizardManagerHelper.isAnySetupWizard(getIntent())
? DialogType.EDIT_SHORTCUT_MAGNIFICATION_SUW ? DialogType.EDIT_SHORTCUT_MAGNIFICATION_SUW
: DialogType.EDIT_SHORTCUT_MAGNIFICATION; : DialogType.EDIT_SHORTCUT_MAGNIFICATION;