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

Commit e479dbbd authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "Correct animation glitch for pinned stack." into oc-dev am: 99b72250 

am: acad5c5d

Change-Id: I2c3f31a00653d4dfa896860f527d178ae797d117
parents 0ccaa4af acad5c5d

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

+2 −1
Original line number Diff line number Diff line
@@ -665,7 +665,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                    }

                }

            }

            if (!winAnimator.isAnimationStarting() && !winAnimator.isWaitingForOpening()) {

            if ((!winAnimator.isAnimationStarting() && !winAnimator.isWaitingForOpening()) ||

                    winAnimator.isDummyAnimation()) {

                // Updates the shown frame before we set up the surface. This is needed

                // because the resizing could change the top-left position (in addition to

                // size) of the window. setSurfaceBoundariesLocked uses mShownPosition to