Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f70c5a8b authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "[45/n] Simplify AppCompatAspectRatioOverrides naming" into main

parents 878ba923 4afc1bf5

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

+12 −14
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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();

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ class AppCompatController { 
    }



    @NonNull

    AppCompatAspectRatioOverrides getAppCompatAspectRatioOverrides() {

        return mAppCompatOverrides.getAppCompatAspectRatioOverrides();

    AppCompatAspectRatioOverrides getAspectRatioOverrides() {

        return mAppCompatOverrides.getAspectRatioOverrides();

    }



    @NonNull

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+4 −4
Original line number Diff line number Diff line
@@ -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