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

Commit 7c00210f authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

Keep starting window on top during remove. 

To align the behavior of WindowState#assignLayer even when removing.

Bug: 268221678
Test: launch test app, verify starting window remain on top during
fadeout animation.

Change-Id: I8d4000dc02749f5ec9f456a6cce76ee8e56cb331
parent 14c9b2a5

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -2470,6 +2470,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                    if (allowExitAnimation && mWinAnimator.applyAnimationLocked(transit, false)) {

                    if (allowExitAnimation && mWinAnimator.applyAnimationLocked(transit, false)) {

                        ProtoLog.v(WM_DEBUG_ANIM,

                        ProtoLog.v(WM_DEBUG_ANIM,

                                "Set animatingExit: reason=remove/applyAnimation win=%s", this);

                                "Set animatingExit: reason=remove/applyAnimation win=%s", this);

                        if (startingWindow && mSurfaceAnimator.hasLeash()) {

                            // Keep starting window on top during fade-out animation.

                            getPendingTransaction().setLayer(mSurfaceAnimator.mLeash,

                                    Integer.MAX_VALUE);

                        }

                        mAnimatingExit = true;

                        mAnimatingExit = true;





                        // mAnimatingExit affects canAffectSystemUiFlags(). Run layout such that

                        // mAnimatingExit affects canAffectSystemUiFlags(). Run layout such that