Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3acc965d authored by Michael Mikhail's avatar Michael Mikhail Committed by Automerger Merge Worker
Browse files

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

Merge "[Media TTT] Draw ripple before translation" into tm-qpr-dev am: 45ef285e am: 8a2be676 am: ee6bc2d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22085385



Change-Id: Iaacb9340283289141674b7f09dd2857844ad27d4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 573287b0 ee6bc2d4

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

+4 −3
Original line number Diff line number Diff line
@@ -225,8 +225,10 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
        val iconRippleView: ReceiverChipRippleView = view.requireViewById(R.id.icon_glow_ripple)

        val rippleView: ReceiverChipRippleView = view.requireViewById(R.id.ripple)

        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.

        iconContainerView.translationY += rippleController.getReceiverIconSize()

        iconContainerView.translationY = rippleController.getReceiverIconSize().toFloat()

        animateViewTranslationAndFade(

            iconContainerView,

            translationYBy = -1 * translationYBy,
@@ -235,7 +237,6 @@ open class MediaTttChipControllerReceiver @Inject constructor( 
        ) {

            animateBouncingView(iconContainerView, translationYBy * BOUNCE_TRANSLATION_RATIO)

        }

        rippleController.expandToInProgressState(rippleView, iconRippleView)

    }



    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. */

    private fun getTranslationAmount(): Float {

        return rippleController.getRippleSize() * 0.5f

        return rippleController.getReceiverIconSize() * 2f

    }



    private fun View.getAppIconView(): CachingIconView {