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

Merge "Replace containing aspect ratio hard comparison with rounded one" into tm-qpr-dev am: 4677d90f9e

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

Change-Id: Id49c2d7139c3435947791a670e25048b9adc3aa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vali Calinescu
2023-01-30 10:34:04 +00:00
committed by Automerger Merge Worker
parent cb29b6d2a3 4677d90f9e
commit 866b9a9ffd
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,6 +439,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// finished destroying itself.
private static final int DESTROY_TIMEOUT = 10 * 1000;
// Rounding tolerance to be used in aspect ratio computations
private static final float ASPECT_RATIO_ROUNDING_TOLERANCE = 0.005f;
final ActivityTaskManagerService mAtmService;
@NonNull
final ActivityInfo info; // activity info provided by developer in AndroidManifest
@@ -8950,7 +8953,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
int activityWidth = containingAppWidth;
int activityHeight = containingAppHeight;
if (containingRatio > desiredAspectRatio) {
if (containingRatio - desiredAspectRatio > ASPECT_RATIO_ROUNDING_TOLERANCE) {
if (containingAppWidth < containingAppHeight) {
// Width is the shorter side, so we use that to figure-out what the max. height
// should be given the aspect ratio.
@@ -8960,7 +8963,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// should be given the aspect ratio.
activityWidth = (int) ((activityHeight * desiredAspectRatio) + 0.5f);
}
} else if (containingRatio < desiredAspectRatio) {
} else if (desiredAspectRatio - containingRatio > ASPECT_RATIO_ROUNDING_TOLERANCE) {
boolean adjustWidth;
switch (getRequestedConfigurationOrientation()) {
case ORIENTATION_LANDSCAPE:

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

@@ -3054,6 +3054,20 @@ public class SizeCompatTests extends WindowTestsBase {
assertEquals(mActivity.getBounds(), display.getBounds());
}
@Test
public void testApplyAspectRatio_containingRatioAlmostEqualToMaxRatio_boundsUnchanged() {
setUpDisplaySizeWithApp(1981, 2576);
mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);
mWm.mLetterboxConfiguration.setLetterboxVerticalPositionMultiplier(0.5f);
final Rect originalBounds = new Rect(mActivity.getBounds());
prepareUnresizable(mActivity, 1.3f, SCREEN_ORIENTATION_UNSPECIFIED);
// The containing aspect ratio is now 1.3003534, while the desired aspect ratio is 1.3. The
// bounds of the activity should not be changed as the difference is too small
assertEquals(mActivity.getBounds(), originalBounds);
}
@Test
public void testUpdateResolvedBoundsHorizontalPosition_activityFillParentWidth() {
// When activity width equals parent width, multiplier shouldn't have any effect.