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

Commit d0cd38bc authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Require InteractionJankMonitor. 

Bug: 229249877
Test: atest GhostedViewLaunchAnimatorControllerTest
Change-Id: I3be89f81270e3492cbc7dc111165a91d12d69588
parent 0869abd8

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

+5 −6
Original line number Original line Diff line number Diff line
@@ -49,17 +49,16 @@ private const val TAG = "GhostedViewLaunchAnimatorController" 
 * Note: Avoid instantiating this directly and call [ActivityLaunchAnimator.Controller.fromView]

 * Note: Avoid instantiating this directly and call [ActivityLaunchAnimator.Controller.fromView]

 * whenever possible instead.

 * whenever possible instead.

 */

 */

open class GhostedViewLaunchAnimatorController(

open class GhostedViewLaunchAnimatorController @JvmOverloads constructor(

    /** The view that will be ghosted and from which the background will be extracted. */

    /** The view that will be ghosted and from which the background will be extracted. */

    private val ghostedView: View,

    private val ghostedView: View,





    /** The [InteractionJankMonitor.CujType] associated to this animation. */

    /** The [InteractionJankMonitor.CujType] associated to this animation. */

    private val cujType: Int? = null,

    private val cujType: Int? = null,

    private var interactionJankMonitor: InteractionJankMonitor? = null

    private var interactionJankMonitor: InteractionJankMonitor =

        InteractionJankMonitor.getInstance(),

) : ActivityLaunchAnimator.Controller {

) : ActivityLaunchAnimator.Controller {





    constructor(view: View, type: Int) : this(view, type, null)



    /** The container to which we will add the ghost view and expanding background. */

    /** The container to which we will add the ghost view and expanding background. */

    override var launchContainer = ghostedView.rootView as ViewGroup

    override var launchContainer = ghostedView.rootView as ViewGroup

    private val launchContainerOverlay: ViewGroupOverlay

    private val launchContainerOverlay: ViewGroupOverlay
@@ -203,7 +202,7 @@ open class GhostedViewLaunchAnimatorController( 
        val matrix = ghostView?.animationMatrix ?: Matrix.IDENTITY_MATRIX

        val matrix = ghostView?.animationMatrix ?: Matrix.IDENTITY_MATRIX

        matrix.getValues(initialGhostViewMatrixValues)

        matrix.getValues(initialGhostViewMatrixValues)





        cujType?.let { interactionJankMonitor?.begin(ghostedView, it) }

        cujType?.let { interactionJankMonitor.begin(ghostedView, it) }

    }

    }





    override fun onLaunchAnimationProgress(

    override fun onLaunchAnimationProgress(
@@ -289,7 +288,7 @@ open class GhostedViewLaunchAnimatorController( 
            return

            return

        }

        }





        cujType?.let { interactionJankMonitor?.end(it) }

        cujType?.let { interactionJankMonitor.end(it) }





        backgroundDrawable?.wrapped?.alpha = startBackgroundAlpha

        backgroundDrawable?.wrapped?.alpha = startBackgroundAlpha