Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Retain IME assignment if no windows accept input." into klp-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-10-03 21:28:38 +00:00
committed by Android (Google) Code Review
parent 3eb6e4b4e4 ae87962e3e
commit 27b826325c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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;
}