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

Commit 2ab88ec0 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Don't start Window enter animation as a result of AWT becoming visible." into pi-dev 

am: 8b328b6f

Change-Id: I6cd1523aef9c793031e1530da6a06e5543ae923d
parents ee2a2751 8b328b6f

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

+9 −4
Original line number Diff line number Diff line
@@ -1702,12 +1702,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            return changed;

        }



        if (visible != isVisibleNow()) {

            if (!runningAppAnimation) {

        final boolean isVisibleNow = isVisibleNow();

        if (visible != isVisibleNow) {

            // Run exit animation if:

            // 1. App visibility and WS visibility are different

            // 2. App is not running an animation

            // 3. WS is currently visible

            if (!runningAppAnimation && isVisibleNow) {

                final AccessibilityController accessibilityController =

                        mService.mAccessibilityController;

                final int winTransit = visible ? TRANSIT_ENTER : TRANSIT_EXIT;

                mWinAnimator.applyAnimationLocked(winTransit, visible);

                final int winTransit = TRANSIT_EXIT;

                mWinAnimator.applyAnimationLocked(winTransit, false /* isEntrance */);

                //TODO (multidisplay): Magnification is supported only for the default

                if (accessibilityController != null && getDisplayId() == DEFAULT_DISPLAY) {

                    accessibilityController.onWindowTransitionLocked(this, winTransit);