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

Merge "Show IME-related system IME dialogs over windows owned by the IME"

Browse Source
This commit is contained in:
Yohei Yukawa
2014-06-11 01:56:12 +00:00
committed by Android (Google) Code Review
parent 65c64c31ab 1ee99c4627
commit 04fcf1cabe
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -1484,10 +1484,15 @@ public class WindowManagerService extends IWindowManager.Stub
if (pos >= 0) {
final AppWindowToken targetAppToken = mInputMethodTarget.mAppToken;
if (pos < windows.size()) {
WindowState wp = windows.get(pos);
if (wp == mInputMethodWindow) {
pos++;
// Skip windows owned by the input method.
if (mInputMethodWindow != null) {
while (pos < windows.size()) {
WindowState wp = windows.get(pos);
if (wp == mInputMethodWindow || wp.mAttachedWindow == mInputMethodWindow) {
pos++;
continue;
}
break;
}
}
if (DEBUG_INPUT_METHOD) Slog.v(TAG, "Adding " + N + " dialogs at pos=" + pos);