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

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

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

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

Change-Id: I17f7d15ad2077f3322d08165287be68d1e3607fd
parents 289e0a2b b7b75e52

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

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

                        && dcTarget.getParentWindow() == mImeTargetFromIme

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

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

                || mImeTargetFromIme == mDisplayContent.getImeFallback()

                || mImeTargetFromIme == mDisplayContent.getImeFallback()

                || mImeTargetFromIme == mDisplayContent.mInputMethodInputTarget

                || controlTarget == mImeTargetFromIme

                || controlTarget == mImeTargetFromIme

                        && (mImeTargetFromIme.getWindow() == null

                        && (mImeTargetFromIme.getWindow() == null

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

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

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

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

        mImeProvider.scheduleShowImePostLayout(appWin);

        assertTrue(mImeProvider.isImeTargetFromDisplayContentAndImeSame());

        assertTrue(mImeProvider.isImeTargetFromDisplayContentAndImeSame());

    }

    }



    @Test

    public void testInputMethodInputTargetCanShowIme() {

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

        mDisplayContent.mInputMethodTarget = target;

        mImeProvider.scheduleShowImePostLayout(target);

        assertTrue(mImeProvider.isImeTargetFromDisplayContentAndImeSame());

    }

}
 
}