commit 2fa2a52838619d092e22e61e16a4ee2f35b22fdd
author Craig Mautner <cmautner@google.com> Tue Jun 19 15:13:46 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 19 15:13:46 2012 -0700
tree fbc3dcfe889ff8fbbafc4b34f9944c4613daa503
parent dd2a97e3aea47e70b1669af54593bf165c1cb899
parent 9a5a8aafad89f3e05bb9c17c56ea4658413a4452

am 9a5a8aaf: am 5785e05d: Merge "Clear sendingToBottom when animation is complete." into jb-dev

* commit '9a5a8aafad89f3e05bb9c17c56ea4658413a4452':
  Clear sendingToBottom when animation is complete.

services/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index d73dc45..e2acd7f 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -8271,6 +8271,9 @@
 
         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();
@@ -9134,6 +9137,8 @@
 
             // 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;
             }