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

Commit b7b75e52 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Handle IME when target moves between splits" into rvc-qpr-dev

parents f54a2f3e c16e6dfd

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

+2 −1
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider { 
                        && dcTarget.getParentWindow() == mImeTargetFromIme

                        && dcTarget.mSubLayer > mImeTargetFromIme.getWindow().mSubLayer)

                || mImeTargetFromIme == mDisplayContent.getImeFallback()

                || mImeTargetFromIme == mDisplayContent.mInputMethodInputTarget

                || controlTarget == mImeTargetFromIme

                        && (mImeTargetFromIme.getWindow() == null

                                || !mImeTargetFromIme.getWindow().isClosing());

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

+8 −0
Original line number Diff line number Diff line
@@ -56,4 +56,12 @@ public class ImeInsetsSourceProviderTest extends WindowTestsBase { 
        mImeProvider.scheduleShowImePostLayout(appWin);

        assertTrue(mImeProvider.isImeTargetFromDisplayContentAndImeSame());

    }



    @Test

    public void testInputMethodInputTargetCanShowIme() {

        WindowState target = createWindow(null, TYPE_APPLICATION, "app");

        mDisplayContent.mInputMethodTarget = target;

        mImeProvider.scheduleShowImePostLayout(target);

        assertTrue(mImeProvider.isImeTargetFromDisplayContentAndImeSame());

    }

}