Merge "Fix accessibility label for audio sharing buttons." into main (afd0980c) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/color/audio_sharing_btn_text_color.xml

+4 −3

Original line number	Diff line number	Diff line
		@@ -14,8 +14,9 @@
		~ limitations under the License.
		-->

		<selector xmlns:android="http://schemas.android.com/apk/res/android" >
		<selector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
		<item android:state_activated="true"
		android:color="@color/qs_dialog_btn_filled_text_color" />
		<item android:color="@color/qs_dialog_btn_outline_text" />
		android:color="@androidprv:color/materialColorOnPrimary" />
		<item android:color="@androidprv:color/materialColorOnSurface" />
		</selector>
		No newline at end of file

packages/SystemUI/res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -579,6 +579,10 @@
		<string name="accessibility_bluetooth_device_settings_gear">Click to configure device detail</string>
		<!-- Content description of the bluetooth device settings gear icon. [CHAR LIMIT=NONE] [BACKUP_MESSAGE_ID=3314916468105272540] -->
		<string name="accessibility_bluetooth_device_settings_gear_with_name"><xliff:g id="device_name">%s</xliff:g>. Configure device detail</string>
		<!-- Content description of the bluetooth device settings plus button. [CHAR LIMIT=NONE] -->
		<string name="accessibility_bluetooth_device_settings_plus_button_with_name">Start sharing audio with <xliff:g id="device_name">%s</xliff:g></string>
		<!-- Content description of the bluetooth device settings check mark. [CHAR LIMIT=NONE] -->
		<string name="accessibility_bluetooth_device_settings_checkmark_with_name">Stop sharing audio with <xliff:g id="device_name">%s</xliff:g></string>
		<!-- Content description of the bluetooth device settings see all. [CHAR LIMIT=NONE] -->
		<string name="accessibility_bluetooth_device_settings_see_all">See all devices</string>
		<!-- Content description of the bluetooth device settings pair new device. [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/BluetoothDetailsContentManager.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -441,7 +441,10 @@ constructor(
		deviceItem2.iconWithDescription?.second &&
		deviceItem1.background == deviceItem2.background &&
		deviceItem1.isEnabled == deviceItem2.isEnabled &&
		deviceItem1.actionAccessibilityLabel == deviceItem2.actionAccessibilityLabel
		deviceItem1.actionAccessibilityLabel ==
		deviceItem2.actionAccessibilityLabel &&
		deviceItem1.actionIconAccessibilityLabelRes ==
		deviceItem2.actionIconAccessibilityLabelRes
		}
		}

		@@ -506,10 +509,7 @@ constructor(
		actionIcon.setImageResource(item.actionIconRes)
		actionIcon.drawable?.setTint(tintColor)
		actionIconView.contentDescription =
		resources.getString(
		R.string.accessibility_bluetooth_device_settings_gear_with_name,
		item.deviceName,
		)
		resources.getString(item.actionIconAccessibilityLabelRes, item.deviceName)

		divider.setBackgroundColor(tintColor)

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/DeviceItem.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,4 +55,5 @@ data class DeviceItem(
		var actionAccessibilityLabel: String = "",
		var isActive: Boolean = false,
		val actionIconRes: Int = -1,
		val actionIconAccessibilityLabelRes: Int = -1,
		)

packages/SystemUI/src/com/android/systemui/bluetooth/qsdialog/DeviceItemFactory.kt

+9 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,11 @@ private val actionAccessibilityLabelActivate =
		R.string.accessibility_quick_settings_bluetooth_device_tap_to_activate
		private val actionAccessibilityLabelDisconnect =
		R.string.accessibility_quick_settings_bluetooth_device_tap_to_disconnect
		private val gearAccessibilityLabel = R.string.accessibility_bluetooth_device_settings_gear_with_name
		private val addIconAccessibilityLabelRes =
		R.string.accessibility_bluetooth_device_settings_plus_button_with_name
		private val onGoingIconAccessibilityLabelRes =
		R.string.accessibility_bluetooth_device_settings_checkmark_with_name

		/** Factories to create different types of Bluetooth device items from CachedBluetoothDevice. */
		abstract class DeviceItemFactory {
		@@ -64,6 +69,7 @@ abstract class DeviceItemFactory {
		actionAccessibilityLabel: String,
		isActive: Boolean,
		actionIconRes: Int = R.drawable.ic_settings_24dp,
		actionIconAccessibilityLabelRes: Int = gearAccessibilityLabel,
		): DeviceItem {
		return DeviceItem(
		type = type,
		@@ -77,6 +83,7 @@ abstract class DeviceItemFactory {
		actionAccessibilityLabel = actionAccessibilityLabel,
		isActive = isActive,
		actionIconRes = actionIconRes,
		actionIconAccessibilityLabelRes = actionIconAccessibilityLabelRes,
		)
		}
		}
		@@ -129,6 +136,7 @@ internal class AudioSharingMediaDeviceItemFactory(
		"",
		isActive = !cachedDevice.isBusy,
		actionIconRes = audioSharingOnGoingIcon,
		actionIconAccessibilityLabelRes = onGoingIconAccessibilityLabelRes,
		)
		}
		}
		@@ -162,6 +170,7 @@ internal class AvailableAudioSharingMediaDeviceItemFactory(
		"",
		isActive = false,
		actionIconRes = audioSharingAddIcon,
		actionIconAccessibilityLabelRes = addIconAccessibilityLabelRes,
		)
		}
		}