| commit | a41fc4e4adec3723f19fa10c3c256a26675a4667 | [log] [tgz] |
|---|---|---|
| author | Vadim Tryshev <vadimt@google.com> | Tue Jan 30 20:47:27 2024 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 30 20:47:27 2024 +0000 |
| tree | d69f9101a83805d222010e9d369b50fecf151827 | |
| parent | fbf3393faf906ec7d147e9b53340661ed8b70474 [diff] | |
| parent | 9a94452dbc8f479997c0cad3ade3abe7a722d7b3 [diff] |
Merge "Verifying that keyguard is invisible before pressing Home in PortraitLandscapeRunner" into main
diff --git a/tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 79d8c60..f0d2e20 100644 --- a/tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -370,7 +370,8 @@ Assert.assertTrue("Setup wizard is still visible", wizardDismissed); } - private static void verifyKeyguardInvisible() { + /** Asserts that keyguard is not visible */ + public static void verifyKeyguardInvisible() { final boolean keyguardAlreadyVisible = sSeenKeyguard; sSeenKeyguard = sSeenKeyguard
diff --git a/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java b/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java index d94e4a5..3a54915 100644 --- a/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java +++ b/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
@@ -44,6 +44,7 @@ @Override public void evaluate() throws Throwable { try { + AbstractLauncherUiTest.verifyKeyguardInvisible(); mTest.mDevice.pressHome(); mTest.waitForLauncherCondition("Launcher activity wasn't created", launcher -> launcher != null);