Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 00b9e899: Merge "Clear startingDisplayed flag when removing window." into jb-dev

Browse Source 
* commit '00b9e899320488ff5623d8c80258ed7dfefc7b53':
  Clear startingDisplayed flag when removing window.
This commit is contained in:
Craig Mautner
2012-07-02 17:05:16 -07:00
committed by Android Git Automerger
parent e102b8168a 00b9e89932
commit 80059d6c1b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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 {