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

Commit 4887a857 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 sc-dev am: 5af8fe68 

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

Change-Id: I52475067b02ae43d8190f34bdda2dfb4c8ed0a44
parents d3f13bb5 5af8fe68

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

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

     */

    private void postApplyAnimation(boolean visible) {

    private void postApplyAnimation(boolean visible) {

        final boolean delayed = isAnimating(PARENTS | CHILDREN,

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

        if (!delayed) {

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

            // 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,

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

        // updated.

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

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

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

        // 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);

            setClientVisible(visible);

        }

        }