summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--services/core/java/com/android/server/wm/ActivityRecord.java6
-rw-r--r--services/core/java/com/android/server/wm/AppCompatController.java10
-rw-r--r--services/core/java/com/android/server/wm/AppCompatOrientationOverrides.java (renamed from services/core/java/com/android/server/wm/AppCompatOrientationCapability.java)33
-rw-r--r--services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java16
-rw-r--r--services/core/java/com/android/server/wm/AppCompatOverrides.java (renamed from services/core/java/com/android/server/wm/AppCompatCapability.java)16
-rw-r--r--services/core/java/com/android/server/wm/LetterboxUiController.java44
-rw-r--r--services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationOverridesTest.java (renamed from services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationCapabilityTest.java)38
7 files changed, 84 insertions, 79 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index 21155bb7e29e..d28125c258f0 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -8183,8 +8183,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
}
void setRequestedOrientation(@ActivityInfo.ScreenOrientation int requestedOrientation) {
- if (mAppCompatController.getAppCompatCapability()
- .getAppCompatOrientationCapability()
+ if (mAppCompatController.getAppCompatOverrides()
+ .getAppCompatOrientationOverrides()
.shouldIgnoreRequestedOrientation(requestedOrientation)) {
return;
}
@@ -10821,7 +10821,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
proto.write(SHOULD_OVERRIDE_MIN_ASPECT_RATIO,
mLetterboxUiController.shouldOverrideMinAspectRatio());
proto.write(SHOULD_IGNORE_ORIENTATION_REQUEST_LOOP,
- mAppCompatController.getAppCompatCapability().getAppCompatOrientationCapability()
+ mAppCompatController.getAppCompatOverrides().getAppCompatOrientationOverrides()
.shouldIgnoreOrientationRequestLoop());
proto.write(SHOULD_OVERRIDE_FORCE_RESIZE_APP,
mLetterboxUiController.shouldOverrideForceResizeApp());
diff --git a/services/core/java/com/android/server/wm/AppCompatController.java b/services/core/java/com/android/server/wm/AppCompatController.java
index 3ff0fcefd747..4b0d739af64a 100644
--- a/services/core/java/com/android/server/wm/AppCompatController.java
+++ b/services/core/java/com/android/server/wm/AppCompatController.java
@@ -27,18 +27,18 @@ class AppCompatController {
@NonNull
private final AppCompatOrientationPolicy mOrientationPolicy;
@NonNull
- private final AppCompatCapability mAppCompatCapability;
+ private final AppCompatOverrides mAppCompatOverrides;
AppCompatController(@NonNull WindowManagerService wmService,
@NonNull ActivityRecord activityRecord) {
mTransparentPolicy = new TransparentPolicy(activityRecord,
wmService.mLetterboxConfiguration);
- mAppCompatCapability = new AppCompatCapability(wmService, activityRecord,
+ mAppCompatOverrides = new AppCompatOverrides(wmService, activityRecord,
wmService.mLetterboxConfiguration);
// TODO(b/341903757) Remove BooleanSuppliers after fixing dependency with aspectRatio.
final LetterboxUiController tmpController = activityRecord.mLetterboxUiController;
mOrientationPolicy = new AppCompatOrientationPolicy(activityRecord,
- mAppCompatCapability, tmpController::shouldApplyUserFullscreenOverride,
+ mAppCompatOverrides, tmpController::shouldApplyUserFullscreenOverride,
tmpController::shouldApplyUserMinAspectRatioOverride,
tmpController::isSystemOverrideToFullscreenEnabled);
}
@@ -54,7 +54,7 @@ class AppCompatController {
}
@NonNull
- AppCompatCapability getAppCompatCapability() {
- return mAppCompatCapability;
+ AppCompatOverrides getAppCompatOverrides() {
+ return mAppCompatOverrides;
}
}
diff --git a/services/core/java/com/android/server/wm/AppCompatOrientationCapability.java b/services/core/java/com/android/server/wm/AppCompatOrientationOverrides.java
index 10f3e833f78a..446a75caeb82 100644
--- a/services/core/java/com/android/server/wm/AppCompatOrientationCapability.java
+++ b/services/core/java/com/android/server/wm/AppCompatOrientationOverrides.java
@@ -28,7 +28,7 @@ import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENT
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.AppCompatCapability.asLazy;
+import static com.android.server.wm.AppCompatOverrides.asLazy;
import android.annotation.NonNull;
import android.content.pm.ActivityInfo;
@@ -40,9 +40,14 @@ import com.android.server.wm.utils.OptPropFactory;
import java.util.function.BooleanSupplier;
import java.util.function.LongSupplier;
-class AppCompatOrientationCapability {
+/**
+ * Encapsulates all the configurations and overrides about orientation used by
+ * {@link AppCompatOrientationPolicy}.
+ */
+class AppCompatOrientationOverrides {
- private static final String TAG = TAG_WITH_CLASS_NAME ? "AppCompatCapability" : TAG_ATM;
+ private static final String TAG = TAG_WITH_CLASS_NAME
+ ? "AppCompatOrientationOverrides" : TAG_ATM;
@NonNull
private final ActivityRecord mActivityRecord;
@@ -53,13 +58,13 @@ class AppCompatOrientationCapability {
private final OptPropFactory.OptProp mAllowIgnoringOrientationRequestWhenLoopDetectedOptProp;
@NonNull
- final OrientationCapabilityState mOrientationCapabilityState;
+ final OrientationOverridesState mOrientationOverridesState;
- AppCompatOrientationCapability(@NonNull OptPropFactory optPropBuilder,
+ AppCompatOrientationOverrides(@NonNull OptPropFactory optPropBuilder,
@NonNull LetterboxConfiguration letterboxConfiguration,
@NonNull ActivityRecord activityRecord) {
mActivityRecord = activityRecord;
- mOrientationCapabilityState = new OrientationCapabilityState(mActivityRecord,
+ mOrientationOverridesState = new OrientationOverridesState(mActivityRecord,
System::currentTimeMillis);
final BooleanSupplier isPolicyForIgnoringRequestedOrientationEnabled = asLazy(
letterboxConfiguration::isPolicyForIgnoringRequestedOrientationEnabled);
@@ -101,7 +106,7 @@ class AppCompatOrientationCapability {
@ActivityInfo.ScreenOrientation int requestedOrientation) {
if (mIgnoreRequestedOrientationOptProp.shouldEnableWithOverrideAndProperty(
isCompatChangeEnabled(OVERRIDE_ENABLE_COMPAT_IGNORE_REQUESTED_ORIENTATION))) {
- if (mOrientationCapabilityState.mIsRelaunchingAfterRequestedOrientationChanged) {
+ if (mOrientationOverridesState.mIsRelaunchingAfterRequestedOrientationChanged) {
Slog.w(TAG, "Ignoring orientation update to "
+ screenOrientationToString(requestedOrientation)
+ " due to relaunching after setRequestedOrientation for "
@@ -150,9 +155,9 @@ class AppCompatOrientationCapability {
.shouldEnableWithOptInOverrideAndOptOutProperty(loopDetectionEnabled)) {
return false;
}
- mOrientationCapabilityState.updateOrientationRequestLoopState();
+ mOrientationOverridesState.updateOrientationRequestLoopState();
- return mOrientationCapabilityState.shouldIgnoreRequestInLoop()
+ return mOrientationOverridesState.shouldIgnoreRequestInLoop()
&& !mActivityRecord.isLetterboxedForFixedOrientationAndAspectRatio();
}
@@ -161,17 +166,17 @@ class AppCompatOrientationCapability {
* android.app.Activity#setRequestedOrientation}.
*/
void setRelaunchingAfterRequestedOrientationChanged(boolean isRelaunching) {
- mOrientationCapabilityState
+ mOrientationOverridesState
.mIsRelaunchingAfterRequestedOrientationChanged = isRelaunching;
}
boolean getIsRelaunchingAfterRequestedOrientationChanged() {
- return mOrientationCapabilityState.mIsRelaunchingAfterRequestedOrientationChanged;
+ return mOrientationOverridesState.mIsRelaunchingAfterRequestedOrientationChanged;
}
@VisibleForTesting
int getSetOrientationRequestCounter() {
- return mOrientationCapabilityState.mSetOrientationRequestCounter;
+ return mOrientationOverridesState.mSetOrientationRequestCounter;
}
private boolean isCompatChangeEnabled(long overrideChangeId) {
@@ -192,7 +197,7 @@ class AppCompatOrientationCapability {
.isTreatmentEnabledForActivity(mActivityRecord);
}
- static class OrientationCapabilityState {
+ static class OrientationOverridesState {
// Corresponds to OVERRIDE_UNDEFINED_ORIENTATION_TO_NOSENSOR
final boolean mIsOverrideToNosensorOrientationEnabled;
// Corresponds to OVERRIDE_UNDEFINED_ORIENTATION_TO_PORTRAIT
@@ -219,7 +224,7 @@ class AppCompatOrientationCapability {
@VisibleForTesting
LongSupplier mCurrentTimeMillisSupplier;
- OrientationCapabilityState(@NonNull ActivityRecord activityRecord,
+ OrientationOverridesState(@NonNull ActivityRecord activityRecord,
@NonNull LongSupplier currentTimeMillisSupplier) {
mCurrentTimeMillisSupplier = currentTimeMillisSupplier;
mIsOverrideToNosensorOrientationEnabled =
diff --git a/services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java b/services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java
index c505ff9de825..8e9a9e99d4e1 100644
--- a/services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java
+++ b/services/core/java/com/android/server/wm/AppCompatOrientationPolicy.java
@@ -45,7 +45,7 @@ class AppCompatOrientationPolicy {
private final ActivityRecord mActivityRecord;
@NonNull
- private final AppCompatCapability mAppCompatCapability;
+ private final AppCompatOverrides mAppCompatOverrides;
@NonNull
private final BooleanSupplier mShouldApplyUserFullscreenOverride;
@@ -56,12 +56,12 @@ class AppCompatOrientationPolicy {
// TODO(b/341903757) Remove BooleanSuppliers after fixing dependency with spectRatio component
AppCompatOrientationPolicy(@NonNull ActivityRecord activityRecord,
- @NonNull AppCompatCapability appCompatCapability,
+ @NonNull AppCompatOverrides appCompatOverrides,
@NonNull BooleanSupplier shouldApplyUserFullscreenOverride,
@NonNull BooleanSupplier shouldApplyUserMinAspectRatioOverride,
@NonNull BooleanSupplier isSystemOverrideToFullscreenEnabled) {
mActivityRecord = activityRecord;
- mAppCompatCapability = appCompatCapability;
+ mAppCompatOverrides = appCompatOverrides;
mShouldApplyUserFullscreenOverride = shouldApplyUserFullscreenOverride;
mShouldApplyUserMinAspectRatioOverride = shouldApplyUserMinAspectRatioOverride;
mIsSystemOverrideToFullscreenEnabled = isSystemOverrideToFullscreenEnabled;
@@ -99,11 +99,11 @@ class AppCompatOrientationPolicy {
return SCREEN_ORIENTATION_PORTRAIT;
}
- if (mAppCompatCapability.isAllowOrientationOverrideOptOut()) {
+ if (mAppCompatOverrides.isAllowOrientationOverrideOptOut()) {
return candidate;
}
- if (displayContent != null && mAppCompatCapability
+ if (displayContent != null && mAppCompatOverrides
.isOverrideOrientationOnlyForCameraEnabled()
&& (displayContent.mDisplayRotationCompatPolicy == null
|| !displayContent.mDisplayRotationCompatPolicy
@@ -127,9 +127,9 @@ class AppCompatOrientationPolicy {
return SCREEN_ORIENTATION_USER;
}
- final AppCompatOrientationCapability.OrientationCapabilityState capabilityState =
- mAppCompatCapability.getAppCompatOrientationCapability()
- .mOrientationCapabilityState;
+ final AppCompatOrientationOverrides.OrientationOverridesState capabilityState =
+ mAppCompatOverrides.getAppCompatOrientationOverrides()
+ .mOrientationOverridesState;
if (capabilityState.mIsOverrideToReverseLandscapeOrientationEnabled
&& (isFixedOrientationLandscape(candidate)
diff --git a/services/core/java/com/android/server/wm/AppCompatCapability.java b/services/core/java/com/android/server/wm/AppCompatOverrides.java
index d4379e486ea1..9e739653c738 100644
--- a/services/core/java/com/android/server/wm/AppCompatCapability.java
+++ b/services/core/java/com/android/server/wm/AppCompatOverrides.java
@@ -57,9 +57,9 @@ import java.util.function.BooleanSupplier;
/**
* Encapsulate logic related to operations guarded by an app override.
*/
-public class AppCompatCapability {
+public class AppCompatOverrides {
- private static final String TAG = TAG_WITH_CLASS_NAME ? "AppCompatCapability" : TAG_ATM;
+ private static final String TAG = TAG_WITH_CLASS_NAME ? "AppCompatOverrides" : TAG_ATM;
@NonNull
private final LetterboxConfiguration mLetterboxConfiguration;
@@ -95,9 +95,9 @@ public class AppCompatCapability {
@NonNull
private final OptPropFactory.OptProp mAllowUserAspectRatioFullscreenOverrideOptProp;
- private final AppCompatOrientationCapability mAppCompatOrientationCapability;
+ private final AppCompatOrientationOverrides mAppCompatOrientationOverrides;
- AppCompatCapability(@NonNull WindowManagerService wmService,
+ AppCompatOverrides(@NonNull WindowManagerService wmService,
@NonNull ActivityRecord activityRecord,
@NonNull LetterboxConfiguration letterboxConfiguration) {
mLetterboxConfiguration = letterboxConfiguration;
@@ -107,8 +107,8 @@ public class AppCompatCapability {
final OptPropFactory optPropBuilder = new OptPropFactory(packageManager,
activityRecord.packageName);
- mAppCompatOrientationCapability =
- new AppCompatOrientationCapability(optPropBuilder, mLetterboxConfiguration,
+ mAppCompatOrientationOverrides =
+ new AppCompatOrientationOverrides(optPropBuilder, mLetterboxConfiguration,
mActivityRecord);
mFakeFocusOptProp = optPropBuilder.create(PROPERTY_COMPAT_ENABLE_FAKE_FOCUS,
@@ -172,8 +172,8 @@ public class AppCompatCapability {
}
@NonNull
- AppCompatOrientationCapability getAppCompatOrientationCapability() {
- return mAppCompatOrientationCapability;
+ AppCompatOrientationOverrides getAppCompatOrientationOverrides() {
+ return mAppCompatOrientationOverrides;
}
/**
diff --git a/services/core/java/com/android/server/wm/LetterboxUiController.java b/services/core/java/com/android/server/wm/LetterboxUiController.java
index e0d2035118ad..b17364bb14b5 100644
--- a/services/core/java/com/android/server/wm/LetterboxUiController.java
+++ b/services/core/java/com/android/server/wm/LetterboxUiController.java
@@ -153,7 +153,7 @@ final class LetterboxUiController {
@VisibleForTesting
int getSetOrientationRequestCounter() {
- return getAppCompatCapability().getAppCompatOrientationCapability()
+ return getAppCompatOverrides().getAppCompatOrientationOverrides()
.getSetOrientationRequestCounter();
}
@@ -170,7 +170,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldSendFakeFocus() {
- return getAppCompatCapability().shouldSendFakeFocus();
+ return getAppCompatOverrides().shouldSendFakeFocus();
}
/**
@@ -186,7 +186,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldOverrideMinAspectRatio() {
- return getAppCompatCapability().shouldOverrideMinAspectRatio();
+ return getAppCompatOverrides().shouldOverrideMinAspectRatio();
}
/**
@@ -203,7 +203,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldOverrideMinAspectRatioForCamera() {
- return getAppCompatCapability().shouldOverrideMinAspectRatioForCamera();
+ return getAppCompatOverrides().shouldOverrideMinAspectRatioForCamera();
}
/**
@@ -219,7 +219,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldOverrideForceResizeApp() {
- return getAppCompatCapability().shouldOverrideForceResizeApp();
+ return getAppCompatOverrides().shouldOverrideForceResizeApp();
}
/**
@@ -233,7 +233,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldOverrideForceNonResizeApp() {
- return getAppCompatCapability().shouldOverrideForceNonResizeApp();
+ return getAppCompatOverrides().shouldOverrideForceNonResizeApp();
}
/**
@@ -241,7 +241,7 @@ final class LetterboxUiController {
* android.app.Activity#setRequestedOrientation}.
*/
void setRelaunchingAfterRequestedOrientationChanged(boolean isRelaunching) {
- getAppCompatCapability().getAppCompatOrientationCapability()
+ getAppCompatOverrides().getAppCompatOrientationOverrides()
.setRelaunchingAfterRequestedOrientationChanged(isRelaunching);
}
@@ -257,7 +257,7 @@ final class LetterboxUiController {
}
boolean isOverrideRespectRequestedOrientationEnabled() {
- return getAppCompatCapability().isOverrideRespectRequestedOrientationEnabled();
+ return getAppCompatOverrides().isOverrideRespectRequestedOrientationEnabled();
}
/**
@@ -274,11 +274,11 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldUseDisplayLandscapeNaturalOrientation() {
- return getAppCompatCapability().shouldUseDisplayLandscapeNaturalOrientation();
+ return getAppCompatOverrides().shouldUseDisplayLandscapeNaturalOrientation();
}
boolean isOverrideOrientationOnlyForCameraEnabled() {
- return getAppCompatCapability().isOverrideOrientationOnlyForCameraEnabled();
+ return getAppCompatOverrides().isOverrideOrientationOnlyForCameraEnabled();
}
/**
@@ -293,7 +293,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldRefreshActivityForCameraCompat() {
- return getAppCompatCapability().shouldRefreshActivityForCameraCompat();
+ return getAppCompatOverrides().shouldRefreshActivityForCameraCompat();
}
/**
@@ -311,7 +311,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldRefreshActivityViaPauseForCameraCompat() {
- return getAppCompatCapability().shouldRefreshActivityViaPauseForCameraCompat();
+ return getAppCompatOverrides().shouldRefreshActivityViaPauseForCameraCompat();
}
/**
@@ -326,7 +326,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldForceRotateForCameraCompat() {
- return getAppCompatCapability().shouldForceRotateForCameraCompat();
+ return getAppCompatOverrides().shouldForceRotateForCameraCompat();
}
/**
@@ -344,7 +344,7 @@ final class LetterboxUiController {
* </ul>
*/
boolean shouldApplyFreeformTreatmentForCameraCompat() {
- return getAppCompatCapability().shouldApplyFreeformTreatmentForCameraCompat();
+ return getAppCompatOverrides().shouldApplyFreeformTreatmentForCameraCompat();
}
@FreeformCameraCompatMode
@@ -609,7 +609,7 @@ final class LetterboxUiController {
// Don't resize to split screen size when in book mode if letterbox position is centered
return (isBookMode && isNotCenteredHorizontally || isTabletopMode && isLandscape)
|| isCameraCompatSplitScreenAspectRatioAllowed()
- && getAppCompatCapability().isCameraCompatTreatmentActive();
+ && getAppCompatOverrides().isCameraCompatTreatmentActive();
}
private float getDefaultMinAspectRatioForUnresizableApps() {
@@ -711,7 +711,7 @@ final class LetterboxUiController {
* Whether we should enable users to resize the current app.
*/
boolean shouldEnableUserAspectRatioSettings() {
- return getAppCompatCapability().shouldEnableUserAspectRatioSettings();
+ return getAppCompatOverrides().shouldEnableUserAspectRatioSettings();
}
/**
@@ -741,11 +741,11 @@ final class LetterboxUiController {
}
boolean isUserFullscreenOverrideEnabled() {
- return getAppCompatCapability().isUserFullscreenOverrideEnabled();
+ return getAppCompatOverrides().isUserFullscreenOverrideEnabled();
}
boolean isSystemOverrideToFullscreenEnabled() {
- return getAppCompatCapability().isSystemOverrideToFullscreenEnabled(mUserAspectRatio);
+ return getAppCompatOverrides().isSystemOverrideToFullscreenEnabled(mUserAspectRatio);
}
boolean hasFullscreenOverride() {
@@ -941,8 +941,8 @@ final class LetterboxUiController {
}
// TODO(b/346264992): Remove after AppCompatController refactoring
- private AppCompatCapability getAppCompatCapability() {
- return mActivityRecord.mAppCompatController.getAppCompatCapability();
+ private AppCompatOverrides getAppCompatOverrides() {
+ return mActivityRecord.mAppCompatController.getAppCompatOverrides();
}
/**
@@ -983,7 +983,7 @@ final class LetterboxUiController {
@VisibleForTesting
boolean shouldShowLetterboxUi(WindowState mainWindow) {
- if (getAppCompatCapability().getAppCompatOrientationCapability()
+ if (getAppCompatOverrides().getAppCompatOrientationOverrides()
.getIsRelaunchingAfterRequestedOrientationChanged()) {
return mLastShouldShowLetterboxUi;
}
@@ -1144,7 +1144,7 @@ final class LetterboxUiController {
}
boolean getIsRelaunchingAfterRequestedOrientationChanged() {
- return getAppCompatCapability().getAppCompatOrientationCapability()
+ return getAppCompatOverrides().getAppCompatOrientationOverrides()
.getIsRelaunchingAfterRequestedOrientationChanged();
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationCapabilityTest.java b/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationOverridesTest.java
index 55e66a1b3556..1720b64f558b 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationCapabilityTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppCompatOrientationOverridesTest.java
@@ -23,8 +23,8 @@ import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTAT
import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;
-import static com.android.server.wm.AppCompatOrientationCapability.OrientationCapabilityState.MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP;
-import static com.android.server.wm.AppCompatOrientationCapability.OrientationCapabilityState.SET_ORIENTATION_REQUEST_COUNTER_TIMEOUT_MS;
+import static com.android.server.wm.AppCompatOrientationOverrides.OrientationOverridesState.MIN_COUNT_TO_IGNORE_REQUEST_IN_LOOP;
+import static com.android.server.wm.AppCompatOrientationOverrides.OrientationOverridesState.SET_ORIENTATION_REQUEST_COUNTER_TIMEOUT_MS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -49,14 +49,14 @@ import java.util.function.Consumer;
import java.util.function.IntConsumer;
/**
- * Test class for {@link AppCompatOrientationCapability}.
+ * Test class for {@link AppCompatOrientationOverrides}.
* <p>
* Build/Install/Run:
- * atest WmTests:AppCompatOrientationCapabilityTest
+ * atest WmTests:AppCompatOrientationOverridesTest
*/
@Presubmit
@RunWith(WindowTestRunner.class)
-public class AppCompatOrientationCapabilityTest extends WindowTestsBase {
+public class AppCompatOrientationOverridesTest extends WindowTestsBase {
@Rule
public TestRule compatChangeRule = new PlatformCompatChangeRule();
@@ -257,19 +257,19 @@ public class AppCompatOrientationCapabilityTest extends WindowTestsBase {
/**
* Runs a test scenario providing a Robot.
*/
- void runTestScenario(@NonNull Consumer<OrientationCapabilityRobotTest> consumer) {
+ void runTestScenario(@NonNull Consumer<OrientationOverridesRobotTest> consumer) {
spyOn(mWm.mLetterboxConfiguration);
- final OrientationCapabilityRobotTest robot =
- new OrientationCapabilityRobotTest(mWm, mAtm, mSupervisor);
+ final OrientationOverridesRobotTest robot =
+ new OrientationOverridesRobotTest(mWm, mAtm, mSupervisor);
consumer.accept(robot);
}
- private static class OrientationCapabilityRobotTest extends AppCompatRobotBase {
+ private static class OrientationOverridesRobotTest extends AppCompatRobotBase {
@NonNull
private final CurrentTimeMillisSupplierFake mTestCurrentTimeMillisSupplier;
- OrientationCapabilityRobotTest(@NonNull WindowManagerService wm,
+ OrientationOverridesRobotTest(@NonNull WindowManagerService wm,
@NonNull ActivityTaskManagerService atm,
@NonNull ActivityTaskSupervisor supervisor) {
super(wm, atm, supervisor);
@@ -277,12 +277,12 @@ public class AppCompatOrientationCapabilityTest extends WindowTestsBase {
}
void prepareRelaunchingAfterRequestedOrientationChanged(boolean enabled) {
- getTopOrientationCapability().setRelaunchingAfterRequestedOrientationChanged(enabled);
+ getTopOrientationOverrides().setRelaunchingAfterRequestedOrientationChanged(enabled);
}
// Useful to reduce timeout during tests
void prepareMockedTime() {
- getTopOrientationCapability().mOrientationCapabilityState.mCurrentTimeMillisSupplier =
+ getTopOrientationOverrides().mOrientationOverridesState.mCurrentTimeMillisSupplier =
mTestCurrentTimeMillisSupplier;
}
@@ -292,21 +292,21 @@ public class AppCompatOrientationCapabilityTest extends WindowTestsBase {
void checkShouldIgnoreRequestedOrientation(boolean expected,
@Configuration.Orientation int requestedOrientation) {
- assertEquals(expected, getTopOrientationCapability()
+ assertEquals(expected, getTopOrientationOverrides()
.shouldIgnoreRequestedOrientation(requestedOrientation));
}
void checkExpectedLoopCount(int expectedCount) {
- assertEquals(expectedCount, getTopOrientationCapability()
+ assertEquals(expectedCount, getTopOrientationOverrides()
.getSetOrientationRequestCounter());
}
void checkShouldNotIgnoreOrientationLoop() {
- assertFalse(getTopOrientationCapability().shouldIgnoreOrientationRequestLoop());
+ assertFalse(getTopOrientationOverrides().shouldIgnoreOrientationRequestLoop());
}
void checkShouldIgnoreOrientationLoop() {
- assertTrue(getTopOrientationCapability().shouldIgnoreOrientationRequestLoop());
+ assertTrue(getTopOrientationOverrides().shouldIgnoreOrientationRequestLoop());
}
void checkRequestLoop(IntConsumer consumer) {
@@ -321,9 +321,9 @@ public class AppCompatOrientationCapabilityTest extends WindowTestsBase {
}
}
- private AppCompatOrientationCapability getTopOrientationCapability() {
- return activity().top().mAppCompatController.getAppCompatCapability()
- .getAppCompatOrientationCapability();
+ private AppCompatOrientationOverrides getTopOrientationOverrides() {
+ return activity().top().mAppCompatController.getAppCompatOverrides()
+ .getAppCompatOrientationOverrides();
}
}
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-26 23:54:09 +0000