diff options
| -rw-r--r-- | services/java/com/android/server/wm/AppWindowToken.java | 5 | ||||
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/wm/AppWindowToken.java b/services/java/com/android/server/wm/AppWindowToken.java index 4b3d904e994f..3043da2d8aa2 100644 --- a/services/java/com/android/server/wm/AppWindowToken.java +++ b/services/java/com/android/server/wm/AppWindowToken.java @@ -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; } diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 79d2dd4a317a..31a278888ade 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -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++) { |