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

Commit a9ef3307 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move the content description for Display size and text preview to xml" into main

parents 48293915 526dacdc

res/layout/accessibility_text_reading_preview.xml

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
                android:id="@+id/preview_pager"

                android:layout_width="wrap_content"

                android:layout_height="217dp"

                android:contentDescription="@string/preview_pager_content_description"

                android:nestedScrollingEnabled="true" />

            <LinearLayout

                android:layout_width="match_parent"

res/layout/accessibility_text_reading_preview_app_grid.xml

+13 −8
Original line number Diff line number Diff line
@@ -14,7 +14,11 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->



<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:contentDescription="@string/preview_pager_home_content_description" >

    <com.android.settings.display.AppGridView

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

        xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -25,3 +29,4 @@ 
        android:nestedScrollingEnabled="true"

        android:importantForAccessibility="noHideDescendants"

        app:appCount="6"/>

</FrameLayout>

res/layout/accessibility_text_reading_preview_mail_content.xml

+3 −3
Original line number Diff line number Diff line
@@ -14,18 +14,18 @@ 
    See the License for the specific language governing permissions and

    limitations under the License.

-->



<androidx.core.widget.NestedScrollView

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true"

    android:importantForAccessibility="noHideDescendants">

    android:contentDescription="@string/preview_pager_email_content_description">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">

        android:orientation="vertical"

        android:importantForAccessibility="noHideDescendants">



        <TextView

            android:id="@+id/subject"

res/layout/screen_zoom_preview_1.xml

+3 −2
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fillViewport="true"

    android:importantForAccessibility="noHideDescendants">

    android:contentDescription="@string/preview_pager_message_content_description">



    <view class="com.android.settings.TouchBlockingFrameLayout"

        android:id="@+id/frame"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">

        android:layout_height="wrap_content"

        android:importantForAccessibility="noHideDescendants">



        <LinearLayout

            android:layout_width="match_parent"

res/values/config.xml

+1 −11
Original line number Diff line number Diff line
@@ -810,23 +810,13 @@ 
    <!-- Allowed packages to show the confirmation dialog for a system locale suggestion  -->

    <string-array name="allowed_packages_for_locale_confirmation_diallog" translatable="false"/>



    <!-- Array of text reading preview layouts. Must contain at least 1 layout.

        Add content descriptions in the config_text_reading_preview_content_descriptions together

        if adding more sample layouts here -->

    <!-- Array of text reading preview layouts. Must contain at least 1 layout -->

    <array name="config_text_reading_preview_samples">

        <item>@layout/accessibility_text_reading_preview_app_grid</item>

        <item>@layout/screen_zoom_preview_1</item>

        <item>@layout/accessibility_text_reading_preview_mail_content</item>

    </array>



    <!-- Array of text reading preview layouts' content descriptions.

        The order should be the same as the layouts in config_text_reading_preview_samples -->

    <array name="config_text_reading_preview_content_descriptions">

        <item>@string/preview_pager_home_content_description</item>

        <item>@string/preview_pager_message_content_description</item>

        <item>@string/preview_pager_email_content_description</item>

    </array>



    <!-- Package responsible for updating Mainline Modules -->

    <string name="config_mainline_module_update_package" translatable="false">com.android.vending</string>