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

Merge "Fix updateResolvedBoundsPosition offset computation" into tm-qpr-dev

Browse Source
This commit is contained in:
Vali Calinescu
2023-01-30 17:26:19 +00:00
committed by Android (Google) Code Review
parent b9446e1ece e319826527
commit 43608217f8
2 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8242,8 +8242,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
if (screenResolvedBounds.width() <= parentAppBounds.width()) {
float positionMultiplier = mLetterboxUiController.getHorizontalPositionMultiplier(
newParentConfiguration);
offsetX = (int) Math.ceil((parentAppBounds.width() - screenResolvedBounds.width())
* positionMultiplier);
offsetX = Math.max(0, (int) Math.ceil((parentAppBounds.width()
- screenResolvedBounds.width()) * positionMultiplier)
// This is added to make sure that insets added inside
// CompatDisplayInsets#getContainerBounds() do not break the alignment
// provided by the positionMultiplier
- screenResolvedBounds.left + parentAppBounds.left);
}
}
@@ -8253,8 +8257,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
if (screenResolvedBounds.height() <= parentAppBounds.height()) {
float positionMultiplier = mLetterboxUiController.getVerticalPositionMultiplier(
newParentConfiguration);
offsetY = (int) Math.ceil((parentAppBounds.height() - screenResolvedBounds.height())
* positionMultiplier);
offsetY = Math.max(0, (int) Math.ceil((parentAppBounds.height()
- screenResolvedBounds.height()) * positionMultiplier)
// This is added to make sure that insets added inside
// CompatDisplayInsets#getContainerBounds() do not break the alignment
// provided by the positionMultiplier
- screenResolvedBounds.top + parentAppBounds.top);
}
}
@@ -10037,6 +10045,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
isLandscape ? shortSide : longSide);
}
// TODO(b/267151420): Explore removing getContainerBounds() from CompatDisplayInsets.
/** Gets the horizontal centered container bounds for size compatibility mode. */
void getContainerBounds(Rect outAppBounds, Rect outBounds, int rotation, int orientation,
boolean orientationRequested, boolean isFixedToUserRotation) {

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

@@ -2909,6 +2909,39 @@ public class SizeCompatTests extends WindowTestsBase {
mActivity.getLetterboxInsets());
}
@Test
public void testUpdateResolvedBoundsHorizontalPosition_leftInsets_appCentered() {
// Set up folded display
final DisplayContent display = new TestDisplayContent.Builder(mAtm, 1100, 2100)
.setCanRotate(true)
.build();
display.setIgnoreOrientationRequest(true);
final DisplayPolicy policy = display.getDisplayPolicy();
DisplayPolicy.DecorInsets.Info decorInfo = policy.getDecorInsetsInfo(ROTATION_90,
display.mBaseDisplayHeight, display.mBaseDisplayWidth);
decorInfo.mNonDecorInsets.set(130, 0, 60, 0);
spyOn(policy);
doReturn(decorInfo).when(policy).getDecorInsetsInfo(ROTATION_90,
display.mBaseDisplayHeight, display.mBaseDisplayWidth);
mWm.mLetterboxConfiguration.setLetterboxVerticalPositionMultiplier(0.5f);
setUpApp(display);
prepareUnresizable(mActivity, SCREEN_ORIENTATION_PORTRAIT);
// Resize the display to simulate unfolding in portrait
resizeDisplay(mTask.mDisplayContent, 2200, 1800);
assertTrue(mActivity.inSizeCompatMode());
// Simulate real display not taking non-decor insets into consideration
display.getWindowConfiguration().setAppBounds(0, 0, 2200, 1800);
// Rotate display to landscape
rotateDisplay(mActivity.mDisplayContent, ROTATION_90);
// App is centered
assertEquals(mActivity.getBounds(), new Rect(350, 50, 1450, 2150));
}
@Test
public void testUpdateResolvedBoundsHorizontalPosition_left() {
// Display configured as (2800, 1400).
@@ -3079,6 +3112,39 @@ public class SizeCompatTests extends WindowTestsBase {
/* letterboxHorizontalPositionMultiplier */ 1.0f);
}
@Test
public void testUpdateResolvedBoundsVerticalPosition_topInsets_appCentered() {
// Set up folded display
final DisplayContent display = new TestDisplayContent.Builder(mAtm, 2100, 1100)
.setCanRotate(true)
.build();
display.setIgnoreOrientationRequest(true);
final DisplayPolicy policy = display.getDisplayPolicy();
DisplayPolicy.DecorInsets.Info decorInfo = policy.getDecorInsetsInfo(ROTATION_90,
display.mBaseDisplayHeight, display.mBaseDisplayWidth);
decorInfo.mNonDecorInsets.set(0, 130, 0, 60);
spyOn(policy);
doReturn(decorInfo).when(policy).getDecorInsetsInfo(ROTATION_90,
display.mBaseDisplayHeight, display.mBaseDisplayWidth);
mWm.mLetterboxConfiguration.setLetterboxVerticalPositionMultiplier(0.5f);
setUpApp(display);
prepareUnresizable(mActivity, SCREEN_ORIENTATION_LANDSCAPE);
// Resize the display to simulate unfolding in portrait
resizeDisplay(mTask.mDisplayContent, 1800, 2200);
assertTrue(mActivity.inSizeCompatMode());
// Simulate real display not taking non-decor insets into consideration
display.getWindowConfiguration().setAppBounds(0, 0, 1800, 2200);
// Rotate display to landscape
rotateDisplay(mActivity.mDisplayContent, ROTATION_90);
// App is centered
assertEquals(mActivity.getBounds(), new Rect(50, 350, 2150, 1450));
}
@Test
public void testUpdateResolvedBoundsVerticalPosition_top() {
// Display configured as (1400, 2800).