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

Commit 3992d7df authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Modify EmbeddedWindow InputTarget to work with IME" into udc-dev am: ea2fee7c 

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



Change-Id: I7c6e125e39c985b3ab55b50abf74f55a8c27ccda
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42e870dd ea2fee7c

services/core/java/com/android/server/wm/EmbeddedWindowController.java

+5 −2
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ class EmbeddedWindowController { 


        @Override

        public boolean shouldControlIme() {

            return false;

            return mHostWindowState != null;

        }



        @Override
@@ -336,6 +336,9 @@ class EmbeddedWindowController { 


        @Override

        public InsetsControlTarget getImeControlTarget() {

            if (mHostWindowState != null) {

                return mHostWindowState.getImeControlTarget();

            }

            return mWmService.getDefaultDisplayContentLocked().mRemoteInsetsControlTarget;

        }
@@ -346,7 +349,7 @@ class EmbeddedWindowController { 


        @Override

        public ActivityRecord getActivityRecord() {

            return null;

            return mHostActivityRecord;

        }



        @Override