Merge "Avoid prematurely reporting completion of split resize transition" into main

    /** Stops showing resizing hint. */

    public void onResized(SurfaceControl.Transaction t,

            @Nullable Consumer<Boolean> animFinishedCallback) {

        // If there is a running animation, place a placeholder callback to avoid calling the end

        // callback too early when canceling the existed animation before the new animation starts.

        final Consumer<Boolean> callbackPlaceHolder =

                animFinishedCallback != null && mRunningAnimationCount > 0 ? status -> {} : null;

        if (callbackPlaceHolder != null) {

            mRunningAnimationCount++;

            mAnimFinishCallbacks.put(callbackPlaceHolder, false);

        }

        animateResized(t, animFinishedCallback);

        if (callbackPlaceHolder != null) {

            mRunningAnimationCount--;

            updateCallbackStatus(false /* callbackStatus */, callbackPlaceHolder);

        }

    }

    private void animateResized(SurfaceControl.Transaction t,

            @Nullable Consumer<Boolean> animFinishedCallback) {

        if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {

            mScreenshotAnimator.cancel();

        }