Merge "[46/n] Simplify DesktopAppCompatAspectRatioPolicy naming" into main (28cef9b7) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ class AppCompatController {
		@NonNull
		private final AppCompatReachabilityPolicy mReachabilityPolicy;
		@NonNull
		private final DesktopAppCompatAspectRatioPolicy mDesktopAppCompatAspectRatioPolicy;
		private final DesktopAppCompatAspectRatioPolicy mDesktopAspectRatioPolicy;
		@NonNull
		private final AppCompatOverrides mAppCompatOverrides;
		@NonNull
		@@ -62,7 +62,7 @@ class AppCompatController {
		wmService.mAppCompatConfiguration);
		mAppCompatLetterboxPolicy = new AppCompatLetterboxPolicy(activityRecord,
		wmService.mAppCompatConfiguration);
		mDesktopAppCompatAspectRatioPolicy = new DesktopAppCompatAspectRatioPolicy(activityRecord,
		mDesktopAspectRatioPolicy = new DesktopAppCompatAspectRatioPolicy(activityRecord,
		mAppCompatOverrides, mTransparentPolicy, wmService.mAppCompatConfiguration);
		mSizeCompatModePolicy = new AppCompatSizeCompatModePolicy(activityRecord,
		mAppCompatOverrides);
		@@ -84,8 +84,8 @@ class AppCompatController {
		}

		@NonNull
		DesktopAppCompatAspectRatioPolicy getDesktopAppCompatAspectRatioPolicy() {
		return mDesktopAppCompatAspectRatioPolicy;
		DesktopAppCompatAspectRatioPolicy getDesktopAspectRatioPolicy() {
		return mDesktopAspectRatioPolicy;
		}

		@NonNull

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ final class AppCompatUtils {
		appCompatTaskInfo.cameraCompatTaskInfo.freeformCameraCompatMode =
		AppCompatCameraPolicy.getCameraCompatFreeformMode(top);
		appCompatTaskInfo.setHasMinAspectRatioOverride(top.mAppCompatController
		.getDesktopAppCompatAspectRatioPolicy().hasMinAspectRatioOverride(task));
		.getDesktopAspectRatioPolicy().hasMinAspectRatioOverride(task));
		}

		/**

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ public final class DesktopModeBoundsCalculator {
		return centerInScreen(idealSize, screenBounds);
		}
		final DesktopAppCompatAspectRatioPolicy desktopAppCompatAspectRatioPolicy =
		activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy();
		activity.mAppCompatController.getDesktopAspectRatioPolicy();
		float appAspectRatio = desktopAppCompatAspectRatioPolicy.calculateAspectRatio(task);
		final float tdaWidth = stableBounds.width();
		final float tdaHeight = stableBounds.height();
		@@ -190,7 +190,7 @@ public final class DesktopModeBoundsCalculator {
		@NonNull ActivityRecord activity, @NonNull Task task) {
		final int activityOrientation = activity.getOverrideOrientation();
		final DesktopAppCompatAspectRatioPolicy desktopAppCompatAspectRatioPolicy =
		activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy();
		activity.mAppCompatController.getDesktopAspectRatioPolicy();
		if (desktopAppCompatAspectRatioPolicy.shouldApplyUserMinAspectRatioOverride(task)
		&& (!isFixedOrientation(activityOrientation)
		\|\| activityOrientation == SCREEN_ORIENTATION_LOCKED)) {

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@ public class DesktopAppCompatAspectRatioPolicyTests extends WindowTestsBase {
		void onPostActivityCreation(@NonNull ActivityRecord activity) {
		super.onPostActivityCreation(activity);
		spyOn(activity.mAppCompatController.getAspectRatioOverrides());
		spyOn(activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy());
		spyOn(activity.mAppCompatController.getDesktopAspectRatioPolicy());
		}

		void setDesiredAspectRatio(float aspectRatio) {
		@@ -417,7 +417,7 @@ public class DesktopAppCompatAspectRatioPolicyTests extends WindowTestsBase {
		}

		DesktopAppCompatAspectRatioPolicy getDesktopAppCompatAspectRatioPolicy() {
		return getTopActivity().mAppCompatController.getDesktopAppCompatAspectRatioPolicy();
		return getTopActivity().mAppCompatController.getDesktopAspectRatioPolicy();
		}

		float calculateAspectRatio() {
		@@ -442,7 +442,7 @@ public class DesktopAppCompatAspectRatioPolicyTests extends WindowTestsBase {

		void checkHasMinAspectRatioOverride(boolean expected) {
		assertEquals(expected, this.activity().top().mAppCompatController
		.getDesktopAppCompatAspectRatioPolicy().hasMinAspectRatioOverride(
		.getDesktopAspectRatioPolicy().hasMinAspectRatioOverride(
		this.activity().top().getTask()));
		}

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

+10 −10

Original line number	Diff line number	Diff line
		@@ -320,9 +320,9 @@ public class DesktopModeLaunchParamsModifierTests extends
		final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_PORTRAIT,
		task, /* ignoreOrientationRequest */ true);

		spyOn(activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy());
		spyOn(activity.mAppCompatController.getDesktopAspectRatioPolicy());
		doReturn(LETTERBOX_ASPECT_RATIO).when(activity.mAppCompatController
		.getDesktopAppCompatAspectRatioPolicy()).calculateAspectRatio(any());
		.getDesktopAspectRatioPolicy()).calculateAspectRatio(any());

		final int desiredWidth =
		(int) ((LANDSCAPE_DISPLAY_BOUNDS.height() / LETTERBOX_ASPECT_RATIO) + 0.5f);
		@@ -812,9 +812,9 @@ public class DesktopModeLaunchParamsModifierTests extends
		final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_PORTRAIT,
		task, /* ignoreOrientationRequest */ true);

		spyOn(activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy());
		spyOn(activity.mAppCompatController.getDesktopAspectRatioPolicy());
		doReturn(LETTERBOX_ASPECT_RATIO).when(activity.mAppCompatController
		.getDesktopAppCompatAspectRatioPolicy()).calculateAspectRatio(any());
		.getDesktopAspectRatioPolicy()).calculateAspectRatio(any());

		final int desiredHeight =
		(int) (LANDSCAPE_DISPLAY_BOUNDS.height() * DESKTOP_MODE_INITIAL_BOUNDS_SCALE);
		@@ -939,9 +939,9 @@ public class DesktopModeLaunchParamsModifierTests extends
		final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_LANDSCAPE,
		task, /* ignoreOrientationRequest */ true);

		spyOn(activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy());
		spyOn(activity.mAppCompatController.getDesktopAspectRatioPolicy());
		doReturn(LETTERBOX_ASPECT_RATIO).when(activity.mAppCompatController
		.getDesktopAppCompatAspectRatioPolicy()).calculateAspectRatio(any());
		.getDesktopAspectRatioPolicy()).calculateAspectRatio(any());

		final int desiredWidth = PORTRAIT_DISPLAY_BOUNDS.width()
		- (DESKTOP_MODE_LANDSCAPE_APP_PADDING * 2);
		@@ -989,9 +989,9 @@ public class DesktopModeLaunchParamsModifierTests extends
		final ActivityRecord activity = createActivity(display, SCREEN_ORIENTATION_LANDSCAPE,
		task, /* ignoreOrientationRequest */ true);

		spyOn(activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy());
		spyOn(activity.mAppCompatController.getDesktopAspectRatioPolicy());
		doReturn(LETTERBOX_ASPECT_RATIO).when(activity.mAppCompatController
		.getDesktopAppCompatAspectRatioPolicy()).calculateAspectRatio(any());
		.getDesktopAspectRatioPolicy()).calculateAspectRatio(any());

		final int desiredWidth = PORTRAIT_DISPLAY_BOUNDS.width()
		- (DESKTOP_MODE_LANDSCAPE_APP_PADDING * 2);
		@@ -1294,7 +1294,7 @@ public class DesktopModeLaunchParamsModifierTests extends

		private void setDesiredAspectRatio(ActivityRecord activity, float aspectRatio) {
		final DesktopAppCompatAspectRatioPolicy desktopAppCompatAspectRatioPolicy =
		activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy();
		activity.mAppCompatController.getDesktopAspectRatioPolicy();
		spyOn(desktopAppCompatAspectRatioPolicy);
		doReturn(aspectRatio).when(desktopAppCompatAspectRatioPolicy)
		.getDesiredAspectRatio(any());
		@@ -1304,7 +1304,7 @@ public class DesktopModeLaunchParamsModifierTests extends
		float overrideValue) {
		// Set desired aspect ratio to be below minimum so override can take effect.
		final DesktopAppCompatAspectRatioPolicy desktopAppCompatAspectRatioPolicy =
		activity.mAppCompatController.getDesktopAppCompatAspectRatioPolicy();
		activity.mAppCompatController.getDesktopAspectRatioPolicy();
		spyOn(desktopAppCompatAspectRatioPolicy);
		doReturn(1f).when(desktopAppCompatAspectRatioPolicy)
		.getDesiredAspectRatio(any());