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

Commit 71bb98fd authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge "Letterbox resizable fixed orientation activities in multi-window." into... 

Merge "Letterbox resizable fixed orientation activities in multi-window." into tm-dev am: 8d7c5727 am: 07699313 am: e25751a5

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



Change-Id: Id7d5a928a2ed88e7240a2579076d379397414d68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c5fd384 e25751a5

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

+1 −14
Original line number Diff line number Diff line
@@ -7987,20 +7987,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            // orientation with insets applied.

            return;

        }

        // Not using Task#isResizeable() or ActivityRecord#isResizeable() directly because app

        // compatibility testing showed that android:supportsPictureInPicture="true" alone is not

        // sufficient signal for not letterboxing an app.

        // TODO(214602463): Remove multi-window check since orientation and aspect ratio

        // restrictions should always be applied in multi-window.

        final boolean isResizeable = task != null

                // Activity should be resizable if the task is.

                ? task.isResizeable(/* checkPictureInPictureSupport */ false)

                        || isResizeable(/* checkPictureInPictureSupport */ false)

                : isResizeable(/* checkPictureInPictureSupport */ false);

        if (WindowConfiguration.inMultiWindowMode(windowingMode) && isResizeable) {

            // Ignore orientation request for resizable apps in multi window.

            return;

        }



        if (windowingMode == WINDOWING_MODE_PINNED) {

            // PiP bounds have higher priority than the requested orientation. Otherwise the

            // activity may be squeezed into a small piece.

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

+3 −4
Original line number Diff line number Diff line
@@ -611,10 +611,9 @@ public class ActivityRecordTests extends WindowTestsBase { 
        activity.setRequestedOrientation(activityCurOrientation == ORIENTATION_LANDSCAPE

                ? SCREEN_ORIENTATION_PORTRAIT : SCREEN_ORIENTATION_LANDSCAPE);



        // Asserts fixed orientation request is ignored, and the orientation is not changed

        // (fill Task).

        assertEquals(activityCurOrientation, activity.getConfiguration().orientation);

        assertFalse(activity.isLetterboxedForFixedOrientationAndAspectRatio());

        // Asserts fixed orientation request is not ignored, and the orientation is changed.

        assertNotEquals(activityCurOrientation, activity.getConfiguration().orientation);

        assertTrue(activity.isLetterboxedForFixedOrientationAndAspectRatio());

    }



    @Test

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

+22 −0
Original line number Diff line number Diff line
@@ -1875,6 +1875,28 @@ public class SizeCompatTests extends WindowTestsBase { 
        assertLetterboxSurfacesDrawnBetweenActivityAndParentBounds(organizer.mPrimary.getBounds());

    }



    @Test

    public void testResizableFixedOrientationAppInSplitScreen_letterboxForDifferentOrientation() {

        setUpDisplaySizeWithApp(1000, 2800);

        final TestSplitOrganizer organizer =

                new TestSplitOrganizer(mAtm, mActivity.getDisplayContent());



        // Resizable landscape-only activity.

        prepareLimitedBounds(mActivity, SCREEN_ORIENTATION_LANDSCAPE, /* isUnresizable= */ false);



        final Rect originalBounds = new Rect(mActivity.getBounds());



        // Move activity to split screen which takes half of the screen.

        mTask.reparent(organizer.mPrimary, POSITION_TOP, /* moveParents= */ false , "test");

        organizer.mPrimary.setBounds(0, 0, 1000, 1400);

        assertEquals(WINDOWING_MODE_MULTI_WINDOW, mTask.getWindowingMode());

        assertEquals(WINDOWING_MODE_MULTI_WINDOW, mActivity.getWindowingMode());



        // Resizable activity is not in size compat mode but in the letterbox for fixed orientation.

        assertFitted();

        assertTrue(mActivity.isLetterboxedForFixedOrientationAndAspectRatio());

    }



    @Test

    public void testSupportsNonResizableInSplitScreen_fillTaskForSameOrientation() {

        // Support non resizable in multi window