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

Commit 8efb0780 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Account for recents animation when reporting client visibility" into... 

Merge "Account for recents animation when reporting client visibility" into sc-dev am: 5af8fe68 am: 1b0ad342

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

Change-Id: I426212ffad84c302f2153e44adaf4239747fdd55
parents d0743a6b 1b0ad342

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

+4 −2
Original line number Diff line number Diff line
@@ -4840,7 +4840,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     */

    private void postApplyAnimation(boolean visible) {

        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) {

            // 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,
@@ -4860,7 +4861,8 @@ 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)) {

            setClientVisible(visible);

        }