diff options
| author | Craig Mautner <cmautner@google.com> | 2012-06-22 15:19:13 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-06-22 15:19:13 -0700 |
| commit | 9c5bf3b36f3dd658320f34dbaee9d6d453606bf4 (patch) | |
| tree | 199208f4d236842652cb515a4b728e64a1662a25 | |
| parent | f41209568617f4acfaf6dea8f8b2cbe9c2994a3e (diff) | |
| download | frameworks_base-9c5bf3b36f3dd658320f34dbaee9d6d453606bf4.zip frameworks_base-9c5bf3b36f3dd658320f34dbaee9d6d453606bf4.tar.gz frameworks_base-9c5bf3b36f3dd658320f34dbaee9d6d453606bf4.tar.bz2 | |
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
| -rw-r--r-- | services/java/com/android/server/wm/WindowState.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index 2b48783..a00e8a5 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())); } /** |