commit 1dee8974693fff55e276e0aed1202e43904bb944
author Craig Mautner <cmautner@google.com> Tue May 29 11:45:16 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 29 11:45:16 2012 -0700
tree fd03263c1e4abddade9c5d732dc4ab5199077e54
parent 3dac02265e42bf176e26b83da430ce15d6fd06df
parent 06a94f710d4ee6366ebfbd6666c5a58916511eef

Merge "Track animating apps up until animation starts." into jb-dev

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 b1612a1..af6d504 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -3544,7 +3544,8 @@
             wtoken.groupId = groupId;
             wtoken.appFullscreen = fullscreen;
             wtoken.requestedOrientation = requestedOrientation;
-            if (DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG, "addAppToken: " + wtoken);
+            if (DEBUG_TOKEN_MOVEMENT || DEBUG_ADD_REMOVE) Slog.v(TAG, "addAppToken: " + wtoken
+                    + " at " + addPos);
             mAppTokens.add(addPos, wtoken);
             addAppTokenToAnimating(addPos, wtoken);
             mTokenMap.put(token.asBinder(), wtoken);
@@ -4816,8 +4817,7 @@
                 }
             }
 
-            if (mNextAppTransition == WindowManagerPolicy.TRANSIT_UNSET
-                    && !mAppTransitionRunning) {
+            if (!mAppTransitionRunning) {
                 mAnimatingAppTokens.clear();
                 mAnimatingAppTokens.addAll(mAppTokens);
                 moveAppWindowsLocked(tokens, mAppTokens.size());
@@ -4836,8 +4836,7 @@
         final long origId = Binder.clearCallingIdentity();
         synchronized(mWindowMap) {
             final int N = tokens.size();
-            if (N > 0 && mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET
-                    && !mAppTransitionRunning) {
+            if (N > 0 && !mAppTransitionRunning) {
                 // animating towards back, hang onto old list for duration of animation.
                 mAnimatingAppTokens.clear();
                 mAnimatingAppTokens.addAll(mAppTokens);
@@ -4857,8 +4856,7 @@
                 }
             }
 
-            if (mNextAppTransition == WindowManagerPolicy.TRANSIT_UNSET
-                    && !mAppTransitionRunning) {
+            if (!mAppTransitionRunning) {
                 mAnimatingAppTokens.clear();
                 mAnimatingAppTokens.addAll(mAppTokens);
                 moveAppWindowsLocked(tokens, 0);