Merge "Expose apps when keyguard animating." into jb-dev

Author: Craig Mautner

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

@@ -2968,7 +2968,7 @@ public void run() {
     }
 
     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

@@ -279,7 +279,7 @@ private void updateWindowsAndWallpaperLocked() {
                         }
                         mService.mFocusMayChange = true;
                     }
-                    if (win.isReadyForDisplay()) {
+                    if (win.isReadyForDisplay() && !winAnimator.isAnimating()) {
                         mForceHiding = true;
                     }
                     if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,