commit 0f5541775c9fc24a31c50e122acfbb74e9757d83
author Hiroshi Lockheimer <hiroshi@google.com> Fri Jun 22 15:39:55 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 22 15:39:55 2012 -0700
tree 3375c18f1703bdb2f7d0dbf469a0401486895610
parent 8411df2ffddb7f3c6fec57b3d84b65a427732922
parent 3fee3eb7e0a83cd7fc8df3994692232ba6953c02

am 3fee3eb7: am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev

* commit '3fee3eb7e0a83cd7fc8df3994692232ba6953c02':
  Don't display based on a dummy animation.

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

diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java
index 2b48783..a00e8a5 100644
--- a/services/java/com/android/server/wm/WindowState.java
+++ b/services/java/com/android/server/wm/WindowState.java
@@ -737,7 +737,8 @@
                 && ((!mAttachedHidden && mViewVisibility == View.VISIBLE
                                 && !mRootToken.hidden)
                         || mWinAnimator.mAnimation != null
-                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)));
+                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)
+                                && !mWinAnimator.isDummyAnimation()));
     }
 
     /**