Merge "[a11y] Getting accessibility focus at pop up icon" into tm-qpr-dev (af4af52b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/taptotransfer/common/MediaTttChipControllerCommon.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ abstract class MediaTttChipControllerCommon<T : ChipInfoCommon>(

		appIconView.contentDescription = appNameOverride ?: iconInfo.iconName
		appIconView.setImageDrawable(appIconDrawableOverride ?: iconInfo.icon)
		return appIconView.contentDescription.toString()
		return appIconView.contentDescription
		}

		/**

+4 −1

Original line number	Diff line number	Diff line
		@@ -141,12 +141,13 @@ class MediaTttChipControllerReceiver @Inject constructor(

		override fun updateChipView(newChipInfo: ChipReceiverInfo, currentChipView: ViewGroup) {
		super.updateChipView(newChipInfo, currentChipView)
		setIcon(
		val iconName = setIcon(
		currentChipView,
		newChipInfo.routeInfo.clientPackageName,
		newChipInfo.appIconDrawableOverride,
		newChipInfo.appNameOverride
		)
		currentChipView.contentDescription = iconName
		}

		override fun animateChipIn(chipView: ViewGroup) {
		@@ -159,6 +160,8 @@ class MediaTttChipControllerReceiver @Inject constructor(
		.alpha(1f)
		.setDuration(5.frames)
		.start()
		// Using withEndAction{} doesn't apply a11y focus when screen is unlocked.
		appIconView.postOnAnimation { chipView.requestAccessibilityFocus() }
		startRipple(chipView.requireViewById(R.id.ripple))
		}