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

Merge "Adds a summary to the (screen) Magnification preference for the main A11y Settings page." into main

Browse Source
This commit is contained in:
Daniel Norman
2023-12-06 20:22:28 +00:00
committed by Android (Google) Code Review
parent 2edaf7668c 01e624c76b
commit 0fa75c4e41
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -4609,7 +4609,7 @@
<string name="accessibility_screen_magnification_navbar_short_summary">Tap a button to zoom</string>
<!-- Intro for the accessibility preference screen to enable screen magnification gestures. [CHAR LIMIT=none] -->
<string name="accessibility_screen_magnification_intro_text">Quickly zoom in on the screen to make content larger</string>
<!-- Summary for the accessibility preference screen to enable screen magnification gestures. [CHAR LIMIT=none] -->
<!-- Instructions on the accessibility preference screen teaching the user how to enable screen magnification gestures. [CHAR LIMIT=none] -->
<string name="accessibility_screen_magnification_summary">
<![CDATA[
<b>To zoom in:</b><br/>
@@ -12562,8 +12562,8 @@
<string name="color_inversion_state_off">Off</string>
<!-- The color inversion feature summary displayed as a subtext as an item in a list. -->
<string name="color_inversion_feature_summary">Turns light screens dark and dark screens light</string>
<!-- Short summary explains what magnification feature is. -->
<string name="magnification_feature_summary">Quickly zoom in on the screen to make content larger</string>
<!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
<string name="magnification_feature_summary">Zoom in on the screen</string>
<!-- Summary of the AutoClick feature disabled state. -->
<string name="autoclick_disabled">Off</string>
<!-- Summary of the show captions preference disabled state. -->

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

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

19
tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
View File

@@ -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) {