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

Commit 9756a008 authored by Chris Wren's avatar Chris Wren
Browse files

add westworld log to global actions dismiss 

Bug: 147508238
Test: atest GlobalActionsDialogTest
Change-Id: Ic4a1893a20c686d059d0cd93ffd98df18f5b1ab6
parent e0ae189f

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

+6 −1
Original line number Diff line number Diff line
@@ -206,7 +206,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
    @VisibleForTesting

    protected final ArrayList<Action> mOverflowItems = new ArrayList<>();



    private ActionsDialog mDialog;

    @VisibleForTesting

    protected ActionsDialog mDialog;



    private Action mSilentModeAction;

    private ToggleAction mAirplaneModeOn;
@@ -246,6 +247,9 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        @UiEvent(doc = "The global actions / power menu surface became visible on the screen.")

        GA_POWER_MENU_OPEN(337),



        @UiEvent(doc = "The global actions / power menu surface was dismissed.")

        GA_POWER_MENU_CLOSE(471),



        @UiEvent(doc = "The global actions bugreport button was pressed.")

        GA_BUGREPORT_PRESS(344),
@@ -1168,6 +1172,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        if (mDialog == dialog) {

            mDialog = null;

        }

        mUiEventLogger.log(GlobalActionsEvent.GA_POWER_MENU_CLOSE);

        mWindowManagerFuncs.onGlobalActionsHidden();

        mLifecycle.setCurrentState(Lifecycle.State.DESTROYED);

    }

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java

+8 −1
Original line number Diff line number Diff line
@@ -156,12 +156,19 @@ public class GlobalActionsDialogTest extends SysuiTestCase { 
    }



    @Test

    public void testShouldLogVisibility() {

    public void testShouldLogShow() {

        mGlobalActionsDialog.onShow(null);

        mTestableLooper.processAllMessages();

        verifyLogPosted(GlobalActionsDialog.GlobalActionsEvent.GA_POWER_MENU_OPEN);

    }



    @Test

    public void testShouldLogDismiss() {

        mGlobalActionsDialog.onDismiss(mGlobalActionsDialog.mDialog);

        mTestableLooper.processAllMessages();

        verifyLogPosted(GlobalActionsDialog.GlobalActionsEvent.GA_POWER_MENU_CLOSE);

    }



    @Test

    public void testShouldLogBugreportPress() throws InterruptedException {

        GlobalActionsDialog.BugReportAction bugReportAction =