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

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

Merge "[41/n] Simplify naming for Orientation policy" into main

parents 3a63169f 9a0a9c0b

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

+3 −3
Original line number Diff line number Diff line
@@ -4261,7 +4261,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    }



    void finishRelaunching() {

        mAppCompatController.getAppCompatOrientationOverrides()

        mAppCompatController.getOrientationOverrides()

                .setRelaunchingAfterRequestedOrientationChanged(false);

        mTaskSupervisor.getActivityMetricsLogger().notifyActivityRelaunched(this);
@@ -8222,7 +8222,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                mLastReportedConfiguration.getMergedConfiguration())) {

            ensureActivityConfiguration(false /* ignoreVisibility */);

            if (mPendingRelaunchCount > originalRelaunchingCount) {

                mAppCompatController.getAppCompatOrientationOverrides()

                mAppCompatController.getOrientationOverrides()

                        .setRelaunchingAfterRequestedOrientationChanged(true);

            }

            if (mTransitionController.inPlayingTransition(this)) {
@@ -10217,7 +10217,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                mAppCompatController.getAppCompatAspectRatioOverrides()

                        .shouldOverrideMinAspectRatio());

        proto.write(SHOULD_IGNORE_ORIENTATION_REQUEST_LOOP,

                mAppCompatController.getAppCompatOrientationOverrides()

                mAppCompatController.getOrientationOverrides()

                        .shouldIgnoreOrientationRequestLoop());

        proto.write(SHOULD_OVERRIDE_FORCE_RESIZE_APP,

                mAppCompatController.getResizeOverrides().shouldOverrideForceResizeApp());

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

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



    @NonNull

    AppCompatOrientationOverrides getAppCompatOrientationOverrides() {

        return mAppCompatOverrides.getAppCompatOrientationOverrides();

    AppCompatOrientationOverrides getOrientationOverrides() {

        return mAppCompatOverrides.getOrientationOverrides();

    }



    @NonNull

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

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class AppCompatLetterboxPolicy { 


    @VisibleForTesting

    boolean shouldShowLetterboxUi(@NonNull WindowState mainWindow) {

        if (mActivityRecord.mAppCompatController.getAppCompatOrientationOverrides()

        if (mActivityRecord.mAppCompatController.getOrientationOverrides()

                .getIsRelaunchingAfterRequestedOrientationChanged()) {

            return mLastShouldShowLetterboxUi;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ class AppCompatOrientationOverrides { 
        // Task to ensure that Activity Embedding is excluded.

        return mActivityRecord.isVisibleRequested() && mActivityRecord.getTaskFragment() != null

                && mActivityRecord.getTaskFragment().getWindowingMode() == WINDOWING_MODE_FULLSCREEN

                && mActivityRecord.mAppCompatController.getAppCompatOrientationOverrides()

                && mActivityRecord.mAppCompatController.getOrientationOverrides()

                    .isOverrideRespectRequestedOrientationEnabled();

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class AppCompatOrientationPolicy { 
            return SCREEN_ORIENTATION_PORTRAIT;

        }



        if (mAppCompatOverrides.getAppCompatOrientationOverrides()

        if (mAppCompatOverrides.getOrientationOverrides()

                .isAllowOrientationOverrideOptOut()) {

            return candidate;

        }
@@ -108,7 +108,7 @@ class AppCompatOrientationPolicy { 
        }



        final AppCompatOrientationOverrides.OrientationOverridesState capabilityState =

                mAppCompatOverrides.getAppCompatOrientationOverrides()

                mAppCompatOverrides.getOrientationOverrides()

                        .mOrientationOverridesState;



        if (capabilityState.mIsOverrideToReverseLandscapeOrientationEnabled
@@ -170,7 +170,7 @@ class AppCompatOrientationPolicy { 
    boolean shouldIgnoreRequestedOrientation(

            @ActivityInfo.ScreenOrientation int requestedOrientation) {

        final AppCompatOrientationOverrides orientationOverrides =

                mAppCompatOverrides.getAppCompatOrientationOverrides();

                mAppCompatOverrides.getOrientationOverrides();

        if (orientationOverrides.shouldEnableIgnoreOrientationRequest()) {

            if (orientationOverrides.getIsRelaunchingAfterRequestedOrientationChanged()) {

                Slog.w(TAG, "Ignoring orientation update to "