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

feat(MultiFingerMultiTap): Update shortcut string to double tap from triple tap

Browse Source 
Bug: 315264770
Test: manual
Change-Id: I1130271d06bac71f23a137c83149ee3363a1cc0e
This commit is contained in:
Jean Chen
2023-12-07 16:56:24 +08:00
parent 432c6e36a6
commit 097d8a891b
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/values/strings.xml
View File

@@ -4639,8 +4639,8 @@
<string name="accessibility_tutorial_dialog_title_volume">Hold volume keys to open</string> <string name="accessibility_tutorial_dialog_title_volume">Hold volume keys to open</string>
<!-- Title for the accessibility tutorial dialog in accessibility service with triple tap. [CHAR LIMIT=100] --> <!-- Title for the accessibility tutorial dialog in accessibility service with triple tap. [CHAR LIMIT=100] -->
<string name="accessibility_tutorial_dialog_title_triple">Triple tap screen to open</string> <string name="accessibility_tutorial_dialog_title_triple">Triple tap screen to open</string>
<!-- Title for the accessibility tutorial dialog in accessibility service with two finger triple tap. [CHAR LIMIT=100] --> <!-- Title for the accessibility tutorial dialog in accessibility service with two finger double tap. [CHAR LIMIT=100] -->
<string name="accessibility_tutorial_dialog_title_two_finger_triple">Two finger triple tap screen to open</string> <string name="accessibility_tutorial_dialog_title_two_finger_double">Two finger double tap screen to open</string>
<!-- Title for the accessibility tutorial dialog in accessibility service with gesture. [CHAR LIMIT=50] --> <!-- Title for the accessibility tutorial dialog in accessibility service with gesture. [CHAR LIMIT=50] -->
<string name="accessibility_tutorial_dialog_title_gesture">Use gesture to open</string> <string name="accessibility_tutorial_dialog_title_gesture">Use gesture to open</string>
<!-- Title for the accessibility tutorial dialog in gesture navigation settings. [CHAR LIMIT=50] --> <!-- Title for the accessibility tutorial dialog in gesture navigation settings. [CHAR LIMIT=50] -->
@@ -4653,8 +4653,8 @@
<string name="accessibility_tutorial_dialog_message_volume">To use this feature, press &amp; hold both volume keys.</string> <string name="accessibility_tutorial_dialog_message_volume">To use this feature, press &amp; hold both volume keys.</string>
<!-- Instruction for the accessibility tutorial dialog in accessibility service with triple tap. [CHAR LIMIT=100] --> <!-- Instruction for the accessibility tutorial dialog in accessibility service with triple tap. [CHAR LIMIT=100] -->
<string name="accessibility_tutorial_dialog_message_triple">To start and stop magnification, triple-tap anywhere on your screen.</string> <string name="accessibility_tutorial_dialog_message_triple">To start and stop magnification, triple-tap anywhere on your screen.</string>
<!-- Instruction for the accessibility tutorial dialog in accessibility service with two finger triple tap. [CHAR LIMIT=100] --> <!-- Instruction for the accessibility tutorial dialog in accessibility service with two finger double tap. [CHAR LIMIT=100] -->
<string name="accessibility_tutorial_dialog_message_two_finger_triple">To start and stop magnification, triple-tap anywhere on your screen with two fingers.</string> <string name="accessibility_tutorial_dialog_message_two_finger_triple">To start and stop magnification, double-tap anywhere on your screen with two fingers.</string>
<!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation and touch exploration is not enabled. [CHAR LIMIT=NONE] --> <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation and touch exploration is not enabled. [CHAR LIMIT=NONE] -->
<string name="accessibility_tutorial_dialog_message_gesture">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.</string> <string name="accessibility_tutorial_dialog_message_gesture">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.</string>
<!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation and touch exploration is enabled. [CHAR LIMIT=NONE] --> <!-- Message for the accessibility tutorial dialog when user enables an accessibility service while using gesture navigation and touch exploration is enabled. [CHAR LIMIT=NONE] -->
@@ -4697,12 +4697,12 @@
<string name="accessibility_shortcut_hardware_keyword">hold volume keys</string> <string name="accessibility_shortcut_hardware_keyword">hold volume keys</string>
<!-- Summary for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] --> <!-- Summary for hardware shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_summary_hardware">Press &amp; hold both volume keys</string> <string name="accessibility_shortcut_edit_dialog_summary_hardware">Press &amp; hold both volume keys</string>
<!-- Title for two finger triple tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] --> <!-- Title for two finger double tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_title_two_finger_triple_tap">Two-finger triple-tap screen</string> <string name="accessibility_shortcut_edit_dialog_title_two_finger_double_tap">Two-finger double-tap screen</string>
<!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] --> <!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_two_finger_triple_tap_keyword">two-finger triple-tap screen</string> <string name="accessibility_shortcut_two_finger_double_tap_keyword">two-finger double-tap screen</string>
<!-- Summary for two finger triple tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] --> <!-- Summary for two finger double tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_summary_two_finger_triple_tap">Quickly tap screen {0,number,integer} times with two fingers</string> <string name="accessibility_shortcut_edit_dialog_summary_two_finger_double_tap">Quickly tap screen {0,number,integer} times with two fingers</string>
<!-- Title for triple tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] --> <!-- Title for triple tap shortcut in accessibility edit shortcut dialog. [CHAR LIMIT=NONE] -->
<string name="accessibility_shortcut_edit_dialog_title_triple_tap">Triple-tap screen</string> <string name="accessibility_shortcut_edit_dialog_title_triple_tap">Triple-tap screen</string>
<!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] --> <!-- Part of list to compose user's accessibility shortcut list. [CHAR LIMIT=NONE] -->

