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

Commit 2da86beb authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "show WSA when ready when using shell transitions" into tm-qpr-dev

parents 4f72de8d 4c157847

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

    }



    /**