diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-04 11:08:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 11:08:10 -0700 |
| commit | ff942d6d83ebddc06d62a6268018885fa353e02d (patch) | |
| tree | 234e99dbc33bd1308b9b445c467180c3b17f2bf7 /services | |
| parent | 1e9863f06ad4d006abb0a76677c246d1420d5352 (diff) | |
| parent | 3ab914cfa504c758ecac4fd8272da36893b8e85c (diff) | |
| download | frameworks_base-ff942d6d83ebddc06d62a6268018885fa353e02d.zip frameworks_base-ff942d6d83ebddc06d62a6268018885fa353e02d.tar.gz frameworks_base-ff942d6d83ebddc06d62a6268018885fa353e02d.tar.bz2 | |
am 3ab914cf: am 63c375d3: am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev
* commit '3ab914cfa504c758ecac4fd8272da36893b8e85c':
Retain IME assignment if no windows accept input.
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; } |