diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-03 21:28:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-03 21:28:38 +0000 |
| commit | 27b826325c6201a0bb96efb1011c752408ece18a (patch) | |
| tree | 47276a3d5b02bcdf99edfd83a580679c600a4e75 /services | |
| parent | 3eb6e4b4e46d64f96cba2d92265f7d3da0b8106a (diff) | |
| parent | ae87962e3ed41a8f502640a388f40ff33d7c3616 (diff) | |
| download | frameworks_base-27b826325c6201a0bb96efb1011c752408ece18a.zip frameworks_base-27b826325c6201a0bb96efb1011c752408ece18a.tar.gz frameworks_base-27b826325c6201a0bb96efb1011c752408ece18a.tar.bz2 | |
Merge "Retain IME assignment if no windows accept input." into klp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 2e91e03..9bbaf60 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -1232,10 +1232,10 @@ public class WindowManagerService extends IWindowManager.Stub // the IME above it until it is completely gone so it doesn't drop // behind the dialog or its full-screen scrim. final WindowState curTarget = mInputMethodTarget; - if (curTarget != null && w != null + if (curTarget != null && curTarget.isDisplayedLw() && curTarget.isClosing() - && (curTarget.mWinAnimator.mAnimLayer > w.mWinAnimator.mAnimLayer)) { + && (w == null || curTarget.mWinAnimator.mAnimLayer > w.mWinAnimator.mAnimLayer)) { if (DEBUG_INPUT_METHOD) Slog.v(TAG, "Current target higher, not changing"); return windows.indexOf(curTarget) + 1; } |