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

Commit a56d9415 authored by Guojing Yuan's avatar Guojing Yuan Committed by Automerger Merge Worker
Browse files

Merge "[CDM a11y] Fix a11y issues" into udc-dev am: 1ec3d827 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22749592



Change-Id: I388a1ce2835b1c0e1cf38e9775cbad12721aab67
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb39507a 1ec3d827

packages/CompanionDeviceManager/res/layout/activity_confirmation.xml

+6 −3
Original line number Original line Diff line number Diff line
@@ -16,13 +16,15 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

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

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        style="@style/ScrollViewStyle">

        style="@style/ScrollViewStyle"

        android:importantForAccessibility="no">





    <LinearLayout

    <LinearLayout

            android:id="@+id/activity_confirmation"

            android:id="@+id/activity_confirmation"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:baselineAligned="false">

            android:baselineAligned="false"

            android:importantForAccessibility="no">





        <LinearLayout android:id="@+id/association_confirmation"

        <LinearLayout android:id="@+id/association_confirmation"

                      style="@style/ContainerLayout">

                      style="@style/ContainerLayout">
@@ -153,7 +155,8 @@ 
        <RelativeLayout

        <RelativeLayout

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_weight="1">

            android:layout_weight="1"

            android:importantForAccessibility="noHideDescendants">





            <ProgressBar

            <ProgressBar

                android:id="@+id/spinner_single_device"

                android:id="@+id/spinner_single_device"

packages/CompanionDeviceManager/res/layout/vendor_header.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:layout_width="48dp"

        android:layout_width="48dp"

        android:layout_height="48dp"

        android:layout_height="48dp"

        android:padding="12dp"

        android:padding="12dp"

        android:contentDescription="@string/vendor_icon_description" />

        android:importantForAccessibility="no" />





    <TextView

    <TextView

        android:id="@+id/vendor_header_name"

        android:id="@+id/vendor_header_name"

packages/CompanionDeviceManager/res/values/strings.xml

+1 −4
Original line number Original line Diff line number Diff line
@@ -132,11 +132,8 @@ 
    <!-- Text of the permission sync explanation in the confirmation dialog. [CHAR LIMIT=NONE] -->

    <!-- Text of the permission sync explanation in the confirmation dialog. [CHAR LIMIT=NONE] -->

    <string name="permission_sync_summary">This may include &lt;strong&gt;Microphone&lt;/strong&gt;, &lt;strong&gt;Camera&lt;/strong&gt;, and &lt;strong&gt;Location access&lt;/strong&gt;, and other sensitive permissions on &lt;strong&gt;<xliff:g id="companion_device_name" example="My Watch">%1$s</xliff:g>&lt;/strong&gt;. &lt;br/&gt;&lt;br/&gt;You can change these permissions any time in your Settings on &lt;strong&gt;<xliff:g id="companion_device_name" example="My Watch">%1$s</xliff:g>&lt;/strong&gt;.</string>

    <string name="permission_sync_summary">This may include &lt;strong&gt;Microphone&lt;/strong&gt;, &lt;strong&gt;Camera&lt;/strong&gt;, and &lt;strong&gt;Location access&lt;/strong&gt;, and other sensitive permissions on &lt;strong&gt;<xliff:g id="companion_device_name" example="My Watch">%1$s</xliff:g>&lt;/strong&gt;. &lt;br/&gt;&lt;br/&gt;You can change these permissions any time in your Settings on &lt;strong&gt;<xliff:g id="companion_device_name" example="My Watch">%1$s</xliff:g>&lt;/strong&gt;.</string>





    <!--Description for vendor icon [CHAR LIMIT=30]-->

    <string name="vendor_icon_description">App Icon</string>



    <!--Description for information icon [CHAR LIMIT=30]-->

    <!--Description for information icon [CHAR LIMIT=30]-->

    <string name="vendor_header_button_description">More Information Button</string>

    <string name="vendor_header_button_description">More Information</string>





    <!-- ================= Permissions ================= -->

    <!-- ================= Permissions ================= -->