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

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

Merge "[37/n] Remove direct access to AppCompatOverrides" into main

parents e5e65f28 cfd2eb7c

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

+1 −1
Original line number Diff line number Diff line
@@ -3227,7 +3227,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.getAppCompatOverrides().getAppCompatAspectRatioOverrides()

        return mAppCompatController.getAppCompatAspectRatioOverrides()

                .userPreferenceCompatibleWithNonResizability();

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ class ActivityRefresher { 
    private boolean shouldRefreshActivity(@NonNull ActivityRecord activity,

            @NonNull Configuration newConfig, @NonNull Configuration lastReportedConfig) {

        return mWmService.mAppCompatConfiguration.isCameraCompatRefreshEnabled()

                && activity.mAppCompatController.getAppCompatOverrides()

                    .getAppCompatCameraOverrides().shouldRefreshActivityForCameraCompat()

                && activity.mAppCompatController.getAppCompatCameraOverrides()

                    .shouldRefreshActivityForCameraCompat()

                && ArrayUtils.find(mEvaluators.toArray(), evaluator ->

                ((Evaluator) evaluator)

                        .shouldRefreshActivity(activity, newConfig, lastReportedConfig)) != null;

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

+0 −5
Original line number Diff line number Diff line
@@ -122,11 +122,6 @@ class AppCompatController { 
        return mDesktopAppCompatAspectRatioPolicy;

    }



    @NonNull

    AppCompatOverrides getAppCompatOverrides() {

        return mAppCompatOverrides;

    }



    @NonNull

    AppCompatOrientationOverrides getAppCompatOrientationOverrides() {

        return mAppCompatOverrides.getAppCompatOrientationOverrides();

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

+1 −2
Original line number Diff line number Diff line
@@ -335,8 +335,7 @@ public class AppCompatOrientationOverridesTest extends WindowTestsBase { 
        }



        private AppCompatOrientationOverrides getTopOrientationOverrides() {

            return activity().top().mAppCompatController.getAppCompatOverrides()

                    .getAppCompatOrientationOverrides();

            return activity().top().mAppCompatController.getAppCompatOrientationOverrides();

        }

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -601,8 +601,7 @@ public class AppCompatOrientationPolicyTest extends WindowTestsBase { 
        }



        private AppCompatOrientationOverrides getTopOrientationOverrides() {

            return activity().top().mAppCompatController.getAppCompatOverrides()

                    .getAppCompatOrientationOverrides();

            return activity().top().mAppCompatController.getAppCompatOrientationOverrides();

        }



        private AppCompatOrientationPolicy getTopAppCompatOrientationPolicy() {