Merge "[CDM a11y] Fix a11y issues" into udc-dev (1ec3d827) · Commits · e / os / android_frameworks_base

packages/CompanionDeviceManager/res/layout/activity_confirmation.xml

+6 −3

Original line number	Diff line number	Diff line
		@@ -16,13 +16,15 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		style="@style/ScrollViewStyle">
		style="@style/ScrollViewStyle"
		android:importantForAccessibility="no">

		<LinearLayout
		android:id="@+id/activity_confirmation"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:baselineAligned="false">
		android:baselineAligned="false"
		android:importantForAccessibility="no">

		<LinearLayout android:id="@+id/association_confirmation"
		style="@style/ContainerLayout">
		@@ -153,7 +155,8 @@
		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_weight="1">
		android:layout_weight="1"
		android:importantForAccessibility="noHideDescendants">

		<ProgressBar
		android:id="@+id/spinner_single_device"

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:padding="12dp"
		android:contentDescription="@string/vendor_icon_description" />
		android:importantForAccessibility="no" />

		<TextView
		android:id="@+id/vendor_header_name"

+1 −4

Original line number	Diff line number	Diff line
		@@ -132,11 +132,8 @@
		<!-- Text of the permission sync explanation in the confirmation dialog. [CHAR LIMIT=NONE] -->
		<string name="permission_sync_summary">This may include <strong>Microphone</strong>, <strong>Camera</strong>, and <strong>Location access</strong>, and other sensitive permissions on <strong><xliff:g id="companion_device_name" example="My Watch">%1$s</xliff:g></strong>. <br/><br/>You can change these permissions any time in your Settings on <strong><xliff:g id="companion_device_name" example="My Watch">%1$s</xliff:g></strong>.</string>

		<!--Description for vendor icon [CHAR LIMIT=30]-->
		<string name="vendor_icon_description">App Icon</string>

		<!--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 ================= -->