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

Commit a547cf76 authored by Behnam Heydarshahi's avatar Behnam Heydarshahi Committed by Android (Google) Code Review
Browse files

Merge "Instantly collapse shade on shutdown ui" into main

parents fa4df86f dd2f7284

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class GlobalActionsImpl implements GlobalActions, CommandQueue.Callbacks 
    @Override

    public void showShutdownUi(boolean isReboot, String reason) {

        mShutdownUi.showShutdownUi(isReboot, reason);

        mShadeController.collapseShade();

        mShadeController.instantCollapseShade();

    }

    @Override

    public void disable(int displayId, int state1, int state2, boolean animate) {

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsImplTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ class GlobalActionsImplTest : SysuiTestCase() { 
    fun testShutdown_collapsesShade() {

        underTest.showShutdownUi(false, "test")



        verify(shadeController).collapseShade()

        verify(shadeController).instantCollapseShade()

    }



    @Test

    fun testReboot_collapsesShade() {

        underTest.showShutdownUi(true, "test")



        verify(shadeController).collapseShade()

        verify(shadeController).instantCollapseShade()

    }

}