commit 7cf23ee4782e25af0bfcb68e766aa86f8aba98ef
author Craig Mautner <cmautner@google.com> Thu Jun 14 17:08:57 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 14 17:08:57 2012 -0700
tree 528d393c484e146b28929d89a218a03ac6f2a54c
parent cb4ea2f5f3bc83d3b29d6b5b3c0796304213cea0
parent de90d67b2f3da4d931455df3c58d9c0f8ea3ffb5

am de90d67b: am 8b9c6d51: Merge "Expose apps when keyguard animating." into jb-dev

* commit 'de90d67b2f3da4d931455df3c58d9c0f8ea3ffb5':
  Expose apps when keyguard animating.

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

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;

services/java/com/android/server/wm/WindowAnimator.java

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,