diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-06-26 23:24:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 23:24:03 +0000 |
| commit | c154abec4375bf46ece9ed114db16faf2481dc30 (patch) | |
| tree | 939c35eec646aeff1516d65288bc596423a53ff8 | |
| parent | 37b4546ec052c18f04fe2881e36e3fe38e564780 (diff) | |
| parent | cb26db087839289394897180916b86717ab42813 (diff) | |
| download | frameworks_base-c154abec4375bf46ece9ed114db16faf2481dc30.zip frameworks_base-c154abec4375bf46ece9ed114db16faf2481dc30.tar.gz frameworks_base-c154abec4375bf46ece9ed114db16faf2481dc30.tar.bz2 | |
Merge "Don't apply existing keyguard animation to IME window" into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowAnimator.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index d7b202d..76baaa7 100644 --- 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. |