Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mariia Sandrikova
2022-05-11 09:08:51 +00:00
committed by Android (Google) Code Review
parent 8352f5b53e b06b2c52b8
commit 8d7c5727d2
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -7984,20 +7984,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.

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

@@ -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

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

@@ -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