Merge "Enabling New Insets API with Multi-Session IME." into rvc-dev am: 09419a8129

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11802630

Change-Id: Ide07409d81d179554966771add678b554ef1cd31
This commit is contained in:
TreeHugger Robot
2020-06-13 02:44:06 +00:00
committed by Automerger Merge Worker

View File

@@ -1347,13 +1347,14 @@ public final class MultiClientInputMethodManagerService {
for (WindowInfo windowInfo : clientInfo.mWindowMap.values()) { for (WindowInfo windowInfo : clientInfo.mWindowMap.values()) {
if (windowInfo.mWindowHandle == targetWindowHandle) { if (windowInfo.mWindowHandle == targetWindowHandle) {
final IBinder targetWindowToken = windowInfo.mWindowToken; final IBinder targetWindowToken = windowInfo.mWindowToken;
// TODO(yukawa): Report targetWindowToken and targetWindowToken to WMS.
if (DEBUG) { if (DEBUG) {
Slog.v(TAG, "reportImeWindowTarget" Slog.v(TAG, "reportImeWindowTarget"
+ " clientId=" + clientId + " clientId=" + clientId
+ " imeWindowToken=" + imeWindowToken + " imeWindowToken=" + imeWindowToken
+ " targetWindowToken=" + targetWindowToken); + " targetWindowToken=" + targetWindowToken);
} }
mIWindowManagerInternal.updateInputMethodTargetWindow(
imeWindowToken, targetWindowToken);
} }
} }
// not found. // not found.
@@ -1490,6 +1491,9 @@ public final class MultiClientInputMethodManagerService {
case InputMethodClientState.ALREADY_SENT_BIND_RESULT: case InputMethodClientState.ALREADY_SENT_BIND_RESULT:
try { try {
clientInfo.mMSInputMethodSession.showSoftInput(flags, resultReceiver); clientInfo.mMSInputMethodSession.showSoftInput(flags, resultReceiver);
// Forcing WM to show IME on imeTargetWindow
mWindowManagerInternal.showImePostLayout(token);
} catch (RemoteException e) { } catch (RemoteException e) {
} }
break; break;