diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3182cf91545..3210a46540c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4780,7 +4780,7 @@
Caption preferences
- Magnify
+ Magnification
Magnification area
@@ -4816,7 +4816,7 @@
Tap a button to zoom
- To zoom, quickly tap the screen 3 times.\n- Drag 2 or more fingers to scroll
\n- Pinch 2 or more fingers to adjust zoom
\n\nTo zoom temporarily, quickly tap the screen 3 times and hold down your finger on the third tap.\n- Drag to move around the screen
\n- Lift finger to zoom out
\n\nYou can\'t zoom in on the keyboard and navigation bar.
+ Quickly zoom in on the screen to see content more clearly.\n\nTo zoom in:\n\t1. Use shortcut to start magnification\n\t2. Tap the screen\n\t3. Drag 2 fingers to move around screen\n\t4. Pinch with 2 fingers to adjust zoom\n\t5. Use shortcut to stop magnification
When magnification is turned on, you can zoom in on your screen.\n\nTo zoom, start magnification, then tap anywhere on the screen.\n- Drag 2 or more fingers to scroll
\n- Pinch 2 or more fingers to adjust zoom
\n\nTo zoom temporarily, start magnification, then touch & hold anywhere on the screen.\n- Drag to move around the screen
\n- Lift finger to zoom out
\n\nYou can’t zoom in on the keyboard or navigation bar.
@@ -4838,35 +4838,29 @@
Got it
- Use shortcut to open
-
- Use shortcut to magnify
-
- Shortcut to open %1$s
-
- Shortcut to magnify
-
- Shortcut to open Color correction
+ %1$s shortcut
- Accessibility Button
+ Accessibility Button
- 2-finger swipe up from bottom
+ Swipe up with 2 fingers
- 3-finger swipe up from bottom
+ Swipe up with 3 fingers
+
+ Tap accessibility button
- Tap the %s button at the bottom of your screen
+ Tap the accessibility button %s at the bottom of your screen
- Swipe up with 2 fingers from edge of screen
+ Swipe up from the bottom of the screen with 2 fingers
- Swipe up with 3 fingers from edge of screen
+ Swipe up from the bottom of the screen with 3 fingers
Hold volume keys
- Press and hold both volume keys for 1 second
+ Press & hold both volume keys for 1 second
- Triple tap screen
+ Triple-tap screen
- Quickly tap screen 3 times (this can slow down your device)
+ Quickly tap screen 3 times. This shortcut may slow down your device.
Advanced
@@ -4930,9 +4924,9 @@
Color inversion
- Invert colors
+ Use color inversion
- Turn light screens dark so people who are sensitive to bright light can have a better viewing experience.\n\nNote: dark colors will turn light. Images will also be inverted.
+ Color inversion turns light screens dark. This helps people who are sensitive to bright light see the screen more easily.\n\nNote: Dark colors will turn light. Colors will change in media and images. You can also use Dark theme (Settings > Display).
Auto click (dwell timing)
@@ -4964,7 +4958,7 @@
Use %1$s
- Correct colors
+ Use color correction
Show captions
@@ -5084,9 +5078,6 @@
Settings
-
- %1$s settings
-
On
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 6f51fd314fd..1722c99b36e 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -437,8 +437,7 @@ public class AccessibilitySettings extends DashboardFragment {
final String settingsClassName = info.getSettingsActivityName();
if (!TextUtils.isEmpty(settingsClassName)) {
extras.putString(EXTRA_SETTINGS_TITLE,
- getString(R.string.accessibility_service_menu_item_settings,
- resolveInfo.loadLabel(getPackageManager())));
+ getString(R.string.accessibility_menu_item_settings));
extras.putString(EXTRA_SETTINGS_COMPONENT_NAME,
new ComponentName(packageName, settingsClassName).flattenToString());
}
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 63d458a4647..8764b127e99 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -235,7 +235,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
switch (dialogId) {
case DialogEnums.EDIT_SHORTCUT:
final CharSequence dialogTitle = getPrefContext().getString(
- R.string.accessibility_shortcut_edit_dialog_title, mPackageName);
+ R.string.accessibility_shortcut_title, mPackageName);
Dialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
getPrefContext(), dialogTitle, this::callOnAlertDialogCheckboxClicked);
initializeDialogCheckBox(dialog);
@@ -505,7 +505,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
private String getShortcutTypeSummary(Context context) {
final int shortcutType = getUserShortcutType(context, UserShortcutType.SOFTWARE);
- int resId = R.string.accessibility_shortcut_edit_dialog_title_software;
+ int resId = R.string.accessibility_shortcut_edit_summary_software;
if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
resId = AccessibilityUtil.isTouchExploreEnabled(context)
? R.string.accessibility_shortcut_edit_dialog_title_software_gesture_talkback
@@ -593,8 +593,10 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference
mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
mShortcutPreference.setPersistent(false);
mShortcutPreference.setKey(getShortcutPreferenceKey());
- mShortcutPreference.setTitle(R.string.accessibility_shortcut_title);
mShortcutPreference.setOnClickListener(this);
+
+ final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
+ mShortcutPreference.setTitle(title);
}
private void updateShortcutPreference() {
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 401ca5ec2eb..518259330d0 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -240,8 +240,8 @@ public class ToggleScreenMagnificationPreferenceFragment extends
return AccessibilityGestureNavigationTutorial
.showAccessibilityButtonTutorialDialog(getPrefContext());
case DialogEnums.MAGNIFICATION_EDIT_SHORTCUT:
- final CharSequence dialogTitle = getPrefContext().getText(
- R.string.accessibility_shortcut_edit_dialog_title_magnification);
+ final CharSequence dialogTitle = getPrefContext().getString(
+ R.string.accessibility_shortcut_title, mPackageName);
final AlertDialog dialog =
AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
getPrefContext(), dialogTitle,
@@ -338,7 +338,7 @@ public class ToggleScreenMagnificationPreferenceFragment extends
private String getShortcutTypeSummary(Context context) {
final int shortcutType = getUserShortcutType(context, UserShortcutType.DEFAULT);
- int resId = R.string.accessibility_shortcut_edit_dialog_title_software;
+ int resId = R.string.accessibility_shortcut_edit_summary_software;
if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
resId = AccessibilityUtil.isTouchExploreEnabled(context)
? R.string.accessibility_shortcut_edit_dialog_title_software_gesture_talkback
@@ -481,9 +481,11 @@ public class ToggleScreenMagnificationPreferenceFragment extends
mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
mShortcutPreference.setPersistent(false);
mShortcutPreference.setKey(KEY_SHORTCUT_PREFERENCE);
- mShortcutPreference.setTitle(R.string.accessibility_magnification_shortcut_title);
mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
mShortcutPreference.setOnClickListener(this);
+
+ final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
+ mShortcutPreference.setTitle(title);
}
private void updateShortcutPreference() {