Don't display based on a dummy animation.

Craig Mautner · Craig Mautner · commit 9c5bf3b36f3d · 2012-06-22T15:19:13.000-07:00
The Starting window was being made visible early because the app
token had the dummy animation set. When the real animation started
the Starting window picked it up and became transparent causing
the underlying window to become visible again =&gt; jank.

Fixes bug 6691421.

Change-Id: I95fe88d2887760e6da3adedeb6be300eb6755283
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`	`/**`