Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1303790f authored by Yanting Yang's avatar Yanting Yang
Browse files

Fix text format issue in the Accessibility magnification 

- Use getText() to apply html format to text view.
- Remove extra bullets from string.

Fixes: 138174003
Test: visual, robotests
Change-Id: Ia736087224d7a65ebe41ca2ac3fca7064a03f950
parent 9f9acf6f

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4851,7 +4851,7 @@ 
    <!-- Summary for the accessibility preference screen to enable screen magnification gestures. [CHAR LIMIT=none] -->

    <string name="accessibility_screen_magnification_summary"><b>To zoom</b>, quickly tap the screen 3 times.\n<ul><li>Drag 2 or more fingers to scroll</li>\n<li>Pinch 2 or more fingers to adjust zoom</li></ul>\n\n<b>To zoom temporarily</b>, quickly tap the screen 3 times and hold down your finger on the third tap.\n<ul><li>Drag to move around the screen</li>\n<li>Lift finger to zoom out</li></ul>\n\nYou can\'t zoom in on the keyboard and navigation bar.</string>

    <!-- Summary for the accessibility preference screen to enable screen magnification via the nav bar. [CHAR LIMIT=none] -->

    <string name="accessibility_screen_magnification_navbar_summary">When magnification is turned on, you can zoom in on your screen.\n\n<b>To zoom</b>, start magnification, then tap anywhere on the screen.\n<ul><li>•  Drag 2 or more fingers to scroll</li>\n<li>•  Pinch 2 or more fingers to adjust zoom</li></ul>\n\n<b>To zoom temporarily</b>, start magnification, then touch &amp; hold anywhere on the screen.\n<ul><li>•  Drag to move around the screen</li>\n<li>•  Lift finger to zoom out</li></ul>\n\nYou can’t zoom in on the keyboard or navigation bar.</string>

    <string name="accessibility_screen_magnification_navbar_summary">When magnification is turned on, you can zoom in on your screen.\n\n<b>To zoom</b>, start magnification, then tap anywhere on the screen.\n<ul><li>Drag 2 or more fingers to scroll</li>\n<li>Pinch 2 or more fingers to adjust zoom</li></ul>\n\n<b>To zoom temporarily</b>, start magnification, then touch &amp; hold anywhere on the screen.\n<ul><li>Drag to move around the screen</li>\n<li>Lift finger to zoom out</li></ul>\n\nYou can’t zoom in on the keyboard or navigation bar.</string>

    <!-- Title for the Accessibility tutorial dialog in Accessibility service with button. [CHAR LIMIT=50] -->

    <string name="accessibility_tutorial_dialog_title_button">Use accessibility button to open</string>

    <!-- Title for the Accessibility tutorial dialog in Accessibility service with gesture. [CHAR LIMIT=50] -->

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference 
        // Summary.

        if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY_RES)) {

            final int summary = arguments.getInt(AccessibilitySettings.EXTRA_SUMMARY_RES);

            mFooterPreferenceMixin.createFooterPreference().setTitle(summary);

            mFooterPreferenceMixin.createFooterPreference().setTitle(getText(summary));

        } else if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {

            final CharSequence summary = arguments.getCharSequence(

                    AccessibilitySettings.EXTRA_SUMMARY);