Merge "[a11y] Getting accessibility focus at pop up icon" into tm-qpr-dev

This commit is contained in:
Michael Mikhail
2022-08-23 16:16:00 +00:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 2 deletions

View File

@@ -226,7 +226,7 @@ abstract class MediaTttChipControllerCommon<T : ChipInfoCommon>(
appIconView.contentDescription = appNameOverride ?: iconInfo.iconName appIconView.contentDescription = appNameOverride ?: iconInfo.iconName
appIconView.setImageDrawable(appIconDrawableOverride ?: iconInfo.icon) appIconView.setImageDrawable(appIconDrawableOverride ?: iconInfo.icon)
return appIconView.contentDescription.toString() return appIconView.contentDescription
} }
/** /**

View File

@@ -141,12 +141,13 @@ class MediaTttChipControllerReceiver @Inject constructor(
override fun updateChipView(newChipInfo: ChipReceiverInfo, currentChipView: ViewGroup) { override fun updateChipView(newChipInfo: ChipReceiverInfo, currentChipView: ViewGroup) {
super.updateChipView(newChipInfo, currentChipView) super.updateChipView(newChipInfo, currentChipView)
setIcon( val iconName = setIcon(
currentChipView, currentChipView,
newChipInfo.routeInfo.clientPackageName, newChipInfo.routeInfo.clientPackageName,
newChipInfo.appIconDrawableOverride, newChipInfo.appIconDrawableOverride,
newChipInfo.appNameOverride newChipInfo.appNameOverride
) )
currentChipView.contentDescription = iconName
} }
override fun animateChipIn(chipView: ViewGroup) { override fun animateChipIn(chipView: ViewGroup) {
@@ -159,6 +160,8 @@ class MediaTttChipControllerReceiver @Inject constructor(
.alpha(1f) .alpha(1f)
.setDuration(5.frames) .setDuration(5.frames)
.start() .start()
// Using withEndAction{} doesn't apply a11y focus when screen is unlocked.
appIconView.postOnAnimation { chipView.requestAccessibilityFocus() }
startRipple(chipView.requireViewById(R.id.ripple)) startRipple(chipView.requireViewById(R.id.ripple))
} }