From 097d8a891b72f954a1fbf859e926e83fae179690 Mon Sep 17 00:00:00 2001 From: Jean Chen Date: Thu, 7 Dec 2023 16:56:24 +0800 Subject: [PATCH] feat(MultiFingerMultiTap): Update shortcut string to double tap from triple tap Bug: 315264770 Test: manual Change-Id: I1130271d06bac71f23a137c83149ee3363a1cc0e --- res/values/strings.xml | 18 +++++++++--------- .../AccessibilityDialogUtils.java | 14 +++++++------- ...AccessibilityGestureNavigationTutorial.java | 2 +- ...eScreenMagnificationPreferenceFragment.java | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 6fbaddcbf32..faaa3753a9b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4639,8 +4639,8 @@ Hold volume keys to open Triple tap screen to open - - Two finger triple tap screen to open + + Two finger double tap screen to open Use gesture to open @@ -4653,8 +4653,8 @@ To use this feature, press & hold both volume keys. To start and stop magnification, triple-tap anywhere on your screen. - - To start and stop magnification, triple-tap anywhere on your screen with two fingers. + + To start and stop magnification, double-tap anywhere on your screen with two fingers. To use this feature, swipe up from the bottom of the screen with 2 fingers.\n\nTo switch between features, swipe up with 2 fingers and hold. @@ -4697,12 +4697,12 @@ hold volume keys Press & hold both volume keys - - Two-finger triple-tap screen + + Two-finger double-tap screen - two-finger triple-tap screen - - Quickly tap screen {0,number,integer} times with two fingers + two-finger double-tap screen + + Quickly tap screen {0,number,integer} times with two fingers Triple-tap screen diff --git a/src/com/android/settings/accessibility/AccessibilityDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityDialogUtils.java index c429e0b0d55..ca3a7b1d53b 100644 --- a/src/com/android/settings/accessibility/AccessibilityDialogUtils.java +++ b/src/com/android/settings/accessibility/AccessibilityDialogUtils.java @@ -249,7 +249,7 @@ public class AccessibilityDialogUtils { initSoftwareShortcut(context, contentView); initHardwareShortcut(context, contentView); if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) { - initTwoFingerTripleTapMagnificationShortcut(context, contentView); + initTwoFingerDoubleTapMagnificationShortcut(context, contentView); } initMagnifyShortcut(context, contentView); initAdvancedWidget(contentView); @@ -260,7 +260,7 @@ public class AccessibilityDialogUtils { initSoftwareShortcutForSUW(context, contentView); initHardwareShortcut(context, contentView); if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) { - initTwoFingerTripleTapMagnificationShortcut(context, contentView); + initTwoFingerDoubleTapMagnificationShortcut(context, contentView); } initMagnifyShortcut(context, contentView); initAdvancedWidget(contentView); @@ -365,15 +365,15 @@ public class AccessibilityDialogUtils { R.raw.a11y_shortcut_type_triple_tap); } - private static void initTwoFingerTripleTapMagnificationShortcut(Context context, View view) { + private static void initTwoFingerDoubleTapMagnificationShortcut(Context context, View view) { // TODO(b/306153204): Update shortcut string and image when UX provides them final View dialogView = view.findViewById(R.id.two_finger_triple_tap_shortcut); final CharSequence title = context.getText( - R.string.accessibility_shortcut_edit_dialog_title_two_finger_triple_tap); + R.string.accessibility_shortcut_edit_dialog_title_two_finger_double_tap); String summary = context.getString( - R.string.accessibility_shortcut_edit_dialog_summary_two_finger_triple_tap); - // Format the number '3' in the summary. - final Object[] arguments = {3}; + R.string.accessibility_shortcut_edit_dialog_summary_two_finger_double_tap); + // Format the number '2' in the summary. + final Object[] arguments = {2}; summary = MessageFormat.format(summary, arguments); setupShortcutWidgetWithImageRawResource(context, dialogView, title, summary, diff --git a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java index e90ed87da1b..1f71ab0ab36 100644 --- a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java +++ b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java @@ -416,7 +416,7 @@ public final class AccessibilityGestureNavigationTutorial { // TODO(b/308088945): Update tutorial string and image when UX provides them final int type = UserShortcutType.TWOFINGERTRIPLETAP; final CharSequence title = - context.getText(R.string.accessibility_tutorial_dialog_title_two_finger_triple); + context.getText(R.string.accessibility_tutorial_dialog_title_two_finger_double); final View image = createIllustrationViewWithImageRawResource(context, R.raw.a11y_shortcut_type_triple_tap); diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 9f6eec3a31d..1d946fbd3b1 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -477,7 +477,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) { if (hasShortcutType(shortcutTypes, UserShortcutType.TWOFINGERTRIPLETAP)) { final CharSequence twoFingerTripleTapTitle = context.getText( - R.string.accessibility_shortcut_two_finger_triple_tap_keyword); + R.string.accessibility_shortcut_two_finger_double_tap_keyword); list.add(twoFingerTripleTapTitle); } }