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

Commit c915910f authored by PETER LIANG's avatar PETER LIANG Committed by Android (Google) Code Review
Browse files

Merge changes from topics "a11y_text_reading_18", "a11y_text_reading_19" 

* changes:
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (20/n).
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (19/n).
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (18/n).
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (17/n).
parents afdd6298 a52a55f3

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
@@ -5156,8 +5156,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 −33
Original line number Diff line number Diff line
@@ -17,34 +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">



    <Preference

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

        android:icon="@drawable/ic_font_size"

        android:key="font_size_preference_screen"

        android:persistent="false"

        android:title="@string/title_font_size"

        settings:controller="com.android.settings.display.FontSizePreferenceController"

        settings:searchable="false"/>



    <com.android.settings.display.ScreenZoomPreference

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

        android:icon="@drawable/ic_screen_zoom"

        android:key="accessibility_settings_screen_zoom"

        android:persistent="false"

        android:title="@string/screen_zoom_title"

        settings:searchable="false"/>



    <SwitchPreference

        android:key="toggle_force_bold_text"

        android:icon="@drawable/ic_force_bold"

        android:persistent="false"

        android:title="@string/force_bold_text"

        settings:keywords="@string/keywords_bold_text"

        settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>

    android:title="@string/accessibility_color_and_motion_title">



    <Preference

        android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
@@ -76,12 +51,6 @@ 
        android:title="@string/accessibility_toggle_large_pointer_icon_title"

        settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>



    <SwitchPreference

        android:key="toggle_high_text_contrast_preference"

        android:persistent="false"

        android:title="@string/accessibility_toggle_high_text_contrast_preference_title"

        settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>



    <PreferenceCategory

        android:key="experimental_category"

        android:persistent="false"

res/xml/accessibility_settings.xml

+5 −7
Original line number Diff line number Diff line
@@ -36,21 +36,19 @@ 
        android:persistent="false"

        android:title="@string/display_category_title">



        <!-- After completely finishing the Text and reading options feature, it will be visible. -->

        <Preference

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

            android:icon="@drawable/ic_adaptive_font_download"

            android:key="text_reading_options"

            android:persistent="false"

            android:title="@string/accessibility_text_reading_options_title"

            settings:isPreferenceVisible="false"/>

            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