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

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

Merge changes from topic "a11y_text_reading_22" 

* changes:
  Add keywords into Font Size, Display Size preferences.
  New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (22/n).
parents 3e32ee9b 74468a94

res/xml/accessibility_text_reading_options.xml

+4 −2
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconEndContentDescription="@string/font_size_make_larger_desc"

        settings:iconStart="@drawable/ic_remove_24dp"

        settings:iconStartContentDescription="@string/font_size_make_smaller_desc"/>

        settings:iconStartContentDescription="@string/font_size_make_smaller_desc"

        settings:keywords="@string/keywords_font_size" />



    <com.android.settings.widget.LabeledSeekBarPreference

        android:key="display_size"
@@ -43,7 +44,8 @@ 
        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconEndContentDescription="@string/screen_zoom_make_larger_desc"

        settings:iconStart="@drawable/ic_remove_24dp"

        settings:iconStartContentDescription="@string/screen_zoom_make_smaller_desc"/>

        settings:iconStartContentDescription="@string/screen_zoom_make_smaller_desc"

        settings:keywords="@string/keywords_display_size" />



    <SwitchPreference

        android:key="toggle_force_bold_text"

res/xml/display_settings.xml

+4 −11
Original line number Diff line number Diff line
@@ -69,17 +69,10 @@ 
            settings:keywords="@string/keywords_dark_ui_mode"/>



        <Preference

            android:key="font_size"

            android:title="@string/title_font_size"

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

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

            settings:keywords="@string/keywords_font_size"/>



        <com.android.settings.display.ScreenZoomPreference

            android:key="display_settings_screen_zoom"

            android:title="@string/screen_zoom_title"

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

            settings:keywords="@string/keywords_display_size"/>

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

            android:key="text_reading_options"

            android:persistent="false"

            android:title="@string/accessibility_text_reading_options_title" />

    </PreferenceCategory>



    <PreferenceCategory