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

Commit fe16a37d authored by Garfield Tan's avatar Garfield Tan
Browse files

Return bounds when it's in fullscreen display. 

These bounds won't be applied to the task when the windowing mode isn't
freeform. Rather, they will be applied to the last non-fullscreen bounds
which would be used to restore it back to the old bounds when display
changes to freeform.

Also fixed the unit test for this particular case.

Bug: 135941344
Bug: 135780225
Test: Manual tests on devices where display windowing mode may change at
runtime.
Test: atest WmTests:TaskLaunchParamsModifierTests

Change-Id: I137c9ab754fae6d50f61e55a19f931d03477d9b2
parent e1c38e1a

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