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

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

Merge "Don't set relative z of window to IME if starting window" into rvc-dev... 

Merge "Don't set relative z of window to IME if starting window" into rvc-dev am: e1da24b5 am: ed02b740 am: 00483682

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

Change-Id: I90998e30746958c6ea55b30555d2384f5bafa6cf
parents 5f5a1b2e 00483682

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -5426,6 +5426,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            final WindowState imeTarget = getDisplayContent().mInputMethodTarget;

            final WindowState imeTarget = getDisplayContent().mInputMethodTarget;

            boolean inTokenWithAndAboveImeTarget = imeTarget != null && imeTarget != this

            boolean inTokenWithAndAboveImeTarget = imeTarget != null && imeTarget != this

                    && imeTarget.mToken == mToken

                    && imeTarget.mToken == mToken

                    && mAttrs.type != TYPE_APPLICATION_STARTING

                    && getParent() != null

                    && getParent() != null

                    && imeTarget.compareTo(this) <= 0;

                    && imeTarget.compareTo(this) <= 0;

            return inTokenWithAndAboveImeTarget;

            return inTokenWithAndAboveImeTarget;

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -692,4 +692,14 @@ public class WindowStateTests extends WindowTestsBase { 
        sameTokenWindow.removeImmediately();

        sameTokenWindow.removeImmediately();

        assertFalse(sameTokenWindow.needsRelativeLayeringToIme());

        assertFalse(sameTokenWindow.needsRelativeLayeringToIme());

    }

    }



    @Test

    public void testNeedsRelativeLayeringToIme_startingWindow() {

        WindowState sameTokenWindow = createWindow(null, TYPE_APPLICATION_STARTING,

                mAppWindow.mToken, "SameTokenWindow");

        mDisplayContent.mInputMethodTarget = mAppWindow;

        sameTokenWindow.mActivityRecord.getStack().setWindowingMode(

                WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        assertFalse(sameTokenWindow.needsRelativeLayeringToIme());

    }

}
 
}