Expose apps when keyguard animating.

Craig Mautner · Craig Mautner · commit f03e4c55fc5f · 2012-06-14T14:11:27.000-07:00
Continuing in the trend of not hiding apps while the keyguard is
animating.

Fixes bug 6653600.

Change-Id: I151315084a13dcec061d2d6edccd31e1133610f4
diff --git 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 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;
diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/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,

Original file line number	Diff line number	Diff line change
`@@ -2968,7 +2968,7 @@ public void run() {`
`2968`	`2968`	`}`
`2969`	`2969`
`2970`	`2970`	`public boolean allowAppAnimationsLw() {`
`2971`		`- if (mKeyguard != null && mKeyguard.isVisibleLw()) {`
	`2971`	`+ if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw()) {`
`2972`	`2972`	`// If keyguard is currently visible, no reason to animate`
`2973`	`2973`	`// behind it.`
`2974`	`2974`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ private void updateWindowsAndWallpaperLocked() {`
`279`	`279`	`}`
`280`	`280`	`mService.mFocusMayChange = true;`
`281`	`281`	`}`
`282`		`- if (win.isReadyForDisplay()) {`
	`282`	`+ if (win.isReadyForDisplay() && !winAnimator.isAnimating()) {`
`283`	`283`	`mForceHiding = true;`
`284`	`284`	`}`
`285`	`285`	`if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,`