diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-14 19:00:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-14 19:00:35 -0700 |
| commit | 0e10dfebf19efd3ebe6f70800c5a09243f7da2ac (patch) | |
| tree | 2da0d0b27232accdf83253522811ccabcb48838b /policy | |
| parent | 6becff179da67fec35a26663d48f6e2e3fcaaab8 (diff) | |
| parent | 2c345435458b8b6ad105bf14d3655e0f6836278b (diff) | |
| download | frameworks_base-0e10dfebf19efd3ebe6f70800c5a09243f7da2ac.zip frameworks_base-0e10dfebf19efd3ebe6f70800c5a09243f7da2ac.tar.gz frameworks_base-0e10dfebf19efd3ebe6f70800c5a09243f7da2ac.tar.bz2 | |
am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev
* commit '2c345435458b8b6ad105bf14d3655e0f6836278b':
Move the wallpaper beneath the keyguard.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 539d0a0..1c43014 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3569,7 +3569,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { } public boolean allowAppAnimationsLw() { - if (mKeyguard != null && mKeyguard.isVisibleLw() || mShowingDream) { + if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw() + || mShowingDream) { // If keyguard or dreams is currently visible, no reason to animate behind it. return false; } |