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

Commit 8f54d32b authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Apply animation in relayout invisible the old way" into nyc-mr1-dev

parents a7d4adaa 39b80e5c

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

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

        if (win.mAttrs.type == TYPE_APPLICATION_STARTING) {

            transit = WindowManagerPolicy.TRANSIT_PREVIEW_DONE;

            transit = WindowManagerPolicy.TRANSIT_PREVIEW_DONE;

        }

        }

        if (win.isWinVisibleLw() && (winAnimator.isAnimationSet() ||

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

                winAnimator.applyAnimationLocked(transit, false))) {

            focusMayChange = isDefaultDisplay;

            focusMayChange = isDefaultDisplay;

            win.mAnimatingExit = true;

            win.mAnimatingExit = true;

            win.mWinAnimator.mAnimating = true;

            win.mWinAnimator.mAnimating = true;