commit | 8b9c6d51d59898375089e9708325604c227812e0 | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Thu Jun 14 14:55:19 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 14 14:55:19 2012 -0700 |
tree | fc8b17e9c41a930ea51615c1d6220230c3735956 | |
parent | a676cdab11ace948a054b5ca342727a3d0eb29b2 [diff] | |
parent | f03e4c55fc5f8c50c58da03b7e8cfe29b4b0c644 [diff] |
Merge "Expose apps when keyguard animating." into jb-dev
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index a5190f1..0911f1f 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2968,7 +2968,7 @@ } public boolean allowAppAnimationsLw() { - if (mKeyguard != null && mKeyguard.isVisibleLw()) { + if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw()) { // If keyguard is currently visible, no reason to animate // behind it. return false;
diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 267bf82..758b6e7 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java
@@ -279,7 +279,7 @@ } mService.mFocusMayChange = true; } - if (win.isReadyForDisplay()) { + if (win.isReadyForDisplay() && !winAnimator.isAnimating()) { mForceHiding = true; } if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,