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

Commit 41c31ef3 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Fix bug introduced when moving animation step out from between... 

Merge "Fix bug introduced when moving animation step out from between assignments to wasAnimating and nowAnimating. Now wasAnimating once again contains the animation state prior to the animation step."
parents 2b1769fe 83eaab5b

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

+1 −1
Original line number Diff line number Diff line
@@ -7685,7 +7685,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                    }

                }



                final boolean wasAnimating = w.mAnimating;

                final boolean wasAnimating = w.mWasAnimating;



                // If the window has moved due to its containing

                // content frame changing, then we'd like to animate

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

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
    boolean mAttachedHidden;    // is our parent window hidden?

    boolean mLastHidden;        // was this window last hidden?

    boolean mWallpaperVisible;  // for wallpaper, what was last vis report?

    boolean mWasAnimating;      // Were we animating going into the most recent animation step?



    /**

     * The window size that was requested by the application.  These are in
@@ -979,6 +980,9 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
    // This must be called while inside a transaction.  Returns true if

    // there is more animation to run.

    boolean stepAnimationLocked(long currentTime) {

        // Save the animation state as it was before this step so WindowManagerService can tell if

        // we just started or just stopped animating by comparing mWasAnimating with isAnimating().

        mWasAnimating = isAnimating();

        if (!mService.mDisplayFrozen && mService.mPolicy.isScreenOnFully()) {

            // We will run animations as long as the display isn't frozen.