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

Commit 345bc4b5 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Account for recents animation when reporting client visibility"

parents 41b22ecc c0154a63

services/core/java/com/android/server/wm/ActivityRecord.java

+3 −2
Original line number Diff line number Diff line
@@ -4842,7 +4842,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        final boolean usingShellTransitions =

                mAtmService.getTransitionController().getTransitionPlayer() != null;

        final boolean delayed = isAnimating(PARENTS | CHILDREN,

                ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_WINDOW_ANIMATION);

                ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_WINDOW_ANIMATION

                        | ANIMATION_TYPE_RECENTS);

        if (!delayed && !usingShellTransitions) {

            // We aren't delayed anything, but exiting windows rely on the animation finished

            // callback being called in case the ActivityRecord was pretending to be delayed,
@@ -4862,7 +4863,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        // updated.

        // If we're becoming invisible, update the client visibility if we are not running an

        // animation. Otherwise, we'll update client visibility in onAnimationFinished.

        if (visible || !isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION)

        if (visible || !isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)

                || usingShellTransitions) {

            setClientVisible(visible);

        }