diff options
| author | 2014-12-12 04:24:34 +0000 | |
|---|---|---|
| committer | 2014-12-12 04:24:34 +0000 | |
| commit | 2d6627a9f28c5c31fec5da3dcf48d96ff7a0d893 (patch) | |
| tree | 33119fb00e9d6a64754ede56751ef956352b7aeb | |
| parent | 99385aa9928b1e860b0baefa73374018809c94ad (diff) | |
| parent | 922f8e2c0f58e57d02ab136f24f135553e6d9720 (diff) | |
am 72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev
automerge: 922f8e2
* commit '922f8e2c0f58e57d02ab136f24f135553e6d9720':
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. |