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

Commit 9735f28d authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update test for aod transition" into main

parents 0fb96767 538fd855

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+22 −18
Original line number Diff line number Diff line
@@ -2631,10 +2631,19 @@ public class DisplayContentTests extends WindowTestsBase { 
        final BooleanSupplier keyguardGoingAway = () -> keyguard.isKeyguardGoingAway(displayId);

        final BooleanSupplier appVisible = activity::isVisibleRequested;



        // Begin locked and in AOD

        // Begin unlocked.

        keyguard.setKeyguardShown(displayId, false /* keyguard */, false /* aod */);

        transitions.flush();



        // Lock and go to AOD.

        keyguard.setKeyguardShown(displayId, true /* keyguard */, true /* aod */);

        assertFalse(keyguardGoingAway.getAsBoolean());

        assertFalse(appVisible.getAsBoolean());

        if (Flags.aodTransition()) {

            assertThat(transitions.mLastTransit).flags().contains(TRANSIT_FLAG_AOD_APPEARING);

        } else {

            assertThat(transitions.mLastTransit).flags().doesNotContain(TRANSIT_FLAG_AOD_APPEARING);

        }

        transitions.flush();



        // Start unlocking from AOD.
@@ -2654,14 +2663,7 @@ public class DisplayContentTests extends WindowTestsBase { 
        keyguard.setKeyguardShown(displayId, true /* keyguard */, false /* aod */);

        assertTrue(keyguardGoingAway.getAsBoolean());

        assertTrue(appVisible.getAsBoolean());



        if (Flags.aodTransition()) {

            assertThat(transitions.mLastTransit).flags()

                    .containsExactly(TRANSIT_FLAG_AOD_APPEARING);

        } else {

        assertThat(transitions.mLastTransit).isNull();

        }

        transitions.flush();



        // Finish unlock

        keyguard.setKeyguardShown(displayId, false /* keyguard */, false /* aod */);
@@ -2684,10 +2686,19 @@ public class DisplayContentTests extends WindowTestsBase { 
        final BooleanSupplier keyguardGoingAway = () -> keyguard.isKeyguardGoingAway(displayId);

        final BooleanSupplier appVisible = activity::isVisibleRequested;



        // Begin locked and in AOD

        // Begin unlocked.

        keyguard.setKeyguardShown(displayId, false /* keyguard */, false /* aod */);

        transitions.flush();



        // Lock and go to AOD.

        keyguard.setKeyguardShown(displayId, true /* keyguard */, true /* aod */);

        assertFalse(keyguardGoingAway.getAsBoolean());

        assertFalse(appVisible.getAsBoolean());

        if (Flags.aodTransition()) {

            assertThat(transitions.mLastTransit).flags().contains(TRANSIT_FLAG_AOD_APPEARING);

        } else {

            assertThat(transitions.mLastTransit).flags().doesNotContain(TRANSIT_FLAG_AOD_APPEARING);

        }

        transitions.flush();



        // Start unlocking from AOD.
@@ -2705,14 +2716,7 @@ public class DisplayContentTests extends WindowTestsBase { 
        keyguard.setKeyguardShown(displayId, true /* keyguard */, false /* aod */);

        assertTrue(keyguardGoingAway.getAsBoolean());

        assertTrue(appVisible.getAsBoolean());



        if (Flags.aodTransition()) {

            assertThat(transitions.mLastTransit).flags()

                    .containsExactly(TRANSIT_FLAG_AOD_APPEARING);

        } else {

        assertThat(transitions.mLastTransit).isNull();

        }

        transitions.flush();



        // Same API call a second time cancels the unlock, because AOD isn't changing.

        keyguard.setKeyguardShown(displayId, true /* keyguard */, false /* aod */);