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

am 63c375d3: am 27b82632: Merge "Retain IME assignment if no windows accept input." into klp-dev

Browse Source 
* commit '63c375d325c8b89111551c8d236fc46ff1304ff2':
  Retain IME assignment if no windows accept input.
This commit is contained in:
Craig Mautner
2013-10-03 15:42:01 -07:00
committed by Android Git Automerger
parent 90a5192cd4 63c375d325
commit 3ab914cfa5
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;
}