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

Commit dc31172d authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Automerger Merge Worker
Browse files

Merge "Add onEndCallback to ContainerAnimationRunner" into tm-qpr-dev am:... 

Merge "Add onEndCallback to ContainerAnimationRunner" into tm-qpr-dev am: 110c9c11 am: 53130229 am: e809002d

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



Change-Id: Ic150230ab0b743bc5c73f9e7d0c7876073456a7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7d2072c e809002d

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

+4 −4
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ class ActivityLaunchAnimator( 
        internal val delegate: AnimationDelegate



        init {

            delegate = AnimationDelegate(controller, callback, launchAnimator, listener)

            delegate = AnimationDelegate(controller, callback, listener, launchAnimator)

        }



        @BinderThread
@@ -446,10 +446,10 @@ class ActivityLaunchAnimator( 
    constructor(

        private val controller: Controller,

        private val callback: Callback,

        /** The animator to use to animate the window launch. */

        private val launchAnimator: LaunchAnimator = DEFAULT_LAUNCH_ANIMATOR,

        /** Listener for animation lifecycle events. */

        private val listener: Listener? = null

        private val listener: Listener? = null,

        /** The animator to use to animate the window launch. */

        private val launchAnimator: LaunchAnimator = DEFAULT_LAUNCH_ANIMATOR

    ) : RemoteAnimationDelegate<IRemoteAnimationFinishedCallback> {

        private val launchContainer = controller.launchContainer

        private val context = launchContainer.context