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

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

Merge "Fix keyboard is attached to wrong task in split" into tm-dev am:... 

Merge "Fix keyboard is attached to wrong task in split" into tm-dev am: 969d1b8e am: 3a5cfdbd am: aeb718a4

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



Change-Id: Ib8a483bdfd303a60051d33c58db46843f2a67ea3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1afac47 aeb718a4

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

+9 −1
Original line number Diff line number Diff line
@@ -4289,7 +4289,15 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
            setImeInputTarget(target);

            mInsetsStateController.updateAboveInsetsState(mInsetsStateController

                    .getRawInsetsState().getSourceOrDefaultVisibility(ITYPE_IME));

            updateImeControlTarget();

            // Force updating the IME parent when the IME control target has been updated to the

            // remote target but updateImeParent not happen because ImeLayeringTarget and

            // ImeInputTarget are different. Then later updateImeParent would be ignored when there

            // is no new IME control target to change the IME parent.

            final boolean forceUpdateImeParent = mImeControlTarget == mRemoteInsetsControlTarget

                    && (mInputMethodSurfaceParent != null

                    && !mInputMethodSurfaceParent.isSameSurface(

                            mImeWindowsContainer.getParent().mSurfaceControl));

            updateImeControlTarget(forceUpdateImeParent);

        }

        // Unfreeze IME insets after the new target updated, in case updateAboveInsetsState may

        // deliver unrelated IME insets change to the non-IME requester.

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+25 −0
Original line number Diff line number Diff line
@@ -1203,6 +1203,31 @@ public class DisplayContentTests extends WindowTestsBase { 
                mDisplayContent.computeImeParent());

    }



    @Test

    public void testComputeImeParent_remoteControlTarget() throws Exception {

        final DisplayContent dc = mDisplayContent;

        WindowState app1 = createWindow(null, TYPE_BASE_APPLICATION, "app1");

        WindowState app2 = createWindow(null, TYPE_BASE_APPLICATION, "app2");



        dc.setImeLayeringTarget(app1);

        dc.setImeInputTarget(app2);

        dc.setRemoteInsetsController(createDisplayWindowInsetsController());

        dc.getImeTarget(IME_TARGET_LAYERING).getWindow().setWindowingMode(

                WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);

        dc.getImeInputTarget().getWindowState().setWindowingMode(

                WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW);



        // Expect ImeParent is null since ImeLayeringTarget and ImeInputTarget are different.

        assertNull(dc.computeImeParent());



        // ImeLayeringTarget and ImeInputTarget are updated to the same.

        dc.setImeInputTarget(app1);

        assertEquals(dc.getImeTarget(IME_TARGET_LAYERING), dc.getImeInputTarget());



        // The ImeParent should be the display.

        assertEquals(dc.getImeContainer().getParent().getSurfaceControl(), dc.computeImeParent());

    }



    @Test

    public void testInputMethodInputTarget_isClearedWhenWindowStateIsRemoved() throws Exception {

        final DisplayContent dc = createNewDisplay();