14
src/com/android/settings/accessibility/AccessibilityDialogUtils.java
View File

@@ -249,7 +249,7 @@ public class AccessibilityDialogUtils {
initSoftwareShortcut(context, contentView); initSoftwareShortcut(context, contentView);
initHardwareShortcut(context, contentView); initHardwareShortcut(context, contentView);
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) { if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
initTwoFingerTripleTapMagnificationShortcut(context, contentView); initTwoFingerDoubleTapMagnificationShortcut(context, contentView);
} }
initMagnifyShortcut(context, contentView); initMagnifyShortcut(context, contentView);
initAdvancedWidget(contentView); initAdvancedWidget(contentView);
@@ -260,7 +260,7 @@ public class AccessibilityDialogUtils {
initSoftwareShortcutForSUW(context, contentView); initSoftwareShortcutForSUW(context, contentView);
initHardwareShortcut(context, contentView); initHardwareShortcut(context, contentView);
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) { if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
initTwoFingerTripleTapMagnificationShortcut(context, contentView); initTwoFingerDoubleTapMagnificationShortcut(context, contentView);
} }
initMagnifyShortcut(context, contentView); initMagnifyShortcut(context, contentView);
initAdvancedWidget(contentView); initAdvancedWidget(contentView);
@@ -365,15 +365,15 @@ public class AccessibilityDialogUtils {
R.raw.a11y_shortcut_type_triple_tap); 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 // 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 View dialogView = view.findViewById(R.id.two_finger_triple_tap_shortcut);
final CharSequence title = context.getText( 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( String summary = context.getString(
R.string.accessibility_shortcut_edit_dialog_summary_two_finger_triple_tap); R.string.accessibility_shortcut_edit_dialog_summary_two_finger_double_tap);
// Format the number '3' in the summary. // Format the number '2' in the summary.
final Object[] arguments = {3}; final Object[] arguments = {2};
summary = MessageFormat.format(summary, arguments); summary = MessageFormat.format(summary, arguments);
setupShortcutWidgetWithImageRawResource(context, dialogView, title, summary, setupShortcutWidgetWithImageRawResource(context, dialogView, title, summary,

2
src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
View File

@@ -416,7 +416,7 @@ public final class AccessibilityGestureNavigationTutorial {
// TODO(b/308088945): Update tutorial string and image when UX provides them // TODO(b/308088945): Update tutorial string and image when UX provides them
final int type = UserShortcutType.TWOFINGERTRIPLETAP; final int type = UserShortcutType.TWOFINGERTRIPLETAP;
final CharSequence title = 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 = final View image =
createIllustrationViewWithImageRawResource(context, createIllustrationViewWithImageRawResource(context,
R.raw.a11y_shortcut_type_triple_tap); R.raw.a11y_shortcut_type_triple_tap);

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

@@ -477,7 +477,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) { if (Flags.enableMagnificationMultipleFingerMultipleTapGesture()) {
if (hasShortcutType(shortcutTypes, UserShortcutType.TWOFINGERTRIPLETAP)) { if (hasShortcutType(shortcutTypes, UserShortcutType.TWOFINGERTRIPLETAP)) {
final CharSequence twoFingerTripleTapTitle = context.getText( 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); list.add(twoFingerTripleTapTitle);
} }
} }