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

Commit 695b51d7 authored by Taran Singh's avatar Taran Singh Committed by Automerger Merge Worker
Browse files

Merge "Fix IME flicker to home screen w/ orientation change" into sc-dev am:... 

Merge "Fix IME flicker to home screen w/ orientation change" into sc-dev am: 76683e1e am: 18b1bb27

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

Change-Id: Ieee8d6812a8a1abac1bef3186ed6cdd2ba27209b
parents 3b03679e 18b1bb27

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

+4 −0
Original line number Diff line number Diff line
@@ -4012,6 +4012,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // screen. If it's not covering the entire screen the IME might extend beyond the apps

        // bounds.

        if (allowAttachToApp && shouldImeAttachedToApp()) {

            if (mImeLayeringTarget.mActivityRecord != mImeInputTarget.mActivityRecord) {

                // Do not change parent if the window hasn't requested IME.

                return null;

            }

            return mImeLayeringTarget.mActivityRecord.getSurfaceControl();

        }

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

+16 −0
Original line number Diff line number Diff line
@@ -358,6 +358,22 @@ public class DisplayContentTests extends WindowTestsBase { 
        verify(imeContainer).assignRelativeLayer(any(), eq(imeSurfaceParent), anyInt(), eq(true));

    }



    @Test

    public void testComputeImeTargetReturnsNull_windowDidntRequestIme() {

        final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION,

                new ActivityBuilder(mAtm).setCreateTask(true).build(), "app");

        final WindowState win2 = createWindow(null, TYPE_BASE_APPLICATION,

                new ActivityBuilder(mAtm).setCreateTask(true).build(), "app2");



        mDisplayContent.setImeInputTarget(win1);

        mDisplayContent.setImeLayeringTarget(win2);



        doReturn(true).when(mDisplayContent).shouldImeAttachedToApp();

        // Compute IME parent returns nothing if current target and window receiving input

        // are different i.e. if current window didn't request IME.

        assertNull("computeImeParent() should be null", mDisplayContent.computeImeParent());

    }



    /**

     * This tests root task movement between displays and proper root task's, task's and app token's

     * display container references updates.