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

Commit 4e86ce6e authored by Sean Pont's avatar Sean Pont
Browse files

Fix testGlobalActions_doesntStealImeControl 

GlobalActionsDialogTests was not tearing down correctly for lock screen
tests. Calling showOrHideDialog a second time cleans things up.

Fixes: 158580670
Test: atest GlobalActionsDialogTest
Test: atest SystemUITests
Test: atest com.android.systemui.globalactions.GlobalActionsImeTest

Change-Id: I15fbe1ddc4a1c6d0d5c112c2e066e2c964d0e04b
parent a56a27a9

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

+9 −0
Original line number Diff line number Diff line
@@ -438,6 +438,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase { 
        GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog;

        assertThat(dialog).isNotNull();

        assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.VISIBLE);



        // Dismiss the dialog so that it does not pollute other tests

        mGlobalActionsDialog.showOrHideDialog(false, true, mWalletPlugin);

    }



    @Test
@@ -455,6 +458,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase { 
        GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog;

        assertThat(dialog).isNotNull();

        assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.GONE);



        // Dismiss the dialog so that it does not pollute other tests

        mGlobalActionsDialog.showOrHideDialog(false, true, mWalletPlugin);

    }



    @Test
@@ -473,6 +479,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase { 
        GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog;

        assertThat(dialog).isNotNull();

        assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.GONE);



        // Dismiss the dialog so that it does not pollute other tests

        mGlobalActionsDialog.showOrHideDialog(false, true, mWalletPlugin);

    }



    private void setupDefaultActions() {