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

Commit e73d9fb0 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Ensure that ghosted view is attached when calculating its matrix." into... 

Merge "Ensure that ghosted view is attached when calculating its matrix." into sc-v2-dev am: ad71aa40 am: fce72425

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

Change-Id: I06fbb1e051cb7330c09df7c5de1646d2a5f89a75
parents e639772f fce72425

packages/SystemUI/animation/src/com/android/systemui/animation/GhostedViewLaunchAnimatorController.kt

+6 −1
Original line number Diff line number Diff line
@@ -209,8 +209,13 @@ open class GhostedViewLaunchAnimatorController( 
        val heightRatio = state.height.toFloat() / ghostedViewState.height

        val scale = min(widthRatio, heightRatio)



        launchContainer.getLocationOnScreen(launchContainerLocation)

        if (ghostedView.parent is ViewGroup) {

            // Recalculate the matrix in case the ghosted view moved. We ensure that the ghosted

            // view is still attached to a ViewGroup, otherwise calculateMatrix will throw.

            GhostView.calculateMatrix(ghostedView, launchContainer, ghostViewMatrix)

        }



        launchContainer.getLocationOnScreen(launchContainerLocation)

        ghostViewMatrix.postScale(

            scale, scale,

            ghostedViewState.centerX - launchContainerLocation[0],