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

am 9ad091ab: am 118d92f7: Merge change I16925b91 into eclair

Browse Source 
Merge commit '9ad091ab1065e85222da0927bb33913530f56f65' into eclair-mr2-plus-aosp

* commit '9ad091ab1065e85222da0927bb33913530f56f65':
  Finish fixing issue #2228381: android.view.InflateException...
This commit is contained in:
Dianne Hackborn
2009-11-24 15:08:13 -08:00
committed by Android Git Automerger
parent 40f92fe967 9ad091ab10
commit 80d5fc0f5a
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
services/java/com/android/server/WindowManagerService.java
View File

@@ -3541,24 +3541,35 @@ public class WindowManagerService extends IWindowManager.Stub
wtoken.inPendingTransaction = true;
if (visible) {
mOpeningApps.add(wtoken);
wtoken.allDrawn = false;
wtoken.startingDisplayed = false;
wtoken.startingMoved = false;
wtoken.waitingToShow = true;
if (wtoken.clientHidden) {
// In the case where we are making an app visible
// but holding off for a transition, we still need
// to tell the client to make its windows visible so
// they get drawn. Otherwise, we will wait on
// performing the transition until all windows have
// been drawn, they never will be, and we are sad.
wtoken.clientHidden = false;
wtoken.sendAppVisibilityToClients();
// If the token is currently hidden (should be the
// common case), then we need to set up to wait for
// its windows to be ready.
if (wtoken.hidden) {
wtoken.allDrawn = false;
wtoken.waitingToShow = true;
if (wtoken.clientHidden) {
// In the case where we are making an app visible
// but holding off for a transition, we still need
// to tell the client to make its windows visible so
// they get drawn. Otherwise, we will wait on
// performing the transition until all windows have
// been drawn, they never will be, and we are sad.
wtoken.clientHidden = false;
wtoken.sendAppVisibilityToClients();
}
}
} else {
mClosingApps.add(wtoken);
wtoken.waitingToHide = true;
// If the token is currently visible (should be the
// common case), then set up to wait for it to be hidden.
if (!wtoken.hidden) {
wtoken.waitingToHide = true;
}
}
return;
}