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

Commit 6a4c2b65 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fixes starting window being occluded when enable shell transition"

parents c2dc611a fb669d9c

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

+2 −4
Original line number Diff line number Diff line
@@ -2548,10 +2548,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        if (win.mAttrs.type == TYPE_APPLICATION_STARTING) {

            transit = WindowManagerPolicy.TRANSIT_PREVIEW_DONE;

        }

        if (win.inTransition()) {

            focusMayChange = true;

            win.mAnimatingExit = true;

        } else if (win.isWinVisibleLw() && winAnimator.applyAnimationLocked(transit, false)) {



        if (win.isWinVisibleLw() && winAnimator.applyAnimationLocked(transit, false)) {

            focusMayChange = true;

            win.mAnimatingExit = true;

        } else if (win.mDisplayContent.okToAnimate() && win.isAnimating(TRANSITION | PARENTS,

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

+1 −1
Original line number Diff line number Diff line
@@ -5427,7 +5427,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    @Override

    void assignLayer(Transaction t, int layer) {

        if (isStartingWindowAssociatedToTask()) {

        if (mStartingData != null) {

            // The starting window should cover the task.

            t.setLayer(mSurfaceControl, Integer.MAX_VALUE);

            return;