diff --git a/res/values/strings.xml b/res/values/strings.xml index 71a7b30e451..25c6e591208 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4609,7 +4609,7 @@ Tap a button to zoom Quickly zoom in on the screen to make content larger - + To zoom in:
@@ -12562,8 +12562,8 @@ Off Turns light screens dark and dark screens light - - Quickly zoom in on the screen to make content larger + + Zoom in on the screen Off diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 886719da5a1..9f6eec3a31d 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -840,9 +840,13 @@ public class ToggleScreenMagnificationPreferenceFragment extends */ public static CharSequence getServiceSummary(Context context) { // Get the user shortcut type from settings provider. - final int uerShortcutType = getUserShortcutTypeFromSettings(context); - return (uerShortcutType != AccessibilityUtil.UserShortcutType.EMPTY) + final int userShortcutType = getUserShortcutTypeFromSettings(context); + final CharSequence featureState = + (userShortcutType != AccessibilityUtil.UserShortcutType.EMPTY) ? context.getText(R.string.accessibility_summary_shortcut_enabled) : context.getText(R.string.generic_accessibility_feature_shortcut_off); + final CharSequence featureSummary = context.getText(R.string.magnification_feature_summary); + return context.getString(R.string.preference_summary_default_combination, + featureState, featureSummary); } } diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java index e5ac7932b1e..05dc8fa3bd2 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java @@ -629,7 +629,9 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat( ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) .isEqualTo( - mContext.getString(R.string.accessibility_summary_shortcut_enabled)); + mContext.getString(R.string.preference_summary_default_combination, + mContext.getText(R.string.accessibility_summary_shortcut_enabled), + mContext.getText(R.string.magnification_feature_summary))); } @Test @@ -639,7 +641,10 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat( ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) .isEqualTo( - mContext.getString(R.string.generic_accessibility_feature_shortcut_off)); + mContext.getString(R.string.preference_summary_default_combination, + mContext.getText( + R.string.generic_accessibility_feature_shortcut_off), + mContext.getText(R.string.magnification_feature_summary))); } @Test @@ -650,7 +655,10 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat( ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) - .isEqualTo(mContext.getString(R.string.accessibility_summary_shortcut_enabled)); + .isEqualTo( + mContext.getString(R.string.preference_summary_default_combination, + mContext.getText(R.string.accessibility_summary_shortcut_enabled), + mContext.getText(R.string.magnification_feature_summary))); } @Test @@ -662,7 +670,10 @@ public class ToggleScreenMagnificationPreferenceFragmentTest { assertThat( ToggleScreenMagnificationPreferenceFragment.getServiceSummary(mContext).toString()) .isEqualTo( - mContext.getString(R.string.generic_accessibility_feature_shortcut_off)); + mContext.getString(R.string.preference_summary_default_combination, + mContext.getText( + R.string.generic_accessibility_feature_shortcut_off), + mContext.getText(R.string.magnification_feature_summary))); } private void putStringIntoSettings(String key, String componentName) {