Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a41fc4e4 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Verifying that keyguard is invisible before pressing Home in... 

Merge "Verifying that keyguard is invisible before pressing Home in PortraitLandscapeRunner" into main
parents fbf3393f 9a94452d

tests/multivalentTests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java

+2 −1
Original line number Diff line number Diff line
@@ -370,7 +370,8 @@ public abstract class AbstractLauncherUiTest { 
        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

tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class PortraitLandscapeRunner implements TestRule { 
            @Override

            public void evaluate() throws Throwable {

                try {

                    AbstractLauncherUiTest.verifyKeyguardInvisible();

                    mTest.mDevice.pressHome();

                    mTest.waitForLauncherCondition("Launcher activity wasn't created",

                            launcher -> launcher != null);