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

Commit 4aaea326 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "show WSA when ready when using shell transitions" into tm-qpr-dev am: 2da86beb 

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



Change-Id: I11a1780f30077da584cd578aefefde6e104e77f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff350795 2da86beb

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

+6 −2
Original line number Diff line number Diff line
@@ -4454,8 +4454,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     *         color mode set to avoid jank in the middle of the transition.

     */

    boolean canShowWindows() {

        return allDrawn && !(isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION)

                && hasNonDefaultColorWindow());

        final boolean drawn = mTransitionController.isShellTransitionsEnabled()

                ? mSyncState != SYNC_STATE_WAITING_FOR_DRAW : allDrawn;

        final boolean animating = mTransitionController.isShellTransitionsEnabled()

                ? mTransitionController.inTransition(this)

                : isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION);

        return drawn && !(animating && hasNonDefaultColorWindow());

    }



    /**