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

Commit 096919c6 authored by Ming-Shin Lu's avatar Ming-Shin Lu
Browse files

Fix IME layering target above IME surface 

CL[1] fixed the IME flickering issue when switching recents tasks with
specifying to set IME relative layer until the layering target is not
animated and be IME control target.

However, it didn't consider the case that the IME layering target could
be the drop down box window that not same as the IME control target,
so that the issue happens when we didn't set IME above this window,

the app drop down box will be above IME and cosumed the input to hide
the keyboard.

Fix this regression by checking the token of the layering target to set
IME relative layer if the target isn't transitioning and same as the
token of the control target.

[1]: Iae65d6047c02dae241f2df21c666a03cca58fd0b

Fix: 209722479
Test: manual as test steps
Test: atest ZOrderingTests#\
        testAssignWindowLayers_ForImeOnPopupImeLayeringTarget

Change-Id: Id2e700c20b964e296576c49391853b680418bf57
parent 7f0df9d8

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

+4 −1
Original line number Diff line number Diff line
@@ -5009,8 +5009,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        // exists so it get's layered above the starting window.

        if (imeTarget != null && !(imeTarget.mActivityRecord != null

                && imeTarget.mActivityRecord.hasStartingWindow())) {

            final WindowToken imeControlTargetToken =

                    mImeControlTarget != null && mImeControlTarget.getWindow() != null

                            ? mImeControlTarget.getWindow().mToken : null;

            final boolean canImeTargetSetRelativeLayer = imeTarget.getSurfaceControl() != null

                    && imeTarget == mImeControlTarget

                    && imeTarget.mToken == imeControlTargetToken

                    && !imeTarget.inMultiWindowMode()

                    && imeTarget.mToken.getActivity(app -> app.isAnimating(TRANSITION | PARENTS,

                            ANIMATION_TYPE_ALL & ~ANIMATION_TYPE_RECENTS)) == null;

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

+19 −0
Original line number Diff line number Diff line
@@ -428,6 +428,25 @@ public class ZOrderingTests extends WindowTestsBase { 
        assertWindowHigher(mImeWindow, imeAppTarget);

    }



    @Test

    public void testAssignWindowLayers_ForImeOnPopupImeLayeringTarget() {

        final WindowState imeAppTarget = createWindow(null, TYPE_APPLICATION,

                mAppWindow.mActivityRecord, "imeAppTarget");

        mDisplayContent.setImeInputTarget(imeAppTarget);

        mDisplayContent.setImeLayeringTarget(imeAppTarget);

        mDisplayContent.setImeControlTarget(imeAppTarget);



        // Set a popup IME layering target and keeps the original IME control target behinds it.

        final WindowState popupImeTargetWin = createWindow(imeAppTarget,

                TYPE_APPLICATION_SUB_PANEL, mAppWindow.mActivityRecord, "popupImeTargetWin");

        mDisplayContent.setImeLayeringTarget(popupImeTargetWin);

        mDisplayContent.updateImeParent();



        // Ime should on top of the popup IME layering target window.

        mDisplayContent.assignChildLayers(mTransaction);

        assertWindowHigher(mImeWindow, popupImeTargetWin);

    }





    @Test

    public void testAssignWindowLayers_ForNegativelyZOrderedSubtype() {