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

Commit 343511c9 authored by Craig Mautner's avatar Craig Mautner
Browse files

Detect animation completions like we used to. 

Previous approximations weren't indicating completion and windows weren't being layered correctly as a result.

Change-Id: I08fcd278485bb87dc10bca257b9f8073108753f3
parent ba64dfe8

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

+10 −7
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    static final String TAG = "WindowManager";

    static final boolean DEBUG = false;

    static final boolean DEBUG_ADD_REMOVE = false;

    static final boolean DEBUG_FOCUS = true;

    static final boolean DEBUG_FOCUS = false;

    static final boolean DEBUG_ANIM = false;

    static final boolean DEBUG_LAYOUT = false;

    static final boolean DEBUG_RESIZE = false;
@@ -162,13 +162,13 @@ public class WindowManagerService extends IWindowManager.Stub 
    static final boolean DEBUG_APP_TRANSITIONS = false;

    static final boolean DEBUG_STARTING_WINDOW = false;

    static final boolean DEBUG_REORDER = false;

    static final boolean DEBUG_WALLPAPER = true;

    static final boolean DEBUG_WALLPAPER = false;

    static final boolean DEBUG_DRAG = false;

    static final boolean DEBUG_SCREEN_ON = false;

    static final boolean DEBUG_SCREENSHOT = false;

    static final boolean DEBUG_BOOT = false;

    static final boolean SHOW_SURFACE_ALLOC = false;

    static final boolean SHOW_TRANSACTIONS = true;

    static final boolean SHOW_TRANSACTIONS = false;

    static final boolean SHOW_LIGHT_TRANSACTIONS = false || SHOW_TRANSACTIONS;

    static final boolean HIDE_STACK_CRAWLS = true;
@@ -7685,8 +7685,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                    }

                }



                final boolean wasAnimating = w.mWasAnimating;



                // If the window has moved due to its containing

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

                // it.  The checks here are ordered by what is least
@@ -7705,8 +7703,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                    w.mAnimDh = innerDh;

                }



                // Execute animation.

                final boolean nowAnimating = w.isAnimating();

                final boolean wasAnimating = w.mWasAnimating;

                final boolean nowAnimating = w.mLocalAnimating;



                if (DEBUG_WALLPAPER) {

                    Slog.v(TAG, w + ": wasAnimating=" + wasAnimating +

                            ", nowAnimating=" + nowAnimating);

                }



                // If this window is animating, make a note that we have

                // an animating window and take care of a request to run

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

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
    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();

        mWasAnimating = mAnimating;

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

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