diff options
| author | Craig Mautner <cmautner@google.com> | 2012-07-02 17:01:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-02 17:01:58 -0700 |
| commit | 00b9e899320488ff5623d8c80258ed7dfefc7b53 (patch) | |
| tree | b5c204e6cea0cc69c6309b6e99852f1bf618128b | |
| parent | 4123b46f0e4146cb181b53af476e34bfede7d1ec (diff) | |
| parent | 38b2478f63004c493d7f7f1ac0bf07f51d6f0757 (diff) | |
| download | base-00b9e899320488ff5623d8c80258ed7dfefc7b53.tar.gz | |
Merge "Clear startingDisplayed flag when removing window." into jb-dev
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index c850bd202ff5..70113437a026 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -2291,6 +2291,8 @@ public class WindowManagerService extends IWindowManager.Stub if (attrs.type == TYPE_APPLICATION_STARTING && token.appWindowToken != null) { token.appWindowToken.startingWindow = win; + if (DEBUG_STARTING_WINDOW) Slog.v (TAG, "addWindow: " + token.appWindowToken + + " startingWindow=" + win); } boolean imMayMove = true; @@ -2514,10 +2516,12 @@ public class WindowManagerService extends IWindowManager.Stub if (atoken != null) { if (atoken.startingWindow == win) { + if (DEBUG_STARTING_WINDOW) Slog.v(TAG, "Nulling startingWindow " + win); atoken.startingWindow = null; } else if (atoken.allAppWindows.size() == 0 && atoken.startingData != null) { // If this is the last window and we had requested a starting // transition window, well there is no point now. + if (DEBUG_STARTING_WINDOW) Slog.v(TAG, "Nulling last startingWindow"); atoken.startingData = null; } else if (atoken.allAppWindows.size() == 1 && atoken.startingView != null) { // If this is the last window except for a starting transition @@ -7038,6 +7042,7 @@ public class WindowManagerService extends IWindowManager.Stub wtoken.startingData = null; wtoken.startingView = null; wtoken.startingWindow = null; + wtoken.startingDisplayed = false; } } if (view != null) { @@ -7074,6 +7079,7 @@ public class WindowManagerService extends IWindowManager.Stub wtoken.startingData = null; wtoken.startingView = null; wtoken.startingWindow = null; + wtoken.startingDisplayed = false; } try { |