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

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

Merge "Continue animations started from AppWindowToken."

parents 4d6e0788 03273d00

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

+4 −1
Original line number Diff line number Diff line
@@ -190,14 +190,17 @@ class AppWindowToken extends WindowToken { 
        }

    }



    void showAllWindowsLocked() {

    boolean showAllWindowsLocked() {

        boolean isAnimating = false;

        final int NW = allAppWindows.size();

        for (int i=0; i<NW; i++) {

            WindowState w = allAppWindows.get(i);

            if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(WindowManagerService.TAG,

                    "performing show on: " + w);

            w.performShowLocked();

            isAnimating |= w.isAnimating();

        }

        return isAnimating;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -7947,7 +7947,7 @@ public class WindowManagerService extends IWindowManager.Stub 


                    // We can now show all of the drawn windows!

                    if (!mOpeningApps.contains(wtoken)) {

                        wtoken.showAllWindowsLocked();

                        mInnerFields.mAnimating |= wtoken.showAllWindowsLocked();

                    }

                }

            }
@@ -8131,7 +8131,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                        transit, false);

                wtoken.updateReportedVisibilityLocked();

                wtoken.waitingToShow = false;

                wtoken.showAllWindowsLocked();

                mInnerFields.mAnimating |= wtoken.showAllWindowsLocked();

            }

            NN = mClosingApps.size();

            for (i=0; i<NN; i++) {