diff --git a/res/values/strings.xml b/res/values/strings.xml index 4c0f8114511..c6ea2d273ba 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5273,16 +5273,16 @@
To zoom in:
- 1. Use shortcut to start magnification
- 2. Tap the screen
- 3. Drag 2 fingers to move around screen
- 4. Pinch with 2 fingers to adjust zoom
- 5. Use shortcut to stop magnification

+ {0,number,integer}. Use shortcut to start magnification
+ {1,number,integer}. Tap the screen
+ {2,number,integer}. Drag 2 fingers to move around screen
+ {3,number,integer}. Pinch with 2 fingers to adjust zoom
+ {4,number,integer}. Use shortcut to stop magnification

To zoom in temporarily:
- 1. Use shortcut to start magnification
- 2. Touch & hold anywhere on the screen
- 3. Drag finger to move around screen
- 4. Lift finger to stop magnification + {0,number,integer}. Use shortcut to start magnification
+ {1,number,integer}. Touch & hold anywhere on the screen
+ {2,number,integer}. Drag finger to move around screen
+ {3,number,integer}. Lift finger to stop magnification ]]>
@@ -5348,7 +5348,7 @@ triple-tap screen - Quickly tap screen 3 times. This shortcut may slow down your device + Quickly tap screen {0,number,integer} times. This shortcut may slow down your device Advanced diff --git a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java index 6a9d0cf3e7f..c1ac604c94a 100644 --- a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java +++ b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.icu.text.MessageFormat; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -318,8 +319,12 @@ public class AccessibilityEditDialogUtils { final View dialogView = view.findViewById(R.id.triple_tap_shortcut); final CharSequence title = context.getText( R.string.accessibility_shortcut_edit_dialog_title_triple_tap); - final CharSequence summary = context.getText( + String summary = context.getString( R.string.accessibility_shortcut_edit_dialog_summary_triple_tap); + // Format the number '3' in the summary. + final Object[] arguments = {3}; + summary = MessageFormat.format(summary, arguments); + setupShortcutWidget(dialogView, title, summary, R.drawable.accessibility_shortcut_type_triple_tap); // TODO(b/142531156): Use vector drawable instead of temporal png file to avoid distorted. diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java index 68836449463..900e2800a09 100644 --- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.accessibility; import android.content.Context; +import android.icu.text.MessageFormat; import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; @@ -93,8 +94,12 @@ public class MagnificationGesturesPreferenceController extends TogglePreferenceC Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED); extras.putInt(AccessibilitySettings.EXTRA_TITLE_RES, R.string.accessibility_screen_magnification_gestures_title); - extras.putCharSequence(AccessibilitySettings.EXTRA_HTML_DESCRIPTION, - context.getText(R.string.accessibility_screen_magnification_summary)); + + String summary = context.getString(R.string.accessibility_screen_magnification_summary); + final Object[] numberArguments = {1, 2, 3, 4, 5}; + summary = MessageFormat.format(summary, numberArguments); + extras.putCharSequence(AccessibilitySettings.EXTRA_HTML_DESCRIPTION, summary); + extras.putInt(AccessibilitySettings.EXTRA_VIDEO_RAW_RESOURCE_ID, R.raw.accessibility_screen_magnification); }