diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-06-25 15:29:54 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-06-26 22:27:57 +0000 |
| commit | cb26db087839289394897180916b86717ab42813 (patch) | |
| tree | 727984404b0fe76e304adee9f7de502370016b5a | |
| parent | 1fa8290dbec37519576d346ba9ae8bbe20b64aa9 (diff) | |
| download | frameworks_base-cb26db087839289394897180916b86717ab42813.zip frameworks_base-cb26db087839289394897180916b86717ab42813.tar.gz frameworks_base-cb26db087839289394897180916b86717ab42813.tar.bz2 | |
Don't apply existing keyguard animation to IME window
Low risk fix, but it remains unclear what the underlying cause is.
This also applies keyguard exit animation to windows on the default
display.
Bug: 21788383
Bug: 22096813
Change-Id: I37dd4b18483c1103f5f2817f4879f080a38bceca
| -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. |