diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-14 22:24:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-14 22:24:44 +0000 |
| commit | 79a0ed5848379b1f587bcc55a8a8b9417df6303b (patch) | |
| tree | a92b3553180bdb00ce6ccda439da1a48ba73f0c0 /policy/src | |
| parent | f64247e417ffcffb76bd47af417f4f3623073f88 (diff) | |
| parent | 5800443e2dbb9b7ea4ba479ae0998ce688d44eb7 (diff) | |
| download | frameworks_base-79a0ed5848379b1f587bcc55a8a8b9417df6303b.zip frameworks_base-79a0ed5848379b1f587bcc55a8a8b9417df6303b.tar.gz frameworks_base-79a0ed5848379b1f587bcc55a8a8b9417df6303b.tar.bz2 | |
Merge "Move the wallpaper beneath the keyguard." into klp-dev
Diffstat (limited to 'policy/src')
| -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; } |