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

Commit 09ae162c authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Notify exit animation done to transfered starting window." into sc-dev am: 454a412f

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

Change-Id: Ia400595c7bfa2e948520b78082cd1f2cd9b161c3
parents e3c4ae7b 454a412f
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -6679,6 +6679,19 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
        // traverse the copy.
        final ArrayList<WindowState> children = new ArrayList<>(mChildren);
        children.forEach(WindowState::onExitAnimationDone);
        // The starting window could transfer to another activity after app transition started, in
        // that case the latest top activity might not receive exit animation done callback if the
        // starting window didn't applied exit animation success. Notify animation finish to the
        // starting window if needed.
        if (task != null && startingMoved) {
            final WindowState transferredStarting = task.getWindow(w ->
                    w.mAttrs.type == TYPE_APPLICATION_STARTING);
            if (transferredStarting != null && transferredStarting.mAnimatingExit
                    && !transferredStarting.isSelfAnimating(0 /* flags */,
                    ANIMATION_TYPE_WINDOW_ANIMATION)) {
                transferredStarting.onExitAnimationDone();
            }
        }

        getDisplayContent().mAppTransition.notifyAppTransitionFinishedLocked(token);
        scheduleAnimation();