Merge "Add onEndCallback to ContainerAnimationRunner" into tm-qpr-dev

This commit is contained in:
Johannes Gallmann
2023-03-06 18:55:48 +00:00
committed by Android (Google) Code Review

View File

@@ -419,7 +419,7 @@ class ActivityLaunchAnimator(
internal val delegate: AnimationDelegate internal val delegate: AnimationDelegate
init { init {
delegate = AnimationDelegate(controller, callback, launchAnimator, listener) delegate = AnimationDelegate(controller, callback, listener, launchAnimator)
} }
@BinderThread @BinderThread
@@ -446,10 +446,10 @@ class ActivityLaunchAnimator(
constructor( constructor(
private val controller: Controller, private val controller: Controller,
private val callback: Callback, 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. */ /** 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> { ) : RemoteAnimationDelegate<IRemoteAnimationFinishedCallback> {
private val launchContainer = controller.launchContainer private val launchContainer = controller.launchContainer
private val context = launchContainer.context private val context = launchContainer.context