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

Commit 065d85ea authored by Bill Lin's avatar Bill Lin Committed by Android (Google) Code Review
Browse files

Merge "Require InteractionJankMonitor." into tm-qpr-dev

parents 727b4386 d0cd38bc
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -49,17 +49,16 @@ private const val TAG = "GhostedViewLaunchAnimatorController"
 * Note: Avoid instantiating this directly and call [ActivityLaunchAnimator.Controller.fromView]
 * 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. */
    private val ghostedView: View,

    /** The [InteractionJankMonitor.CujType] associated to this animation. */
    private val cujType: Int? = null,
    private var interactionJankMonitor: InteractionJankMonitor? = null
    private var interactionJankMonitor: InteractionJankMonitor =
        InteractionJankMonitor.getInstance(),
) : ActivityLaunchAnimator.Controller {

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

    /** The container to which we will add the ghost view and expanding background. */
    override var launchContainer = ghostedView.rootView as ViewGroup
    private val launchContainerOverlay: ViewGroupOverlay
@@ -203,7 +202,7 @@ open class GhostedViewLaunchAnimatorController(
        val matrix = ghostView?.animationMatrix ?: Matrix.IDENTITY_MATRIX
        matrix.getValues(initialGhostViewMatrixValues)

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

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

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

        backgroundDrawable?.wrapped?.alpha = startBackgroundAlpha