Merge "[Media TTT] Fix a11y focus on receiver icon" into tm-qpr-dev

This commit is contained in:
Michael Mikhail
2023-01-23 15:48:05 +00:00
committed by Android (Google) Code Review

View File

@@ -30,6 +30,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.WindowManager import android.view.WindowManager
import android.view.accessibility.AccessibilityManager import android.view.accessibility.AccessibilityManager
import android.view.View.ACCESSIBILITY_LIVE_REGION_ASSERTIVE
import com.android.internal.widget.CachingIconView import com.android.internal.widget.CachingIconView
import com.android.systemui.R import com.android.systemui.R
import com.android.systemui.common.shared.model.ContentDescription import com.android.systemui.common.shared.model.ContentDescription
@@ -198,6 +199,7 @@ open class MediaTttChipControllerReceiver @Inject constructor(
val iconView = currentView.getAppIconView() val iconView = currentView.getAppIconView()
iconView.setPadding(iconPadding, iconPadding, iconPadding, iconPadding) iconView.setPadding(iconPadding, iconPadding, iconPadding, iconPadding)
iconView.accessibilityLiveRegion = ACCESSIBILITY_LIVE_REGION_ASSERTIVE
TintedIconViewBinder.bind(iconInfo.toTintedIcon(), iconView) TintedIconViewBinder.bind(iconInfo.toTintedIcon(), iconView)
} }
@@ -207,8 +209,6 @@ open class MediaTttChipControllerReceiver @Inject constructor(
val rippleView: ReceiverChipRippleView = view.requireViewById(R.id.ripple) val rippleView: ReceiverChipRippleView = view.requireViewById(R.id.ripple)
animateViewTranslationAndFade(appIconView, -1 * getTranslationAmount(), 1f) animateViewTranslationAndFade(appIconView, -1 * getTranslationAmount(), 1f)
animateViewTranslationAndFade(iconRippleView, -1 * getTranslationAmount(), 1f) animateViewTranslationAndFade(iconRippleView, -1 * getTranslationAmount(), 1f)
// Using withEndAction{} doesn't apply a11y focus when screen is unlocked.
appIconView.postOnAnimation { view.requestAccessibilityFocus() }
rippleController.expandToInProgressState(rippleView, iconRippleView) rippleController.expandToInProgressState(rippleView, iconRippleView)
} }