Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "feat(MultiFingerMultiTap): Update shortcut string to double tap from triple tap" into main

Browse Source
This commit is contained in:
Jean Chen
2023-12-09 05:04:34 +00:00
committed by Android (Google) Code Review
parent 4ed5548887 097d8a891b
commit 013626ebff
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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
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);

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

@@ -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);
}
}