Merge "Make talkback to announce better hint on the audio sharing button." into main (d3c41192) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -756,6 +756,8 @@
		<string name="quick_settings_bluetooth_audio_sharing_button">Share audio</string>
		<!-- QuickSettings: Bluetooth dialog audio sharing button text when sharing audio [CHAR LIMIT=50]-->
		<string name="quick_settings_bluetooth_audio_sharing_button_sharing">Sharing audio</string>
		<!-- QuickSettings: Bluetooth dialog audio sharing button text accessibility label. Used as part of the string "Double tap to enter audio sharing settings". [CHAR LIMIT=50]-->
		<string name="quick_settings_bluetooth_audio_sharing_button_accessibility">enter audio sharing settings</string>

		<!-- QuickSettings: Bluetooth secondary label for the battery level of a connected device [CHAR LIMIT=20]-->
		<string name="quick_settings_bluetooth_secondary_label_battery_level"><xliff:g id="battery_level_as_percentage">%s</xliff:g> battery</string>

+20 −2

Original line number	Diff line number	Diff line
		@@ -129,8 +129,26 @@ internal constructor(
		getPairNewDeviceButton(dialog).setOnClickListener {
		bluetoothTileDialogCallback.onPairNewDeviceClicked(it)
		}
		getAudioSharingButtonView(dialog).setOnClickListener {
		bluetoothTileDialogCallback.onAudioSharingButtonClicked(it)
		getAudioSharingButtonView(dialog).apply {
		setOnClickListener { bluetoothTileDialogCallback.onAudioSharingButtonClicked(it) }
		accessibilityDelegate =
		object : AccessibilityDelegate() {
		override fun onInitializeAccessibilityNodeInfo(
		host: View,
		info: AccessibilityNodeInfo
		) {
		super.onInitializeAccessibilityNodeInfo(host, info)
		info.addAction(
		AccessibilityAction(
		AccessibilityAction.ACTION_CLICK.id,
		context.getString(
		R.string
		.quick_settings_bluetooth_audio_sharing_button_accessibility
		)
		)
		)
		}
		}
		}
		getScrollViewContent(dialog).apply {
		minimumHeight =