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

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

Merge "[48/n] Simplify AppCompatDeviceStateQuery naming" into main

parents 232992d2 a96769bc

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

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class AppCompatController { 
    @NonNull

    private final AppCompatOverrides mAppCompatOverrides;

    @NonNull

    private final AppCompatDeviceStateQuery mAppCompatDeviceStateQuery;

    private final AppCompatDeviceStateQuery mDeviceStateQuery;

    @NonNull

    private final AppCompatLetterboxPolicy mAppCompatLetterboxPolicy;

    @NonNull
@@ -50,11 +50,11 @@ class AppCompatController { 
        final PackageManager packageManager = wmService.mContext.getPackageManager();

        final OptPropFactory optPropBuilder = new OptPropFactory(packageManager,

                activityRecord.packageName);

        mAppCompatDeviceStateQuery = new AppCompatDeviceStateQuery(activityRecord);

        mDeviceStateQuery = new AppCompatDeviceStateQuery(activityRecord);

        mTransparentPolicy = new TransparentPolicy(activityRecord,

                wmService.mAppCompatConfiguration);

        mAppCompatOverrides = new AppCompatOverrides(activityRecord, packageManager,

                wmService.mAppCompatConfiguration, optPropBuilder, mAppCompatDeviceStateQuery);

                wmService.mAppCompatConfiguration, optPropBuilder, mDeviceStateQuery);

        mOrientationPolicy = new AppCompatOrientationPolicy(activityRecord, mAppCompatOverrides);

        mAspectRatioPolicy = new AppCompatAspectRatioPolicy(activityRecord,

                mTransparentPolicy, mAppCompatOverrides);
@@ -129,8 +129,8 @@ class AppCompatController { 
    }



    @NonNull

    AppCompatDeviceStateQuery getAppCompatDeviceStateQuery() {

        return mAppCompatDeviceStateQuery;

    AppCompatDeviceStateQuery getDeviceStateQuery() {

        return mDeviceStateQuery;

    }



    @NonNull

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

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ class AppCompatReachabilityPolicy { 
            return;

        }

        final AppCompatDeviceStateQuery deviceStateQuery = mActivityRecord.mAppCompatController

                .getAppCompatDeviceStateQuery();

                .getDeviceStateQuery();

        final boolean isInFullScreenBookMode = deviceStateQuery

                    .isDisplayFullScreenAndSeparatingHinge()

                && mAppCompatConfiguration.getIsAutomaticReachabilityInBookModeEnabled();
@@ -153,7 +153,7 @@ class AppCompatReachabilityPolicy { 
            return;

        }

        final AppCompatDeviceStateQuery deviceStateQuery = mActivityRecord.mAppCompatController

                .getAppCompatDeviceStateQuery();

                .getDeviceStateQuery();

        final boolean isInFullScreenTabletopMode = deviceStateQuery

                .isDisplayFullScreenAndSeparatingHinge();

        final int letterboxPositionForVerticalReachability = mAppCompatConfiguration