diff options
15 files changed, 68 insertions, 70 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index e52fbbfde49f..dca65a183f18 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -3229,7 +3229,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A return false; } // If the user preference respects aspect ratio, then it becomes non-resizable. - return mAppCompatController.getAppCompatAspectRatioOverrides() + return mAppCompatController.getAspectRatioOverrides() .userPreferenceCompatibleWithNonResizability(); } @@ -8469,7 +8469,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // Don't apply aspect ratio if app is overridden to fullscreen by device user/manufacturer. if (!mAppCompatController.getAspectRatioPolicy() .isLetterboxedForFixedOrientationAndAspectRatio() - && !mAppCompatController.getAppCompatAspectRatioOverrides() + && !mAppCompatController.getAspectRatioOverrides() .hasFullscreenOverride()) { resolveAspectRatioRestriction(newParentConfiguration); } @@ -10135,29 +10135,27 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A proto.write(LAST_DROP_INPUT_MODE, mLastDropInputMode); proto.write(OVERRIDE_ORIENTATION, getOverrideOrientation()); proto.write(SHOULD_SEND_COMPAT_FAKE_FOCUS, shouldSendCompatFakeFocus()); + final AppCompatCameraOverrides cameraOverrides = + mAppCompatController.getAppCompatCameraOverrides(); proto.write(SHOULD_FORCE_ROTATE_FOR_CAMERA_COMPAT, - mAppCompatController.getAppCompatCameraOverrides() - .shouldForceRotateForCameraCompat()); + cameraOverrides.shouldForceRotateForCameraCompat()); proto.write(SHOULD_REFRESH_ACTIVITY_FOR_CAMERA_COMPAT, - mAppCompatController.getAppCompatCameraOverrides() - .shouldRefreshActivityForCameraCompat()); + cameraOverrides.shouldRefreshActivityForCameraCompat()); proto.write(SHOULD_REFRESH_ACTIVITY_VIA_PAUSE_FOR_CAMERA_COMPAT, - mAppCompatController.getAppCompatCameraOverrides() - .shouldRefreshActivityViaPauseForCameraCompat()); + cameraOverrides.shouldRefreshActivityViaPauseForCameraCompat()); + final AppCompatAspectRatioOverrides aspectRatioOverrides = + mAppCompatController.getAspectRatioOverrides(); proto.write(SHOULD_OVERRIDE_MIN_ASPECT_RATIO, - mAppCompatController.getAppCompatAspectRatioOverrides() - .shouldOverrideMinAspectRatio()); + aspectRatioOverrides.shouldOverrideMinAspectRatio()); proto.write(SHOULD_IGNORE_ORIENTATION_REQUEST_LOOP, mAppCompatController.getOrientationOverrides() .shouldIgnoreOrientationRequestLoop()); proto.write(SHOULD_OVERRIDE_FORCE_RESIZE_APP, mAppCompatController.getResizeOverrides().shouldOverrideForceResizeApp()); proto.write(SHOULD_ENABLE_USER_ASPECT_RATIO_SETTINGS, - mAppCompatController.getAppCompatAspectRatioOverrides() - .shouldEnableUserAspectRatioSettings()); + aspectRatioOverrides.shouldEnableUserAspectRatioSettings()); proto.write(IS_USER_FULLSCREEN_OVERRIDE_ENABLED, - mAppCompatController.getAppCompatAspectRatioOverrides() - .isUserFullscreenOverrideEnabled()); + aspectRatioOverrides.isUserFullscreenOverrideEnabled()); } @Override diff --git a/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java b/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java index 3e232ea6b612..4ecd0bec9880 100644 --- a/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java +++ b/services/core/java/com/android/server/wm/AppCompatAspectRatioPolicy.java @@ -76,7 +76,7 @@ class AppCompatAspectRatioPolicy { private float getDesiredAspectRatio(@NonNull Configuration newParentConfig, @NonNull Rect parentBounds) { final float letterboxAspectRatioOverride = - mAppCompatOverrides.getAppCompatAspectRatioOverrides() + mAppCompatOverrides.getAspectRatioOverrides() .getFixedOrientationLetterboxAspectRatio(newParentConfig); // Aspect ratio as suggested by the system. Apps requested mix/max aspect ratio will // be respected in #applyAspectRatio. @@ -127,7 +127,7 @@ class AppCompatAspectRatioPolicy { } final AppCompatAspectRatioOverrides aspectRatioOverrides = - mAppCompatOverrides.getAppCompatAspectRatioOverrides(); + mAppCompatOverrides.getAspectRatioOverrides(); if (aspectRatioOverrides.shouldApplyUserMinAspectRatioOverride()) { return aspectRatioOverrides.getUserMinAspectRatio(); } diff --git a/services/core/java/com/android/server/wm/AppCompatController.java b/services/core/java/com/android/server/wm/AppCompatController.java index fa510dbcafae..622ec2237dc7 100644 --- a/services/core/java/com/android/server/wm/AppCompatController.java +++ b/services/core/java/com/android/server/wm/AppCompatController.java @@ -99,8 +99,8 @@ class AppCompatController { } @NonNull - AppCompatAspectRatioOverrides getAppCompatAspectRatioOverrides() { - return mAppCompatOverrides.getAppCompatAspectRatioOverrides(); + AppCompatAspectRatioOverrides getAspectRatioOverrides() { + return mAppCompatOverrides.getAspectRatioOverrides(); } @NonNull diff --git a/services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java b/services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java index fc758ef90995..6202f8070dd4 100644 --- a/services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java +++ b/services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java @@ -55,7 +55,7 @@ class AppCompatOrientationPolicy { @ActivityInfo.ScreenOrientation int overrideOrientationIfNeeded(@ActivityInfo.ScreenOrientation int candidate) { final AppCompatAspectRatioOverrides aspectRatioOverrides = - mAppCompatOverrides.getAppCompatAspectRatioOverrides(); + mAppCompatOverrides.getAspectRatioOverrides(); // Ignore all orientation requests of activities for eligible virtual displays. if (aspectRatioOverrides.shouldIgnoreActivitySizeRestrictionsForDisplay()) { return SCREEN_ORIENTATION_USER; diff --git a/services/core/java/com/android/server/wm/AppCompatOverrides.java b/services/core/java/com/android/server/wm/AppCompatOverrides.java index 9fb54db23d55..f8002a589eef 100644 --- a/services/core/java/com/android/server/wm/AppCompatOverrides.java +++ b/services/core/java/com/android/server/wm/AppCompatOverrides.java @@ -31,7 +31,7 @@ public class AppCompatOverrides { @NonNull private final AppCompatCameraOverrides mAppCompatCameraOverrides; @NonNull - private final AppCompatAspectRatioOverrides mAppCompatAspectRatioOverrides; + private final AppCompatAspectRatioOverrides mAspectRatioOverrides; @NonNull private final AppCompatFocusOverrides mAppCompatFocusOverrides; @NonNull @@ -52,7 +52,7 @@ public class AppCompatOverrides { appCompatConfiguration, optPropBuilder, mAppCompatCameraOverrides); mReachabilityOverrides = new AppCompatReachabilityOverrides(activityRecord, appCompatConfiguration, appCompatDeviceStateQuery); - mAppCompatAspectRatioOverrides = new AppCompatAspectRatioOverrides(activityRecord, + mAspectRatioOverrides = new AppCompatAspectRatioOverrides(activityRecord, appCompatConfiguration, optPropBuilder, appCompatDeviceStateQuery, mReachabilityOverrides); mAppCompatFocusOverrides = new AppCompatFocusOverrides(activityRecord, @@ -74,8 +74,8 @@ public class AppCompatOverrides { } @NonNull - AppCompatAspectRatioOverrides getAppCompatAspectRatioOverrides() { - return mAppCompatAspectRatioOverrides; + AppCompatAspectRatioOverrides getAspectRatioOverrides() { + return mAspectRatioOverrides; } @NonNull diff --git a/services/core/java/com/android/server/wm/AppCompatSizeCompatModePolicy.java b/services/core/java/com/android/server/wm/AppCompatSizeCompatModePolicy.java index 98bb8e79b51f..f48ef4fa8f5f 100644 --- a/services/core/java/com/android/server/wm/AppCompatSizeCompatModePolicy.java +++ b/services/core/java/com/android/server/wm/AppCompatSizeCompatModePolicy.java @@ -414,7 +414,7 @@ class AppCompatSizeCompatModePolicy { * aspect ratio. */ boolean shouldCreateAppCompatDisplayInsets() { - if (mActivityRecord.mAppCompatController.getAppCompatAspectRatioOverrides() + if (mActivityRecord.mAppCompatController.getAspectRatioOverrides() .hasFullscreenOverride()) { // If the user has forced the applications aspect ratio to be fullscreen, don't use size // compatibility mode in any situation. The user has been warned and therefore accepts diff --git a/services/core/java/com/android/server/wm/AppCompatUtils.java b/services/core/java/com/android/server/wm/AppCompatUtils.java index e54e93abfcf4..d09f763e8b02 100644 --- a/services/core/java/com/android/server/wm/AppCompatUtils.java +++ b/services/core/java/com/android/server/wm/AppCompatUtils.java @@ -156,7 +156,7 @@ final class AppCompatUtils { .getAppCompatLetterboxOverrides().isLetterboxEducationEnabled()); final AppCompatAspectRatioOverrides aspectRatioOverrides = - top.mAppCompatController.getAppCompatAspectRatioOverrides(); + top.mAppCompatController.getAspectRatioOverrides(); appCompatTaskInfo.setUserFullscreenOverrideEnabled( aspectRatioOverrides.shouldApplyUserFullscreenOverride()); appCompatTaskInfo.setSystemFullscreenOverrideEnabled( diff --git a/services/core/java/com/android/server/wm/DesktopAppCompatAspectRatioPolicy.java b/services/core/java/com/android/server/wm/DesktopAppCompatAspectRatioPolicy.java index 43855aa3d247..fee5566af484 100644 --- a/services/core/java/com/android/server/wm/DesktopAppCompatAspectRatioPolicy.java +++ b/services/core/java/com/android/server/wm/DesktopAppCompatAspectRatioPolicy.java @@ -189,7 +189,7 @@ public class DesktopAppCompatAspectRatioPolicy { final ActivityInfo info = mActivityRecord.info; final AppCompatAspectRatioOverrides aspectRatioOverrides = - mAppCompatOverrides.getAppCompatAspectRatioOverrides(); + mAppCompatOverrides.getAspectRatioOverrides(); if (shouldApplyUserMinAspectRatioOverride(task)) { return aspectRatioOverrides.getUserMinAspectRatio(); } @@ -266,7 +266,7 @@ public class DesktopAppCompatAspectRatioPolicy { return false; } - final int userAspectRatioCode = mAppCompatOverrides.getAppCompatAspectRatioOverrides() + final int userAspectRatioCode = mAppCompatOverrides.getAspectRatioOverrides() .getUserMinAspectRatioOverrideCode(); return userAspectRatioCode != USER_MIN_ASPECT_RATIO_UNSET @@ -281,7 +281,7 @@ public class DesktopAppCompatAspectRatioPolicy { // We use mBooleanPropertyAllowUserAspectRatioOverride to allow apps to opt-out which has // effect only if explicitly false. If mBooleanPropertyAllowUserAspectRatioOverride is null, // the current app doesn't opt-out so the first part of the predicate is true. - return mAppCompatOverrides.getAppCompatAspectRatioOverrides() + return mAppCompatOverrides.getAspectRatioOverrides() .getAllowUserAspectRatioOverridePropertyValue() && mAppCompatConfiguration.isUserAppAspectRatioSettingsEnabled() && task.mDisplayContent.getIgnoreOrientationRequest(); diff --git a/services/core/java/com/android/server/wm/DesktopModeBoundsCalculator.java b/services/core/java/com/android/server/wm/DesktopModeBoundsCalculator.java index fcf88d395f1c..65736b2c64c3 100644 --- a/services/core/java/com/android/server/wm/DesktopModeBoundsCalculator.java +++ b/services/core/java/com/android/server/wm/DesktopModeBoundsCalculator.java @@ -104,7 +104,7 @@ public final class DesktopModeBoundsCalculator { if (!DesktopModeFlags.ENABLE_WINDOWING_DYNAMIC_INITIAL_BOUNDS.isTrue()) { return centerInScreen(idealSize, screenBounds); } - if (activity.mAppCompatController.getAppCompatAspectRatioOverrides() + if (activity.mAppCompatController.getAspectRatioOverrides() .hasFullscreenOverride()) { // If the activity has a fullscreen override applied, it should be treated as // resizeable and match the device orientation. Thus the ideal size can be diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java index 271364445c6a..018ea58e7120 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatActivityRobot.java @@ -213,7 +213,7 @@ class AppCompatActivityRobot { void setShouldApplyUserMinAspectRatioOverride(boolean enabled) { doReturn(enabled).when(mActivityStack.top().mAppCompatController - .getAppCompatAspectRatioOverrides()).shouldApplyUserMinAspectRatioOverride(); + .getAspectRatioOverrides()).shouldApplyUserMinAspectRatioOverride(); } void setShouldCreateCompatDisplayInsets(boolean enabled) { @@ -226,17 +226,17 @@ class AppCompatActivityRobot { void setShouldApplyUserFullscreenOverride(boolean enabled) { doReturn(enabled).when(mActivityStack.top().mAppCompatController - .getAppCompatAspectRatioOverrides()).shouldApplyUserFullscreenOverride(); + .getAspectRatioOverrides()).shouldApplyUserFullscreenOverride(); } void setGetUserMinAspectRatioOverrideCode(@UserMinAspectRatio int overrideCode) { doReturn(overrideCode).when(mActivityStack.top().mAppCompatController - .getAppCompatAspectRatioOverrides()).getUserMinAspectRatioOverrideCode(); + .getAspectRatioOverrides()).getUserMinAspectRatioOverrideCode(); } void setGetUserMinAspectRatioOverrideValue(float overrideValue) { doReturn(overrideValue).when(mActivityStack.top().mAppCompatController - .getAppCompatAspectRatioOverrides()).getUserMinAspectRatio(); + .getAspectRatioOverrides()).getUserMinAspectRatio(); } void setIgnoreOrientationRequest(boolean enabled) { diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatAspectRatioOverridesTest.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatAspectRatioOverridesTest.java index 14ef913e28db..f29cbc6b3360 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppCompatAspectRatioOverridesTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatAspectRatioOverridesTest.java @@ -413,7 +413,7 @@ public class AppCompatAspectRatioOverridesTest extends WindowTestsBase { @Override void onPostActivityCreation(@NonNull ActivityRecord activity) { super.onPostActivityCreation(activity); - spyOn(activity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(activity.mAppCompatController.getAspectRatioOverrides()); } void checkShouldApplyUserFullscreenOverride(boolean expected) { @@ -465,7 +465,7 @@ public class AppCompatAspectRatioOverridesTest extends WindowTestsBase { } private AppCompatAspectRatioOverrides getTopActivityAppCompatAspectRatioOverrides() { - return activity().top().mAppCompatController.getAppCompatAspectRatioOverrides(); + return activity().top().mAppCompatController.getAspectRatioOverrides(); } } diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java index 93fb73edb644..f577c3a51e75 100644 --- a/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationPolicyTest.java @@ -555,7 +555,7 @@ public class AppCompatOrientationPolicyTest extends WindowTestsBase { @Override void onPostActivityCreation(@NonNull ActivityRecord activity) { super.onPostActivityCreation(activity); - spyOn(activity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(activity.mAppCompatController.getAspectRatioOverrides()); spyOn(activity.mAppCompatController.getAspectRatioPolicy()); } diff --git a/services/tests/wmtests/src/com/android/server/wm/DesktopAppCompatAspectRatioPolicyTests.java b/services/tests/wmtests/src/com/android/server/wm/DesktopAppCompatAspectRatioPolicyTests.java index f4e1d4967ff5..5e3b5affabb7 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DesktopAppCompatAspectRatioPolicyTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DesktopAppCompatAspectRatioPolicyTests.java @@ -407,7 +407,7 @@ public class DesktopAppCompatAspectRatioPolicyTests extends WindowTestsBase { @Override void onPostActivityCreation(@NonNull ActivityRecord activity) { super.onPostActivityCreation(activity); - spyOn(activity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(activity.mAppCompatController.getAspectRatioOverrides()); spyOn(activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy()); } @@ -430,7 +430,7 @@ public class DesktopAppCompatAspectRatioPolicyTests extends WindowTestsBase { } float getSplitScreenAspectRatio() { - return getTopActivity().mAppCompatController.getAppCompatAspectRatioOverrides() + return getTopActivity().mAppCompatController.getAspectRatioOverrides() .getSplitScreenAspectRatio(); } diff --git a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java index 6d508eabcd52..3de5d0c7727c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java @@ -265,9 +265,9 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_LANDSCAPE, task, /* ignoreOrientationRequest */ true); - spyOn(mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(mActivity.mAppCompatController.getAspectRatioOverrides()); doReturn(true).when( - mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()) + mActivity.mAppCompatController.getAspectRatioOverrides()) .isUserFullscreenOverrideEnabled(); final int desiredWidth = @@ -293,9 +293,9 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_LANDSCAPE, task, /* ignoreOrientationRequest */ true); - spyOn(mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(mActivity.mAppCompatController.getAspectRatioOverrides()); doReturn(true).when( - mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()) + mActivity.mAppCompatController.getAspectRatioOverrides()) .isSystemOverrideToFullscreenEnabled(); final int desiredWidth = @@ -424,7 +424,7 @@ public class DesktopModeLaunchParamsModifierTests extends (int) (LANDSCAPE_DISPLAY_BOUNDS.height() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE); final int desiredWidth = (int) (desiredHeight / activity.mAppCompatController - .getAppCompatAspectRatioOverrides().getSplitScreenAspectRatio()); + .getAspectRatioOverrides().getSplitScreenAspectRatio()); assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(task) .setActivity(activity).calculate()); @@ -525,7 +525,7 @@ public class DesktopModeLaunchParamsModifierTests extends final int desiredWidth = (int) (PORTRAIT_DISPLAY_BOUNDS.width() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE); final int desiredHeight = (int) (desiredWidth * activity.mAppCompatController - .getAppCompatAspectRatioOverrides().getSplitScreenAspectRatio()); + .getAspectRatioOverrides().getSplitScreenAspectRatio()); assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(task) .setActivity(activity).calculate()); @@ -616,7 +616,7 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_UNSPECIFIED, task, /* ignoreOrientationRequest */ true); final float userAspectRatioOverrideValueSplitScreen = activity.mAppCompatController - .getAppCompatAspectRatioOverrides().getSplitScreenAspectRatio(); + .getAspectRatioOverrides().getSplitScreenAspectRatio(); applyUserMinAspectRatioOverride(activity, USER_MIN_ASPECT_RATIO_SPLIT_SCREEN, userAspectRatioOverrideValueSplitScreen); @@ -641,7 +641,7 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_UNSPECIFIED, task, /* ignoreOrientationRequest */ true); final float userAspectRatioOverrideValueDisplaySize = activity.mAppCompatController - .getAppCompatAspectRatioOverrides().getDisplaySizeMinAspectRatio(); + .getAspectRatioOverrides().getDisplaySizeMinAspectRatio(); applyUserMinAspectRatioOverride(activity, USER_MIN_ASPECT_RATIO_DISPLAY_SIZE, userAspectRatioOverrideValueDisplaySize); @@ -738,7 +738,7 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_UNSPECIFIED, task, /* ignoreOrientationRequest */ true); final float userAspectRatioOverrideValueSplitScreen = activity.mAppCompatController - .getAppCompatAspectRatioOverrides().getSplitScreenAspectRatio(); + .getAspectRatioOverrides().getSplitScreenAspectRatio(); applyUserMinAspectRatioOverride(activity, USER_MIN_ASPECT_RATIO_SPLIT_SCREEN, userAspectRatioOverrideValueSplitScreen); @@ -763,7 +763,7 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_UNSPECIFIED, task, /* ignoreOrientationRequest */ true); final float userAspectRatioOverrideValueDisplaySize = activity.mAppCompatController - .getAppCompatAspectRatioOverrides().getDisplaySizeMinAspectRatio(); + .getAspectRatioOverrides().getDisplaySizeMinAspectRatio(); applyUserMinAspectRatioOverride(activity, USER_MIN_ASPECT_RATIO_DISPLAY_SIZE, userAspectRatioOverrideValueDisplaySize); @@ -884,9 +884,9 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_PORTRAIT, task, /* ignoreOrientationRequest */ true); - spyOn(activity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(activity.mAppCompatController.getAspectRatioOverrides()); doReturn(true).when( - activity.mAppCompatController.getAppCompatAspectRatioOverrides()) + activity.mAppCompatController.getAspectRatioOverrides()) .isUserFullscreenOverrideEnabled(); final int desiredWidth = @@ -912,9 +912,9 @@ public class DesktopModeLaunchParamsModifierTests extends final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_PORTRAIT, task, /* ignoreOrientationRequest */ true); - spyOn(activity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(activity.mAppCompatController.getAspectRatioOverrides()); doReturn(true).when( - activity.mAppCompatController.getAppCompatAspectRatioOverrides()) + activity.mAppCompatController.getAspectRatioOverrides()) .isSystemOverrideToFullscreenEnabled(); final int desiredWidth = @@ -1318,7 +1318,7 @@ public class DesktopModeLaunchParamsModifierTests extends // Simulate user min aspect ratio override being set. final AppCompatAspectRatioOverrides appCompatAspectRatioOverrides = - activity.mAppCompatController.getAppCompatAspectRatioOverrides(); + activity.mAppCompatController.getAspectRatioOverrides(); spyOn(appCompatAspectRatioOverrides); doReturn(overrideValue).when(appCompatAspectRatioOverrides).getUserMinAspectRatio(); doReturn(overrideCode).when(appCompatAspectRatioOverrides) diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index b19af0d0809e..3320db335d54 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -1143,11 +1143,11 @@ public class SizeCompatTests extends WindowTestsBase { // Simulate the user selecting the fullscreen user aspect ratio override spyOn(activity.mWmService.mAppCompatConfiguration); - spyOn(activity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(activity.mAppCompatController.getAspectRatioOverrides()); doReturn(true).when(activity.mWmService.mAppCompatConfiguration) .isUserAppAspectRatioFullscreenEnabled(); doReturn(USER_MIN_ASPECT_RATIO_FULLSCREEN) - .when(activity.mAppCompatController.getAppCompatAspectRatioOverrides()) + .when(activity.mAppCompatController.getAspectRatioOverrides()) .getUserMinAspectRatioOverrideCode(); assertFalse(activity.shouldCreateAppCompatDisplayInsets()); } @@ -1165,9 +1165,9 @@ public class SizeCompatTests extends WindowTestsBase { RESIZE_MODE_UNRESIZEABLE, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); // Simulate the user selecting the fullscreen user aspect ratio override - spyOn(activity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(activity.mAppCompatController.getAspectRatioOverrides()); doReturn(true).when( - activity.mAppCompatController.getAppCompatAspectRatioOverrides()) + activity.mAppCompatController.getAspectRatioOverrides()) .isSystemOverrideToFullscreenEnabled(); assertFalse(activity.shouldCreateAppCompatDisplayInsets()); } @@ -2199,9 +2199,9 @@ public class SizeCompatTests extends WindowTestsBase { .isUserAppAspectRatioFullscreenEnabled(); // Set user aspect ratio override - spyOn(mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(mActivity.mAppCompatController.getAspectRatioOverrides()); doReturn(USER_MIN_ASPECT_RATIO_FULLSCREEN) - .when(mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()) + .when(mActivity.mAppCompatController.getAspectRatioOverrides()) .getUserMinAspectRatioOverrideCode(); prepareMinAspectRatio(mActivity, 16 / 9f, SCREEN_ORIENTATION_PORTRAIT); @@ -2224,9 +2224,9 @@ public class SizeCompatTests extends WindowTestsBase { .isUserAppAspectRatioFullscreenEnabled(); // Set user aspect ratio override - spyOn(mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(mActivity.mAppCompatController.getAspectRatioOverrides()); doReturn(USER_MIN_ASPECT_RATIO_FULLSCREEN) - .when(mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()) + .when(mActivity.mAppCompatController.getAspectRatioOverrides()) .getUserMinAspectRatioOverrideCode(); prepareMinAspectRatio(mActivity, 16 / 9f, SCREEN_ORIENTATION_LANDSCAPE); @@ -2244,9 +2244,9 @@ public class SizeCompatTests extends WindowTestsBase { final int displayWidth = mDisplayContent.mBaseDisplayWidth; final int displayHeight = mDisplayContent.mBaseDisplayHeight; - spyOn(mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(mActivity.mAppCompatController.getAspectRatioOverrides()); doReturn(true).when( - mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()) + mActivity.mAppCompatController.getAspectRatioOverrides()) .isSystemOverrideToFullscreenEnabled(); prepareMinAspectRatio(mActivity, 16 / 9f, SCREEN_ORIENTATION_PORTRAIT); @@ -2264,9 +2264,9 @@ public class SizeCompatTests extends WindowTestsBase { final int displayWidth = mDisplayContent.mBaseDisplayWidth; final int displayHeight = mDisplayContent.mBaseDisplayHeight; - spyOn(mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()); + spyOn(mActivity.mAppCompatController.getAspectRatioOverrides()); doReturn(true).when( - mActivity.mAppCompatController.getAppCompatAspectRatioOverrides()) + mActivity.mAppCompatController.getAspectRatioOverrides()) .isSystemOverrideToFullscreenEnabled(); prepareMinAspectRatio(mActivity, 16 / 9f, SCREEN_ORIENTATION_LANDSCAPE); @@ -2426,7 +2426,7 @@ public class SizeCompatTests extends WindowTestsBase { doReturn(enabled).when(activity.mWmService.mAppCompatConfiguration) .isUserAppAspectRatioSettingsEnabled(); final AppCompatAspectRatioOverrides aspectRatioOverrides = - activity.mAppCompatController.getAppCompatAspectRatioOverrides(); + activity.mAppCompatController.getAspectRatioOverrides(); spyOn(aspectRatioOverrides); // Set user aspect ratio override. doReturn(aspectRatio).when(aspectRatioOverrides).getUserMinAspectRatioOverrideCode(); @@ -4357,7 +4357,7 @@ public class SizeCompatTests extends WindowTestsBase { Configuration parentConfig = mActivity.getParent().getConfiguration(); final AppCompatAspectRatioOverrides aspectRatioOverrides = - mActivity.mAppCompatController.getAppCompatAspectRatioOverrides(); + mActivity.mAppCompatController.getAspectRatioOverrides(); float actual = aspectRatioOverrides.getFixedOrientationLetterboxAspectRatio(parentConfig); float expected = aspectRatioOverrides.getSplitScreenAspectRatio(); @@ -4497,7 +4497,7 @@ public class SizeCompatTests extends WindowTestsBase { .isUserAppAspectRatioSettingsEnabled(); final AppCompatController appCompatController = mActivity.mAppCompatController; final AppCompatAspectRatioOverrides aspectRatioOverrides = - appCompatController.getAppCompatAspectRatioOverrides(); + appCompatController.getAspectRatioOverrides(); spyOn(aspectRatioOverrides); // Set user aspect ratio override. doReturn(USER_MIN_ASPECT_RATIO_16_9).when(aspectRatioOverrides) @@ -4520,7 +4520,7 @@ public class SizeCompatTests extends WindowTestsBase { .isUserAppAspectRatioSettingsEnabled(); final AppCompatController appCompatController = mActivity.mAppCompatController; final AppCompatAspectRatioOverrides aspectRatioOverrides = - appCompatController.getAppCompatAspectRatioOverrides(); + appCompatController.getAspectRatioOverrides(); spyOn(aspectRatioOverrides); // Set user aspect ratio override. doReturn(USER_MIN_ASPECT_RATIO_16_9).when(aspectRatioOverrides) @@ -5011,7 +5011,7 @@ public class SizeCompatTests extends WindowTestsBase { // Compat override can still take effect. final AppCompatAspectRatioOverrides aspectRatioOverrides = - mActivity.mAppCompatController.getAppCompatAspectRatioOverrides(); + mActivity.mAppCompatController.getAspectRatioOverrides(); spyOn(aspectRatioOverrides); doReturn(true).when(aspectRatioOverrides).shouldOverrideMinAspectRatio(); assertEquals(minAspect, aspectRatioPolicy.getMinAspectRatio(), 0 /* delta */); |