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

Commit db184519 authored by Mina Granic's avatar Mina Granic Committed by Android (Google) Code Review
Browse files

Merge "Rename LetterboxConfiguration to AppCompatConfiguration." into main

parents 81096d0d 210f8bfc

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

+2 −2
Original line number Diff line number Diff line
@@ -8964,7 +8964,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     * <p>Conditions that need to be met:

     *

     * <ul>

     *     <li>{@link LetterboxConfiguration#getIsEducationEnabled} is true.

     *     <li>{@link AppCompatConfiguration#getIsEducationEnabled} is true.

     *     <li>The activity is eligible for fixed orientation letterbox.

     *     <li>The activity is in fullscreen.

     *     <li>The activity is portrait-only.
@@ -8973,7 +8973,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     * </ul>

     */

    boolean isEligibleForLetterboxEducation() {

        return mWmService.mLetterboxConfiguration.getIsEducationEnabled()

        return mWmService.mAppCompatConfiguration.getIsEducationEnabled()

                && mIsEligibleForFixedOrientationLetterbox

                && getWindowingMode() == WINDOWING_MODE_FULLSCREEN

                && getRequestedConfigurationOrientation() == ORIENTATION_PORTRAIT

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

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class ActivityRefresher { 
        }



        final boolean cycleThroughStop =

                mWmService.mLetterboxConfiguration

                mWmService.mAppCompatConfiguration

                        .isCameraCompatRefreshCycleThroughStopEnabled()

                        && !activity.mAppCompatController.getAppCompatCameraOverrides()

                            .shouldRefreshActivityViaPauseForCameraCompat();
@@ -114,7 +114,7 @@ class ActivityRefresher { 


    private boolean shouldRefreshActivity(@NonNull ActivityRecord activity,

            @NonNull Configuration newConfig, @NonNull Configuration lastReportedConfig) {

        return mWmService.mLetterboxConfiguration.isCameraCompatRefreshEnabled()

        return mWmService.mAppCompatConfiguration.isCameraCompatRefreshEnabled()

                && activity.mAppCompatController.getAppCompatOverrides()

                    .getAppCompatCameraOverrides().shouldRefreshActivityForCameraCompat()

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

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

+14 −14
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO 


import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_POSITION_MULTIPLIER_CENTER;

import static com.android.server.wm.LetterboxConfiguration.MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO;

import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_POSITION_MULTIPLIER_CENTER;

import static com.android.server.wm.AppCompatConfiguration.MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO;



import android.annotation.NonNull;

import android.content.pm.PackageManager;
@@ -62,7 +62,7 @@ class AppCompatAspectRatioOverrides { 
    @NonNull

    private final ActivityRecord mActivityRecord;

    @NonNull

    private final LetterboxConfiguration mLetterboxConfiguration;

    private final AppCompatConfiguration mAppCompatConfiguration;

    @NonNull

    private final UserAspectRatioState mUserAspectRatioState;
@@ -80,12 +80,12 @@ class AppCompatAspectRatioOverrides { 
    private final Function<Configuration, Float> mGetHorizontalPositionMultiplierProvider;



    AppCompatAspectRatioOverrides(@NonNull ActivityRecord activityRecord,

            @NonNull LetterboxConfiguration letterboxConfiguration,

            @NonNull AppCompatConfiguration appCompatConfiguration,

            @NonNull OptPropFactory optPropBuilder,

            @NonNull Function<Boolean, Boolean> isDisplayFullScreenAndInPostureProvider,

            @NonNull Function<Configuration, Float> getHorizontalPositionMultiplierProvider) {

        mActivityRecord = activityRecord;

        mLetterboxConfiguration = letterboxConfiguration;

        mAppCompatConfiguration = appCompatConfiguration;

        mUserAspectRatioState = new UserAspectRatioState();

        mIsDisplayFullScreenAndInPostureProvider = isDisplayFullScreenAndInPostureProvider;

        mGetHorizontalPositionMultiplierProvider = getHorizontalPositionMultiplierProvider;
@@ -93,10 +93,10 @@ class AppCompatAspectRatioOverrides { 
                PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE);

        mAllowUserAspectRatioOverrideOptProp = optPropBuilder.create(

                PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_OVERRIDE,

                mLetterboxConfiguration::isUserAppAspectRatioSettingsEnabled);

                mAppCompatConfiguration::isUserAppAspectRatioSettingsEnabled);

        mAllowUserAspectRatioFullscreenOverrideOptProp = optPropBuilder.create(

                PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_FULLSCREEN_OVERRIDE,

                mLetterboxConfiguration::isUserAppAspectRatioFullscreenEnabled);

                mAppCompatConfiguration::isUserAppAspectRatioFullscreenEnabled);

        mAllowOrientationOverrideOptProp = optPropBuilder.create(

                PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERRIDE);

    }
@@ -147,7 +147,7 @@ class AppCompatAspectRatioOverrides { 
    boolean isUserFullscreenOverrideEnabled() {

        if (mAllowUserAspectRatioOverrideOptProp.isFalse()

                || mAllowUserAspectRatioFullscreenOverrideOptProp.isFalse()

                || !mLetterboxConfiguration.isUserAppAspectRatioFullscreenEnabled()) {

                || !mAppCompatConfiguration.isUserAppAspectRatioFullscreenEnabled()) {

            return false;

        }

        return true;
@@ -168,7 +168,7 @@ class AppCompatAspectRatioOverrides { 
        // effect only if explicitly false. If mBooleanPropertyAllowUserAspectRatioOverride is null,

        // the current app doesn't opt-out so the first part of the predicate is true.

        return !mAllowUserAspectRatioOverrideOptProp.isFalse()

                && mLetterboxConfiguration.isUserAppAspectRatioSettingsEnabled()

                && mAppCompatConfiguration.isUserAppAspectRatioSettingsEnabled()

                && mActivityRecord.mDisplayContent != null

                && mActivityRecord.mDisplayContent.getIgnoreOrientationRequest();

    }
@@ -267,11 +267,11 @@ class AppCompatAspectRatioOverrides { 
    }



    private float getDefaultMinAspectRatioForUnresizableApps() {

        if (!mLetterboxConfiguration.getIsSplitScreenAspectRatioForUnresizableAppsEnabled()

        if (!mAppCompatConfiguration.getIsSplitScreenAspectRatioForUnresizableAppsEnabled()

                || mActivityRecord.getDisplayArea() == null) {

            return mLetterboxConfiguration.getDefaultMinAspectRatioForUnresizableApps()

            return mAppCompatConfiguration.getDefaultMinAspectRatioForUnresizableApps()

                    > MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO

                    ? mLetterboxConfiguration.getDefaultMinAspectRatioForUnresizableApps()

                    ? mAppCompatConfiguration.getDefaultMinAspectRatioForUnresizableApps()

                    : getDefaultMinAspectRatio();

        }
@@ -280,9 +280,9 @@ class AppCompatAspectRatioOverrides { 


    private float getDefaultMinAspectRatio() {

        if (mActivityRecord.getDisplayArea() == null

                || !mLetterboxConfiguration

                || !mAppCompatConfiguration

                .getIsDisplayAspectRatioEnabledForFixedOrientationLetterbox()) {

            return mLetterboxConfiguration.getFixedOrientationLetterboxAspectRatio();

            return mAppCompatConfiguration.getFixedOrientationLetterboxAspectRatio();

        }

        return getDisplaySizeMinAspectRatio();

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import static android.content.pm.ActivityInfo.OVERRIDE_MIN_ASPECT_RATIO_TO_ALIGN 
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

import static android.content.res.Configuration.ORIENTATION_PORTRAIT;



import static com.android.server.wm.LetterboxConfiguration.DEFAULT_LETTERBOX_ASPECT_RATIO_FOR_MULTI_WINDOW;

import static com.android.server.wm.LetterboxConfiguration.MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO;

import static com.android.server.wm.AppCompatConfiguration.DEFAULT_LETTERBOX_ASPECT_RATIO_FOR_MULTI_WINDOW;

import static com.android.server.wm.AppCompatConfiguration.MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO;



import android.annotation.NonNull;

import android.annotation.Nullable;

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

+5 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class AppCompatCameraOverrides { 
    @NonNull

    private final AppCompatCameraOverridesState mAppCompatCameraOverridesState;

    @NonNull

    private final LetterboxConfiguration mLetterboxConfiguration;

    private final AppCompatConfiguration mAppCompatConfiguration;

    @NonNull

    private final OptPropFactory.OptProp mAllowMinAspectRatioOverrideOptProp;

    @NonNull
@@ -63,15 +63,15 @@ class AppCompatCameraOverrides { 
    private final OptPropFactory.OptProp mCameraCompatAllowForceRotationOptProp;



    AppCompatCameraOverrides(@NonNull ActivityRecord activityRecord,

            @NonNull LetterboxConfiguration letterboxConfiguration,

            @NonNull AppCompatConfiguration appCompatConfiguration,

            @NonNull OptPropFactory optPropBuilder) {

        mActivityRecord = activityRecord;

        mLetterboxConfiguration = letterboxConfiguration;

        mAppCompatConfiguration = appCompatConfiguration;

        mAppCompatCameraOverridesState = new AppCompatCameraOverridesState();

        mAllowMinAspectRatioOverrideOptProp = optPropBuilder.create(

                PROPERTY_COMPAT_ALLOW_MIN_ASPECT_RATIO_OVERRIDE);

        final BooleanSupplier isCameraCompatTreatmentEnabled = AppCompatUtils.asLazy(

                mLetterboxConfiguration::isCameraCompatTreatmentEnabled);

                mAppCompatConfiguration::isCameraCompatTreatmentEnabled);

        mCameraCompatAllowRefreshOptProp = optPropBuilder.create(

                PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH,

                isCameraCompatTreatmentEnabled);
@@ -214,7 +214,7 @@ class AppCompatCameraOverrides { 
     * is active because the corresponding config is enabled and activity supports resizing.

     */

    boolean isCameraCompatSplitScreenAspectRatioAllowed() {

        return mLetterboxConfiguration.isCameraCompatSplitScreenAspectRatioEnabled()

        return mAppCompatConfiguration.isCameraCompatSplitScreenAspectRatioEnabled()

                && !mActivityRecord.shouldCreateCompatDisplayInsets();

    }