diff options
| author | 2014-12-11 22:29:58 +0000 | |
|---|---|---|
| committer | 2014-12-11 22:29:58 +0000 | |
| commit | 922f8e2c0f58e57d02ab136f24f135553e6d9720 (patch) | |
| tree | fd22a1f4180446927d2934a94cba996bd5fb7af0 | |
| parent | e90a170f67f91d9b0166ac4f0de07f63207b1bce (diff) | |
| parent | 72b047c6c37ddf860be15b159b9a143be36d7425 (diff) | |
am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev
* commit '72b047c6c37ddf860be15b159b9a143be36d7425':
Don't apply animations to windows that are showing
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowAnimator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index fe2e0a65a209..64713d988777 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -355,7 +355,8 @@ public class WindowAnimator { boolean applyExistingExitAnimation = mPostKeyguardExitAnimation != null && !winAnimator.mKeyguardGoingAwayAnimation && win.hasDrawnLw() - && win.mAttachedWindow == null; + && win.mAttachedWindow == null + && mForceHiding != KEYGUARD_NOT_SHOWN; // If the window is already showing and we don't need to apply an existing // Keyguard exit animation, skip. |