Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev

2014-12-11 22:27:52 +00:00
parent e84bf9fddc cb17f18952
commit 72b047c6c3
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -355,7 +355,8 @@ public class WindowAnimator {
                        boolean applyExistingExitAnimation = mPostKeyguardExitAnimation != null
                                && !winAnimator.mKeyguardGoingAwayAnimation
                                && win.hasDrawnLw()
-                                && win.mAttachedWindow == null;
+                                && win.mAttachedWindow == null
+                                && mForceHiding != KEYGUARD_NOT_SHOWN;

                        // If the window is already showing and we don't need to apply an existing
                        // Keyguard exit animation, skip.