Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c39cb627 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Enabling New Insets API with Multi-Session IME." into rvc-dev am: 09419a81 am: 185a6d15 am: 24391b6b am: f0d91908

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

Change-Id: I1f7adea4eb6897182c3c3714acabe8dc5c5aebf7
parents d4ef8e84 f0d91908

services/core/java/com/android/server/inputmethod/MultiClientInputMethodManagerService.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -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;