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

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

Change-Id: I60250cc5451548e5f8db63b9c3884e00e4c1c72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Chen
2022-10-05 18:07:37 +00:00
committed by Automerger Merge Worker
3 changed files with 6 additions and 3 deletions

View File

@@ -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"

View File

@@ -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"

View File

@@ -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.