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

Commit 49eeb012 authored by Mina Granic's avatar Mina Granic Committed by Mina Karadzic
Browse files

Rename camera compat force-rotate policy for consistency. 

Most other app compat classes start with "AppCompat".

Flag: EXEMPT renaming
Test: N/A
Bug: 432032916
Change-Id: I3b813a915598a7f712ab0e386c5084c3b89b9f24
parent 0c93656c

services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java→services/core/java/com/android/server/wm/AppCompatCameraDisplayRotationPolicy.java

+3 −3
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ import com.android.window.flags.Flags; 
 * R.bool.config_isWindowManagerCameraCompatTreatmentEnabled} is {@code true}.

 */

// TODO(b/261444714): Consider moving Camera-specific logic outside of the WM Core path

final class DisplayRotationCompatPolicy implements AppCompatCameraStatePolicy,

final class AppCompatCameraDisplayRotationPolicy implements AppCompatCameraStatePolicy,

        ActivityRefresher.Evaluator {

    private static final String TAG = TAG_WITH_CLASS_NAME ? "DisplayRotationCompatPolicy" : TAG_WM;

    private static final String TAG = TAG_WITH_CLASS_NAME ? "AppCompatCameraDRPolicy" : TAG_WM;



    @NonNull

    private final DisplayContent mDisplayContent;
@@ -89,7 +89,7 @@ final class DisplayRotationCompatPolicy implements AppCompatCameraStatePolicy, 
     */

    private boolean mIsRunning;



    DisplayRotationCompatPolicy(@NonNull DisplayContent displayContent,

    AppCompatCameraDisplayRotationPolicy(@NonNull DisplayContent displayContent,

            @NonNull CameraStateMonitor cameraStateMonitor,

            @NonNull AppCompatCameraStateSource cameraStateNotifier,

            @NonNull ActivityRefresher activityRefresher) {

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

+3 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ class AppCompatCameraOverrides { 


    /**

     * Whether activity is eligible for activity "refresh" after camera compat force rotation

     * treatment. See {@link DisplayRotationCompatPolicy} for context.

     * treatment. See {@link AppCompatCameraDisplayRotationPolicy} for context.

     *

     * <p>This treatment is enabled when the following conditions are met:

     * <ul>
@@ -142,7 +142,7 @@ class AppCompatCameraOverrides { 
    /**

     * Whether activity should be "refreshed" after the camera compat force rotation treatment

     * using the "resumed -> paused -> resumed" cycle rather than the "resumed -> ... -> stopped

     * -> ... -> resumed" cycle. See {@link DisplayRotationCompatPolicy} for context.

     * -> ... -> resumed" cycle. See {@link AppCompatCameraDisplayRotationPolicy} for context.

     *

     * <p>This treatment is enabled when the following conditions are met:

     * <ul>
@@ -160,7 +160,7 @@ class AppCompatCameraOverrides { 


    /**

     * Whether activity is eligible for camera compat force rotation treatment. See {@link

     * DisplayRotationCompatPolicy} for context.

     * AppCompatCameraDisplayRotationPolicy} for context.

     *

     * <p>This treatment is enabled when the following conditions are met:

     * <ul>

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

+31 −32
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class AppCompatCameraPolicy { 
    @VisibleForTesting

    final ActivityRefresher mActivityRefresher;

    @Nullable

    final DisplayRotationCompatPolicy mDisplayRotationCompatPolicy;

    final AppCompatCameraDisplayRotationPolicy mDisplayRotationPolicy;

    @Nullable

    final AppCompatCameraSimReqOrientationPolicy mSimReqOrientationPolicy;
@@ -52,21 +52,21 @@ class AppCompatCameraPolicy { 
            @NonNull DisplayContent displayContent) {

        // Not checking DeviceConfig value here to allow enabling via DeviceConfig

        // without the need to restart the device.

        final boolean needsDisplayRotationCompatPolicy = wmService.mAppCompatConfiguration

        final boolean needsDisplayRotationPolicy = wmService.mAppCompatConfiguration

                .isCameraCompatForceRotateTreatmentEnabledAtBuildTime();

        final boolean needsSimReqOrientationPolicy =

                DesktopModeFlags.ENABLE_CAMERA_COMPAT_SIMULATE_REQUESTED_ORIENTATION.isTrue()

                        && DesktopModeHelper.canEnterDesktopMode(wmService.mContext)

                        && wmService.mAppCompatConfiguration

                        .isCameraCompatSimulateRequestedOrientationTreatmentEnabled();

        if (needsDisplayRotationCompatPolicy || needsSimReqOrientationPolicy) {

        if (needsDisplayRotationPolicy || needsSimReqOrientationPolicy) {

            final AppCompatCameraStateSource cameraStateListenerDelegate =

                    new AppCompatCameraStateSource();

            mCameraStateMonitor = new CameraStateMonitor(displayContent, wmService.mH,

                    cameraStateListenerDelegate);

            mActivityRefresher = new ActivityRefresher(wmService, wmService.mH);

            mDisplayRotationCompatPolicy = needsDisplayRotationCompatPolicy

                    ? new DisplayRotationCompatPolicy(displayContent, mCameraStateMonitor,

            mDisplayRotationPolicy = needsDisplayRotationPolicy

                    ? new AppCompatCameraDisplayRotationPolicy(displayContent, mCameraStateMonitor,

                            cameraStateListenerDelegate, mActivityRefresher)

                    : null;

            mSimReqOrientationPolicy = needsSimReqOrientationPolicy
@@ -74,7 +74,7 @@ class AppCompatCameraPolicy { 
                            mCameraStateMonitor, cameraStateListenerDelegate, mActivityRefresher)

                    : null;

        } else {

            mDisplayRotationCompatPolicy = null;

            mDisplayRotationPolicy = null;

            mSimReqOrientationPolicy = null;

            mCameraStateMonitor = null;

            mActivityRefresher = null;
@@ -116,15 +116,15 @@ class AppCompatCameraPolicy { 
     * reason with the {@link Toast}.

     */

    void onScreenRotationAnimationFinished() {

        if (mDisplayRotationCompatPolicy != null) {

            mDisplayRotationCompatPolicy.onScreenRotationAnimationFinished();

        if (mDisplayRotationPolicy != null) {

            mDisplayRotationPolicy.onScreenRotationAnimationFinished();

        }

    }



    static boolean isActivityEligibleForOrientationOverride(@NonNull ActivityRecord activity) {

        final AppCompatCameraPolicy cameraPolicy = getAppCompatCameraPolicy(activity);

        return cameraPolicy != null && cameraPolicy.mDisplayRotationCompatPolicy != null

                && cameraPolicy.mDisplayRotationCompatPolicy

        return cameraPolicy != null && cameraPolicy.mDisplayRotationPolicy != null

                && cameraPolicy.mDisplayRotationPolicy

                        .isActivityEligibleForOrientationOverride(activity);

    }
@@ -140,14 +140,14 @@ class AppCompatCameraPolicy { 
     */

    static boolean isTreatmentEnabledForActivity(@NonNull ActivityRecord activity) {

        final AppCompatCameraPolicy cameraPolicy = getAppCompatCameraPolicy(activity);

        return cameraPolicy != null && cameraPolicy.mDisplayRotationCompatPolicy != null

                && cameraPolicy.mDisplayRotationCompatPolicy

        return cameraPolicy != null && cameraPolicy.mDisplayRotationPolicy != null

                && cameraPolicy.mDisplayRotationPolicy

                        .isTreatmentEnabledForActivity(activity);

    }



    void start() {

        if (mDisplayRotationCompatPolicy != null) {

            mDisplayRotationCompatPolicy.start();

        if (mDisplayRotationPolicy != null) {

            mDisplayRotationPolicy.start();

        }

        if (mSimReqOrientationPolicy != null) {

            mSimReqOrientationPolicy.start();
@@ -158,8 +158,8 @@ class AppCompatCameraPolicy { 
    }



    void dispose() {

        if (mDisplayRotationCompatPolicy != null) {

            mDisplayRotationCompatPolicy.dispose();

        if (mDisplayRotationPolicy != null) {

            mDisplayRotationPolicy.dispose();

        }

        if (mSimReqOrientationPolicy != null) {

            mSimReqOrientationPolicy.dispose();
@@ -169,8 +169,8 @@ class AppCompatCameraPolicy { 
        }

    }



    boolean hasDisplayRotationCompatPolicy() {

        return mDisplayRotationCompatPolicy != null;

    boolean hasDisplayRotationPolicy() {

        return mDisplayRotationPolicy != null;

    }



    boolean hasSimReqOrientationPolicy() {
@@ -183,8 +183,8 @@ class AppCompatCameraPolicy { 


    @ScreenOrientation

    int getOrientation() {

        return mDisplayRotationCompatPolicy != null

                ? mDisplayRotationCompatPolicy.getOrientation()

        return mDisplayRotationPolicy != null

                ? mDisplayRotationPolicy.getOrientation()

                : SCREEN_ORIENTATION_UNSPECIFIED;

    }
@@ -194,8 +194,8 @@ class AppCompatCameraPolicy { 
        if (cameraPolicy == null) {

            return false;

        }

        return (cameraPolicy.mDisplayRotationCompatPolicy != null

                        && cameraPolicy.mDisplayRotationCompatPolicy

        return (cameraPolicy.mDisplayRotationPolicy != null

                        && cameraPolicy.mDisplayRotationPolicy

                                .shouldCameraCompatControlOrientation(activity))

                || (cameraPolicy.mSimReqOrientationPolicy != null

                        && cameraPolicy.mSimReqOrientationPolicy
@@ -219,8 +219,8 @@ class AppCompatCameraPolicy { 
        if (cameraPolicy == null) {

            return false;

        }

        return (cameraPolicy.mDisplayRotationCompatPolicy != null

                        && cameraPolicy.mDisplayRotationCompatPolicy

        return (cameraPolicy.mDisplayRotationPolicy != null

                        && cameraPolicy.mDisplayRotationPolicy

                                .shouldCameraCompatControlAspectRatio(activity))

                || (cameraPolicy.mSimReqOrientationPolicy != null

                        && cameraPolicy.mSimReqOrientationPolicy
@@ -238,8 +238,8 @@ class AppCompatCameraPolicy { 
        if (cameraPolicy == null) {

            return false;

        }

        return (cameraPolicy.mDisplayRotationCompatPolicy != null

                && cameraPolicy.mDisplayRotationCompatPolicy

        return (cameraPolicy.mDisplayRotationPolicy != null

                && cameraPolicy.mDisplayRotationPolicy

                        .isCameraRunningAndWindowingModeEligible(activity,

                                /* mustBeFullscreen */ true))

                || (cameraPolicy.mSimReqOrientationPolicy != null
@@ -249,8 +249,8 @@ class AppCompatCameraPolicy { 


    @Nullable

    String getSummaryForDisplayRotationHistoryRecord() {

        return mDisplayRotationCompatPolicy != null

                ? mDisplayRotationCompatPolicy.getSummaryForDisplayRotationHistoryRecord()

        return mDisplayRotationPolicy != null

                ? mDisplayRotationPolicy.getSummaryForDisplayRotationHistoryRecord()

                : null;

    }
@@ -261,9 +261,8 @@ class AppCompatCameraPolicy { 
            return 1.0f;

        }

        float displayRotationCompatPolicyAspectRatio =

                cameraPolicy.mDisplayRotationCompatPolicy != null

                        ? cameraPolicy.mDisplayRotationCompatPolicy.getCameraCompatAspectRatio(

                                activity)

                cameraPolicy.mDisplayRotationPolicy != null

                ? cameraPolicy.mDisplayRotationPolicy.getCameraCompatAspectRatio(activity)

                : MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO;

        float simReqOrientationPolicyAspectRatio = cameraPolicy.mSimReqOrientationPolicy != null

                ? cameraPolicy.mSimReqOrientationPolicy.getCameraCompatAspectRatio(activity)

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

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import com.android.internal.protolog.ProtoLog; 
 * <ol>

 *  <li>The top application has {@link SCREEN_ORIENTATION_NOSENSOR} set and is rotated to

 *  {@link ROTATION_0}.

 *  <li>Camera compat treatment has rotated the app {@link DisplayRotationCompatPolicy}.

 *  <li>Camera compat treatment has rotated the app {@link AppCompatCameraDisplayRotationPolicy}.

 *  <li>The device is half-folded and has auto-rotate is temporarily enabled.

 * </ol>

 *
@@ -61,7 +61,7 @@ final class DisplayRotationReversionController { 
    }



    boolean isRotationReversionEnabled() {

        return mDisplayContent.mAppCompatCameraPolicy.hasDisplayRotationCompatPolicy()

        return mDisplayContent.mAppCompatCameraPolicy.hasDisplayRotationPolicy()

                || mDisplayContent.getDisplayRotation().mFoldController != null

                || mDisplayContent.getIgnoreOrientationRequest();

    }

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

+4 −4
Original line number Diff line number Diff line
@@ -226,9 +226,9 @@ class AppCompatActivityRobot { 
    }



    void enableFullscreenCameraCompatTreatmentForTopActivity(boolean enabled) {

        if (mDisplayContent.mAppCompatCameraPolicy.hasDisplayRotationCompatPolicy()) {

        if (mDisplayContent.mAppCompatCameraPolicy.hasDisplayRotationPolicy()) {

            doReturn(enabled).when(

                    mDisplayContent.mAppCompatCameraPolicy.mDisplayRotationCompatPolicy)

                    mDisplayContent.mAppCompatCameraPolicy.mDisplayRotationPolicy)

                        .isTreatmentEnabledForActivity(eq(mActivityStack.top()));

        }

    }
@@ -653,9 +653,9 @@ class AppCompatActivityRobot { 
        }

    }



    private DisplayRotationCompatPolicy getTopDisplayRotationCompatPolicy() {

    private AppCompatCameraDisplayRotationPolicy getTopDisplayRotationCompatPolicy() {

        return mActivityStack.top().mDisplayContent.mAppCompatCameraPolicy

                .mDisplayRotationCompatPolicy;

                .mDisplayRotationPolicy;

    }



    private AppCompatCameraSimReqOrientationPolicy getTopCameraCompatSimReqOrientationPolicy() {