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

Merge "Check embedded windows for IME target" into rvc-dev am: 98df02ebac am: c3bbc9d139

Browse Source 
Change-Id: I775452f60aaffc040bd36a249788724820dc228a
This commit is contained in:
Chavi Weingarten
2020-05-20 22:16:31 +00:00
committed by Automerger Merge Worker
parent 8d0e4a756b c3bbc9d139
commit 29d342840a
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2262,7 +2262,29 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
mHasSurface = hasSurface;
}
/**
* Checks whether one of the Windows in a Display embedded in this Window can be an IME target.
*/
private boolean canWindowInEmbeddedDisplayBeImeTarget() {
final int embeddedDisplayContentsSize = mEmbeddedDisplayContents.size();
for (int i = embeddedDisplayContentsSize - 1; i >= 0; i--) {
final DisplayContent edc = mEmbeddedDisplayContents.valueAt(i);
if (edc.forAllWindows(WindowState::canBeImeTarget, true)) {
return true;
}
}
return false;
}
boolean canBeImeTarget() {
// If any of the embedded windows can be the IME target, this window will be the final IME
// target. This is because embedded windows are on a different display in WM so it would
// cause confusion trying to set the IME to a window on a different display. Instead, just
// make the host window the IME target.
if (canWindowInEmbeddedDisplayBeImeTarget()) {
return true;
}
if (mIsImWindow) {
// IME windows can't be IME targets. IME targets are required to be below the IME
// windows and that wouldn't be possible if the IME window is its own target...silly.

20
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
View File

@@ -269,6 +269,26 @@ public class WindowStateTests extends WindowTestsBase {
assertTrue(stack.shouldIgnoreInput());
}
@Test
public void testCanWindowWithEmbeddedDisplayBeImeTarget() {
final WindowState appWindow = createWindow(null, TYPE_APPLICATION, "appWindow");
final WindowState imeWindow = createWindow(null, TYPE_INPUT_METHOD, "imeWindow");
imeWindow.setHasSurface(true);
appWindow.setHasSurface(true);
appWindow.mAttrs.flags |= FLAG_NOT_FOCUSABLE;
assertFalse(appWindow.canBeImeTarget());
DisplayContent secondDisplay = createNewDisplay();
final WindowState embeddedWindow = createWindow(null, TYPE_APPLICATION, secondDisplay,
"embeddedWindow");
appWindow.addEmbeddedDisplayContent(secondDisplay);
embeddedWindow.setHasSurface(true);
embeddedWindow.mAttrs.flags &= ~FLAG_NOT_FOCUSABLE;
assertTrue(appWindow.canBeImeTarget());
}
@Test
public void testGetWindow() {
final WindowState root = createWindow(null, TYPE_APPLICATION, "root");