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

Commit 19631ec1 authored by Peter_Liang's avatar Peter_Liang
Browse files

New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (19/n). 

- Rename the strings related to "text and display" to "color and motion" to avoid misunderstanding.

Bug: 211503117
Test: manual test
Change-Id: Icdca5ee03fb95a8531406a0f6ab07799a9dfb17c
parent 18eb37fb

color-check-baseline.xml

+1 −1
Original line number Diff line number Diff line
@@ -3736,7 +3736,7 @@ 
        errorLine1="            android:color="@color/accessibility_feature_background"/>"

        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="res/drawable/ic_text_and_display.xml"

            file="res/drawable/ic_color_and_motion.xml"

            line="22"

            column="13"/>

    </issue>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -5150,8 +5150,8 @@ 
    <string name="general_category_title">General</string>

    <!-- Title for the accessibility preference category of display services and settings. [CHAR LIMIT=50] -->

    <string name="display_category_title">Display</string>

    <!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->

    <string name="accessibility_text_and_display_title">Text and display</string>

    <!-- Title for the accessibility color and motion page. [CHAR LIMIT=50] -->

    <string name="accessibility_color_and_motion_title">Color and motion</string>

    <!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->

    <string name="accessibility_turn_screen_darker_title">Turn screen darker</string>

    <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->

res/xml/accessibility_text_and_display.xml→res/xml/accessibility_color_and_motion.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="accessibility_text_and_display"

    android:key="accessibility_color_and_motion"

    android:persistent="false"

    android:title="@string/accessibility_text_and_display_title">

    android:title="@string/accessibility_color_and_motion_title">



    <Preference

        android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"

res/xml/accessibility_settings.xml

+4 −4
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ 
            android:title="@string/accessibility_text_reading_options_title" />



        <Preference

            android:fragment="com.android.settings.accessibility.TextAndDisplayFragment"

            android:key="text_and_display_preference_screen"

            android:icon="@drawable/ic_text_and_display"

            android:fragment="com.android.settings.accessibility.ColorAndMotionFragment"

            android:key="color_and_motion"

            android:icon="@drawable/ic_color_and_motion"

            android:persistent="false"

            android:title="@string/accessibility_text_and_display_title"

            android:title="@string/accessibility_color_and_motion_title"

            settings:searchable="true"/>



        <com.android.settingslib.PrimarySwitchPreference