Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Media TTT] Draw ripple before translation" into tm-qpr-dev

Browse Source
This commit is contained in:
Michael Mikhail
2023-03-15 19:16:18 +00:00
committed by Android (Google) Code Review
parent 85bc59b926 190eb078c8
commit 45ef285e35
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiver.kt
View File

@@ -225,8 +225,10 @@ open class MediaTttChipControllerReceiver @Inject constructor(
val iconRippleView: ReceiverChipRippleView = view.requireViewById(R.id.icon_glow_ripple) val iconRippleView: ReceiverChipRippleView = view.requireViewById(R.id.icon_glow_ripple)
val rippleView: ReceiverChipRippleView = view.requireViewById(R.id.ripple) val rippleView: ReceiverChipRippleView = view.requireViewById(R.id.ripple)
val translationYBy = getTranslationAmount() val translationYBy = getTranslationAmount()
// Expand ripple before translating icon container to make sure both views have same bounds.
rippleController.expandToInProgressState(rippleView, iconRippleView)
// Make the icon container view starts animation from bottom of the screen. // Make the icon container view starts animation from bottom of the screen.
iconContainerView.translationY += rippleController.getReceiverIconSize() iconContainerView.translationY = rippleController.getReceiverIconSize().toFloat()
animateViewTranslationAndFade( animateViewTranslationAndFade(
iconContainerView, iconContainerView,
translationYBy = -1 * translationYBy, translationYBy = -1 * translationYBy,
@@ -235,7 +237,6 @@ open class MediaTttChipControllerReceiver @Inject constructor(
) { ) {
animateBouncingView(iconContainerView, translationYBy * BOUNCE_TRANSLATION_RATIO) animateBouncingView(iconContainerView, translationYBy * BOUNCE_TRANSLATION_RATIO)
} }
rippleController.expandToInProgressState(rippleView, iconRippleView)
} }
override fun animateViewOut(view: ViewGroup, removalReason: String?, onAnimationEnd: Runnable) { override fun animateViewOut(view: ViewGroup, removalReason: String?, onAnimationEnd: Runnable) {
@@ -293,7 +294,7 @@ open class MediaTttChipControllerReceiver @Inject constructor(
/** Returns the amount that the chip will be translated by in its intro animation. */ /** Returns the amount that the chip will be translated by in its intro animation. */
private fun getTranslationAmount(): Float { private fun getTranslationAmount(): Float {
return rippleController.getRippleSize() * 0.5f return rippleController.getReceiverIconSize() * 2f
} }
private fun View.getAppIconView(): CachingIconView { private fun View.getAppIconView(): CachingIconView {