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

Commit 3e57b158 authored by Massimo Carli's avatar Massimo Carli
Browse files

[39/n] Simplify methods naming for Resize 

Simplify ResizeOverrides names

Flag: EXEMPT Renaming and small refactoring
Bug: 384473893
Test: atest WmTests:AppCompatResizeOverridesTest

Change-Id: If908ba015247239d081d275ec99b9884e12b3b89
parent c9fc8857

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

+5 −6
Original line number Diff line number Diff line
@@ -3209,7 +3209,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                true /* forActivity */)) {

            return false;

        }

        if (mAppCompatController.getAppCompatResizeOverrides().allowRestrictedResizability()) {

        if (mAppCompatController.getResizeOverrides().allowRestrictedResizability()) {

            return false;

        }

        // If the user preference respects aspect ratio, then it becomes non-resizable.
@@ -8435,8 +8435,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     */

    @ActivityInfo.SizeChangesSupportMode

    private int supportsSizeChanges() {

        if (mAppCompatController.getAppCompatResizeOverrides()

                .shouldOverrideForceNonResizeApp()) {

        final AppCompatResizeOverrides resizeOverrides = mAppCompatController.getResizeOverrides();

        if (resizeOverrides.shouldOverrideForceNonResizeApp()) {

            return SIZE_CHANGES_UNSUPPORTED_OVERRIDE;

        }
@@ -8444,8 +8444,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            return SIZE_CHANGES_SUPPORTED_METADATA;

        }



        if (mAppCompatController.getAppCompatResizeOverrides()

                .shouldOverrideForceResizeApp()) {

        if (resizeOverrides.shouldOverrideForceResizeApp()) {

            return SIZE_CHANGES_SUPPORTED_OVERRIDE;

        }
@@ -10221,7 +10220,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                mAppCompatController.getAppCompatOrientationOverrides()

                        .shouldIgnoreOrientationRequestLoop());

        proto.write(SHOULD_OVERRIDE_FORCE_RESIZE_APP,

                mAppCompatController.getAppCompatResizeOverrides().shouldOverrideForceResizeApp());

                mAppCompatController.getResizeOverrides().shouldOverrideForceResizeApp());

        proto.write(SHOULD_ENABLE_USER_ASPECT_RATIO_SETTINGS,

                mAppCompatController.getAppCompatAspectRatioOverrides()

                        .shouldEnableUserAspectRatioSettings());

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

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



    @NonNull

    AppCompatResizeOverrides getAppCompatResizeOverrides() {

        return mAppCompatOverrides.getAppCompatResizeOverrides();

    AppCompatResizeOverrides getResizeOverrides() {

        return mAppCompatOverrides.getResizeOverrides();

    }



    @NonNull

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

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class AppCompatOverrides { 
    @NonNull

    private final AppCompatFocusOverrides mAppCompatFocusOverrides;

    @NonNull

    private final AppCompatResizeOverrides mAppCompatResizeOverrides;

    private final AppCompatResizeOverrides mResizeOverrides;

    @NonNull

    private final AppCompatReachabilityOverrides mAppCompatReachabilityOverrides;

    @NonNull
@@ -57,7 +57,7 @@ public class AppCompatOverrides { 
                mAppCompatReachabilityOverrides);

        mAppCompatFocusOverrides = new AppCompatFocusOverrides(activityRecord,

                appCompatConfiguration, optPropBuilder);

        mAppCompatResizeOverrides = new AppCompatResizeOverrides(activityRecord, packageManager,

        mResizeOverrides = new AppCompatResizeOverrides(activityRecord, packageManager,

                optPropBuilder);

        mAppCompatLetterboxOverrides = new AppCompatLetterboxOverrides(activityRecord,

                appCompatConfiguration);
@@ -84,8 +84,8 @@ public class AppCompatOverrides { 
    }



    @NonNull

    AppCompatResizeOverrides getAppCompatResizeOverrides() {

        return mAppCompatResizeOverrides;

    AppCompatResizeOverrides getResizeOverrides() {

        return mResizeOverrides;

    }



    @NonNull

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

+2 −2
Original line number Diff line number Diff line
@@ -184,12 +184,12 @@ public class AppCompatResizeOverridesTest extends WindowTestsBase { 


        void checkShouldOverrideForceResizeApp(boolean expected) {

            Assert.assertEquals(expected, activity().top().mAppCompatController

                    .getAppCompatResizeOverrides().shouldOverrideForceResizeApp());

                    .getResizeOverrides().shouldOverrideForceResizeApp());

        }



        void checkShouldOverrideForceNonResizeApp(boolean expected) {

            Assert.assertEquals(expected, activity().top().mAppCompatController

                    .getAppCompatResizeOverrides().shouldOverrideForceNonResizeApp());

                    .getResizeOverrides().shouldOverrideForceNonResizeApp());

        }

    }