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

Commit 43661f5a authored Oct 05, 2022 by Evan Chen Committed by Automerger Merge Worker Oct 05, 2022

Merge "Make contentDescription to null for permission icon and device icon"...

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

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>

parents fd711731 e946e93d

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.