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

Commit 142ec05f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix testGlobalActions_doesntStealImeControl" into rvc-dev am:... 

Merge "Merge "Fix testGlobalActions_doesntStealImeControl" into rvc-dev am: ccd0d1e0 am: 5898a771" into rvc-d1-dev-plus-aosp am: 17541fb4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851473

Change-Id: I92bee04a67df5528bd359aef7e36de410ede4327
parents 69176e99 17541fb4

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() {