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
This commit is contained in:
Jorim Jaggi
2015-06-25 15:29:54 -07:00
parent 1fa8290dbe
commit cb26db0878

View File

@@ -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.