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

* commit '5beeb04b528fec320d3453601b4adf4efbd8eba7': Don't display based on a dummy animation.
2012-06-22 15:34:56 -07:00
parent de9d2fb699 5beeb04b52
commit 3fee3eb7e0
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowState.java
+++ b/services/java/com/android/server/wm/WindowState.java
@@ -737,7 +737,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
                && ((!mAttachedHidden && mViewVisibility == View.VISIBLE
                                && !mRootToken.hidden)
                        || mWinAnimator.mAnimation != null
-                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)));
+                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)
+                                && !mWinAnimator.isDummyAnimation()));
    }

    /**