commit | 9a94452dbc8f479997c0cad3ade3abe7a722d7b3 | [log] [tgz] |
---|---|---|
author | Vadim Tryshev <vadimt@google.com> | Mon Jan 29 10:59:36 2024 -0800 |
committer | Vadim Tryshev <vadimt@google.com> | Mon Jan 29 11:00:55 2024 -0800 |
tree | 7b6898dd4f88eb02b4314e67fa6c1695244c41f2 | |
parent | 53eb01bcb5121d8b6e5fe5ebec4234e21a0a118c [diff] |
Verifying that keyguard is invisible before pressing Home in PortraitLandscapeRunner Bug: 285935417 Test: presubmit Flag: N/A Change-Id: I8c525b99e7dc434f0b68aad59a18908f4253b29b
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);