From 9c5bf3b36f3dd658320f34dbaee9d6d453606bf4 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Fri, 22 Jun 2012 15:19:13 -0700 Subject: Don't display based on a dummy animation. 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 => jank. Fixes bug 6691421. Change-Id: I95fe88d2887760e6da3adedeb6be300eb6755283 --- services/java/com/android/server/wm/WindowState.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index 2b48783fa26d..a00e8a5155b3 100644 --- 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())); } /** -- cgit v1.2.3-59-g8ed1b