diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-12 20:42:55 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-07-12 20:42:55 +0000 |
commit | 9bbf650cec01f7d6adcc538bf7f45bc5d7052fcc (patch) | |
tree | 2b31971981c39bf9a95dd89e8c4e1f3d1e689bfc | |
parent | 1460b424dbfa86c66b673f5d6fa9a13fe2f738d3 (diff) | |
parent | 8232c33f810d4958b13dde1f1185e4af62a6bc8b (diff) | |
download | cts-sparse-8822691-L25800000955658153.tar.gz |
Merge "Snap for 8822138 from 944f9b57a3996c0ff6a265857e0855327752b6ea to android12L-tests-release" into android12L-tests-releasesparse-8822691-L25800000955658153
3 files changed, 15 insertions, 16 deletions
diff --git a/tests/framework/base/windowmanager/AndroidManifest.xml b/tests/framework/base/windowmanager/AndroidManifest.xml index 181fe06bddc..326cdfd7222 100644 --- a/tests/framework/base/windowmanager/AndroidManifest.xml +++ b/tests/framework/base/windowmanager/AndroidManifest.xml @@ -302,6 +302,7 @@ android:configChanges="orientation|screenLayout|keyboard|keyboardHidden|navigation" android:showWhenLocked="true"/> <activity android:name="android.server.wm.WindowInsetsPolicyTest$TestActivity" + android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout" android:turnScreenOn="true" android:showWhenLocked="true"/> <activity android:name="android.server.wm.WindowInsetsPolicyTest$FullscreenTestActivity"/> @@ -309,8 +310,6 @@ <activity android:name="android.server.wm.WindowInsetsPolicyTest$ImmersiveFullscreenTestActivity" android:documentLaunchMode="always" android:theme="@style/no_animation"/> - <activity android:name="android.server.wm.WindowInsetsPolicyTest$NaturalOrientationTestActivity" - android:screenOrientation="nosensor"/> <activity android:name="android.server.wm.LayoutTests$TestActivity" android:theme="@style/no_animation"/> <activity android:name="android.server.wm.LocationOnScreenTests$TestActivity" diff --git a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java index 1ba667290e4..65522734bcd 100644 --- a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java @@ -171,6 +171,7 @@ public class StartActivityTests extends ActivityManagerTestBase { getLaunchActivityBuilder() .setTargetActivity(LAUNCHING_ACTIVITY) .setUseInstrumentation() + .setWaitForLaunched(false) .execute(); // make sure TEST_ACTIVITY is still on top and resumed diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsPolicyTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsPolicyTest.java index a3b504ead70..ab057d7db78 100644 --- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsPolicyTest.java +++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsPolicyTest.java @@ -18,8 +18,8 @@ package android.server.wm; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; import static android.server.wm.app.Components.LAUNCHING_ACTIVITY; -import static android.view.Display.DEFAULT_DISPLAY; import static android.view.Surface.ROTATION_0; +import static android.view.Surface.ROTATION_180; import static android.view.Surface.ROTATION_90; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; @@ -88,11 +88,6 @@ public class WindowInsetsPolicyTest extends ActivityManagerTestBase { new ActivityTestRule<>(ImmersiveFullscreenTestActivity.class, false /* initialTouchMode */, false /* launchActivity */); - @Rule - public final ActivityTestRule<NaturalOrientationTestActivity> mNaturalOrientationTestActivity = - new ActivityTestRule<>(NaturalOrientationTestActivity.class, - false /* initialTouchMode */, false /* launchActivity */); - @Before @Override public void setUp() throws Exception { @@ -129,16 +124,20 @@ public class WindowInsetsPolicyTest extends ActivityManagerTestBase { assumeTrue("Skipping test: no split multi-window support", supportsSplitScreenMultiWindow()); - launchAndWait(mNaturalOrientationTestActivity); - mWmState.computeState(new ComponentName[] {}); - final boolean naturalOrientationPortrait = - mWmState.getDisplay(DEFAULT_DISPLAY) - .mFullConfiguration.orientation == ORIENTATION_PORTRAIT; - + final TestActivity activity = launchAndWait(mTestActivity); + final int rotation = activity.getDisplay().getRotation(); + final boolean isPortrait = activity.getResources().getConfiguration() + .orientation == ORIENTATION_PORTRAIT; final RotationSession rotationSession = createManagedRotationSession(); - rotationSession.set(naturalOrientationPortrait ? ROTATION_90 : ROTATION_0); + if (isPortrait) { + // Rotate to landscape. + rotationSession.set(rotation == ROTATION_0 || rotation == ROTATION_180 + ? ROTATION_90 : ROTATION_0); + } else { + // Keep in landscape. + rotationSession.set(rotation); + } - final TestActivity activity = launchAndWait(mTestActivity); mWmState.waitForValidState(mTestActivityComponentName); final int taskId = mWmState.getTaskByActivity(mTestActivityComponentName).mTaskId; launchActivityInPrimarySplit(LAUNCHING_ACTIVITY); |