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

Commit 7991ae1a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Return bounds when it's in fullscreen display."

parents fab3ee9b fe16a37d

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

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
                // an existing task.

                adjustBoundsToAvoidConflictInDisplay(display, outParams.mBounds);

            }

        } else {

        } else if (display.inFreeformWindowingMode()) {

            if (source != null && source.inFreeformWindowingMode()

                    && resolvedMode == WINDOWING_MODE_FREEFORM

                    && outParams.mBounds.isEmpty()

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

+1 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ public class TaskLaunchParamsModifierTests extends ActivityTestsBase { 
                mActivity, /* source */ null, /* options */ null, mCurrent, mResult));



        // Returned bounds with in fullscreen mode will be set to last non-fullscreen bounds.

        assertEquals(new Rect(0, 0, 200, 100), mCurrent.mBounds);

        assertEquals(new Rect(0, 0, 200, 100), mResult.mBounds);

    }



    @Test