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

Hiroshi Lockheimer · Android (Google) Code Review · commit 5beeb04b528f · 2012-06-22T15:33:15.000-07:00
diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java
@@ -737,7 +737,8 @@ boolean isReadyForDisplayIgnoringKeyguard() {
                 && ((!mAttachedHidden && mViewVisibility == View.VISIBLE
                                 && !mRootToken.hidden)
                         || mWinAnimator.mAnimation != null
-                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)));
+                        || ((atoken != null) && (atoken.mAppAnimator.animation != null)
+                                && !mWinAnimator.isDummyAnimation()));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -737,7 +737,8 @@ boolean isReadyForDisplayIgnoringKeyguard() {`
`737`	`737`	`&& ((!mAttachedHidden && mViewVisibility == View.VISIBLE`
`738`	`738`	`&& !mRootToken.hidden)`
`739`	`739`	`\|\| mWinAnimator.mAnimation != null`
`740`		`- \|\| ((atoken != null) && (atoken.mAppAnimator.animation != null)));`
	`740`	`+ \|\| ((atoken != null) && (atoken.mAppAnimator.animation != null)`
	`741`	`+ && !mWinAnimator.isDummyAnimation()));`
`741`	`742`	`}`
`742`	`743`
`743`	`744`	`/**`