diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-11 11:50:58 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-05-11 11:50:58 -0700 |
| commit | 35d0e1d11c046b5e5ddf6d12c1a09becb8561af0 (patch) | |
| tree | ee023c7af77634ca11ca19d49cb30170dafd9e5b | |
| parent | bf6e0ba99dbfef44d3feb014ce7e530de800d7c2 (diff) | |
| download | frameworks_base-35d0e1d11c046b5e5ddf6d12c1a09becb8561af0.zip frameworks_base-35d0e1d11c046b5e5ddf6d12c1a09becb8561af0.tar.gz frameworks_base-35d0e1d11c046b5e5ddf6d12c1a09becb8561af0.tar.bz2 | |
Keep launcher screen from flashing over lockscreen
Extend the force hide period to include the animation.
Fixes bug b6471929.
Change-Id: I91daf9dc678723be4c69913aa5a3aa0e265d103e
| -rw-r--r-- | services/java/com/android/server/wm/WindowAnimator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 146de34..480992b 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -269,7 +269,7 @@ public class WindowAnimator { mPendingLayoutChanges); } mService.mFocusMayChange = true; - } else if (win.isReadyForDisplay() && winAnimator.mAnimation == null) { + } else if (win.isReadyForDisplay()) { mForceHiding = true; } } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) { |