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

Commit 4af048b5 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Fix seeing a weird window animation above TaskFragment transition" into... 

Merge "Fix seeing a weird window animation above TaskFragment transition" into tm-dev am: 710a8ae8

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



Change-Id: I47c71c7cd9af3fa00efefc16b670d1f59624d4ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8d2aad8 710a8ae8

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

+7 −0
Original line number Diff line number Diff line
@@ -5635,6 +5635,13 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            return false;

        }



        // We don't need to set the window to be relatively above IME if the IME is not visible.

        // In case seeing the window is animating above the app transition layer because its

        // relative layer is above the IME container on the display area but actually not necessary.

        if (!getDisplayContent().getImeContainer().isVisible()) {

            return false;

        }



        if (isChildWindow()) {

            // If we are a child of the input method target we need this promotion.

            if (getParentWindow().isImeLayeringTarget()) {

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

+3 −1
Original line number Diff line number Diff line
@@ -854,12 +854,13 @@ public class WindowStateTests extends WindowTestsBase { 
        assertTrue(mAtm.mActiveUids.hasNonAppVisibleWindow(uid));

    }



    @UseTestDisplay(addWindows = W_ACTIVITY)

    @UseTestDisplay(addWindows = {W_ACTIVITY, W_INPUT_METHOD})

    @Test

    public void testNeedsRelativeLayeringToIme_notAttached() {

        WindowState sameTokenWindow = createWindow(null, TYPE_BASE_APPLICATION, mAppWindow.mToken,

                "SameTokenWindow");

        mDisplayContent.setImeLayeringTarget(mAppWindow);

        makeWindowVisible(mImeWindow);

        sameTokenWindow.mActivityRecord.getRootTask().setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        assertTrue(sameTokenWindow.needsRelativeLayeringToIme());

        sameTokenWindow.removeImmediately();
@@ -872,6 +873,7 @@ public class WindowStateTests extends WindowTestsBase { 
        WindowState sameTokenWindow = createWindow(null, TYPE_APPLICATION_STARTING,

                mAppWindow.mToken, "SameTokenWindow");

        mDisplayContent.setImeLayeringTarget(mAppWindow);

        makeWindowVisible(mImeWindow);

        sameTokenWindow.mActivityRecord.getRootTask().setWindowingMode(WINDOWING_MODE_MULTI_WINDOW);

        assertFalse(sameTokenWindow.needsRelativeLayeringToIme());

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ public class ZOrderingTests extends WindowTestsBase { 
                "imeAppTargetChildBelowWindow");



        mDisplayContent.setImeLayeringTarget(imeAppTarget);

        makeWindowVisible(mImeWindow);

        mDisplayContent.assignChildLayers(mTransaction);



        // Ime should be above all app windows except for child windows that are z-ordered above it
@@ -599,6 +600,7 @@ public class ZOrderingTests extends WindowTestsBase { 
                WINDOWING_MODE_MULTI_WINDOW);

        mDisplayContent.setImeLayeringTarget(mAppWindow);

        mDisplayContent.setImeInputTarget(mAppWindow);

        makeWindowVisible(mImeWindow);



        // Create a popupWindow

        assertWindowHigher(mImeWindow, mAppWindow);