Merge "Don't display based on a dummy animation." into jb-dev

2012-06-22 15:33:15 -07:00
parent ddeb7bd3c7 9c5bf3b36f
commit 5beeb04b52
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()));
    }

    /**