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

Merge "Clear sendingToBottom when animation is complete." into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-06-19 15:08:41 -07:00
committed by Android (Google) Code Review
parent c258546710 3f99fde465
commit 5785e05d44
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8257,6 +8257,9 @@ public class WindowManagerService extends IWindowManager.Stub
mAppTransitionRunning = false;
// Restore window app tokens to the ActivityManager views
for (int i = mAnimatingAppTokens.size() - 1; i >= 0; i--) {
mAnimatingAppTokens.get(i).sendingToBottom = false;
}
mAnimatingAppTokens.clear();
mAnimatingAppTokens.addAll(mAppTokens);
rebuildAppWindowListLocked();
@@ -9120,6 +9123,8 @@ public class WindowManagerService extends IWindowManager.Stub
// If this window's application has been removed, just skip it.
if (thisApp != null && (thisApp.removed || thisApp.sendingToBottom)) {
if (DEBUG_FOCUS) Slog.v(TAG, "Skipping app because " + (thisApp.removed
? "removed" : "sendingToBottom"));
continue;
}