am c154abec: Merge "Don\'t apply existing keyguard animation to IME window" into mnc-dev

* commit 'c154abec4375bf46ece9ed114db16faf2481dc30': Don't apply existing keyguard animation to IME window
2015-06-26 23:33:41 +00:00
parent b0001f1bd9 c154abec43
commit c815d700d5
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -343,7 +343,9 @@ public class WindowAnimator {
                        boolean applyExistingExitAnimation = mPostKeyguardExitAnimation != null
                                && !winAnimator.mKeyguardGoingAwayAnimation
                                && win.hasDrawnLw()
-                                && win.mAttachedWindow == null;
+                                && win.mAttachedWindow == null
+                                && !win.mIsImWindow
+                                && displayId == Display.DEFAULT_DISPLAY;

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