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

Commit e946e93d authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Make contentDescription to null for permission icon and device icon" into tm-qpr-dev

parents 576b93c7 cea9bb9c

packages/CompanionDeviceManager/res/layout/list_item_device.xml

+3 −1
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ 
        android:layout_width="24dp"

        android:layout_height="24dp"

        android:layout_marginStart="24dp"

        android:tint="@android:color/system_accent1_600"/>

        android:tint="@android:color/system_accent1_600"

        android:importantForAccessibility="no"

        android:contentDescription="@null"/>



    <TextView

        android:id="@android:id/text1"

packages/CompanionDeviceManager/res/layout/list_item_permission.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
        android:layout_height="24dp"

        android:layout_marginTop="8dp"

        android:layout_marginEnd="12dp"

        android:contentDescription="Permission Icon"/>

        android:importantForAccessibility="no"

        android:contentDescription="@null"/>



    <LinearLayout

        android:layout_width="match_parent"

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class CompanionDeviceDiscoveryService extends Service { 


    private final Runnable mTimeoutRunnable = this::timeout;



    private boolean mStopAfterFirstMatch;;

    private boolean mStopAfterFirstMatch;



    /**

     * A state enum for devices' discovery.