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

am 0d05be3f: Merge change 22544 into eclair

Browse Source 
Merge commit '0d05be3f724740eb95ac5acd9819b4db0eccd694' into eclair-plus-aosp

* commit '0d05be3f724740eb95ac5acd9819b4db0eccd694':
  Fix bug that would leave old windows around.
This commit is contained in:
Dianne Hackborn
2009-08-24 20:23:11 -07:00
committed by Android Git Automerger
parent 8e40bad232 0d05be3f72
commit d8a0f45898
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8850,6 +8850,7 @@ public class WindowManagerService extends IWindowManager.Stub
"Now opening app" + wtoken); "Now opening app" + wtoken);
wtoken.reportedVisible = false; wtoken.reportedVisible = false;
wtoken.inPendingTransaction = false; wtoken.inPendingTransaction = false;
wtoken.animation = null;
setTokenVisibilityLocked(wtoken, lp, true, transit, false); setTokenVisibilityLocked(wtoken, lp, true, transit, false);
wtoken.updateReportedVisibilityLocked(); wtoken.updateReportedVisibilityLocked();
wtoken.showAllWindowsLocked(); wtoken.showAllWindowsLocked();
@@ -8860,6 +8861,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (DEBUG_APP_TRANSITIONS) Log.v(TAG, if (DEBUG_APP_TRANSITIONS) Log.v(TAG,
"Now closing app" + wtoken); "Now closing app" + wtoken);
wtoken.inPendingTransaction = false; wtoken.inPendingTransaction = false;
wtoken.animation = null;
setTokenVisibilityLocked(wtoken, lp, false, transit, false); setTokenVisibilityLocked(wtoken, lp, false, transit, false);
wtoken.updateReportedVisibilityLocked(); wtoken.updateReportedVisibilityLocked();
// Force the allDrawn flag, because we want to start // Force the allDrawn flag, because we want to start