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

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

Merge changes Iae65d604,I3024443c into sc-v2-dev am: 881f90de 

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

Change-Id: I773e3771773c4154320cbfc2ec7c57c5f0f58710
parents a6995058 881f90de

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -5028,6 +5028,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        if (imeTarget != null && !(imeTarget.mActivityRecord != null

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

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

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

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

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

                    && imeTarget == mImeControlTarget

                    && !imeTarget.inMultiWindowMode()

                    && !imeTarget.inMultiWindowMode()

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

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

                            ANIMATION_TYPE_ALL & ~ANIMATION_TYPE_RECENTS)) == null;

                            ANIMATION_TYPE_ALL & ~ANIMATION_TYPE_RECENTS)) == null;

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -298,6 +298,7 @@ public class ZOrderingTests extends WindowTestsBase { 
        final WindowState appAboveImeTarget = createWindow("appAboveImeTarget");

        final WindowState appAboveImeTarget = createWindow("appAboveImeTarget");





        mDisplayContent.setImeLayeringTarget(imeAppTarget);

        mDisplayContent.setImeLayeringTarget(imeAppTarget);

        mDisplayContent.setImeControlTarget(imeAppTarget);

        mDisplayContent.assignChildLayers(mTransaction);

        mDisplayContent.assignChildLayers(mTransaction);





        // Ime should be above all app windows except for non-fullscreen app window above it and

        // Ime should be above all app windows except for non-fullscreen app window above it and
@@ -344,6 +345,7 @@ public class ZOrderingTests extends WindowTestsBase { 
    @Test

    @Test

    public void testAssignWindowLayers_ForStatusBarImeTarget() {

    public void testAssignWindowLayers_ForStatusBarImeTarget() {

        mDisplayContent.setImeLayeringTarget(mStatusBarWindow);

        mDisplayContent.setImeLayeringTarget(mStatusBarWindow);

        mDisplayContent.setImeControlTarget(mStatusBarWindow);

        mDisplayContent.assignChildLayers(mTransaction);

        mDisplayContent.assignChildLayers(mTransaction);





        assertWindowHigher(mImeWindow, mChildAppWindowAbove);

        assertWindowHigher(mImeWindow, mChildAppWindowAbove);
@@ -409,6 +411,7 @@ public class ZOrderingTests extends WindowTestsBase { 
                mAppWindow.mActivityRecord, "imeAppTarget");

                mAppWindow.mActivityRecord, "imeAppTarget");

        mDisplayContent.setImeInputTarget(imeAppTarget);

        mDisplayContent.setImeInputTarget(imeAppTarget);

        mDisplayContent.setImeLayeringTarget(imeAppTarget);

        mDisplayContent.setImeLayeringTarget(imeAppTarget);

        mDisplayContent.setImeControlTarget(imeAppTarget);

        mDisplayContent.updateImeParent();

        mDisplayContent.updateImeParent();





        // Simulate the ime layering target task is animating with recents animation.

        // Simulate the ime layering target task is animating with recents animation.