diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/AppCompatController.java | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/AppCompatReachabilityPolicy.java | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/AppCompatController.java b/services/core/java/com/android/server/wm/AppCompatController.java index a94f6252cd68..cc9cd90fae06 100644 --- a/services/core/java/com/android/server/wm/AppCompatController.java +++ b/services/core/java/com/android/server/wm/AppCompatController.java @@ -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 diff --git a/services/core/java/com/android/server/wm/AppCompatReachabilityPolicy.java b/services/core/java/com/android/server/wm/AppCompatReachabilityPolicy.java index 087edc184b6f..a7c52bd1fc38 100644 --- a/services/core/java/com/android/server/wm/AppCompatReachabilityPolicy.java +++ b/services/core/java/com/android/server/wm/AppCompatReachabilityPolicy.java @@ -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 |