Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix testGlobalActions_doesntStealImeControl" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-15 11:11:56 +00:00
committed by Android (Google) Code Review
parent 65ddf5fa17 4e86ce6ee2
commit ccd0d1e05d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,6 +438,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase {
GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog; GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog;
assertThat(dialog).isNotNull(); assertThat(dialog).isNotNull();
assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.VISIBLE); assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.VISIBLE);
// Dismiss the dialog so that it does not pollute other tests
mGlobalActionsDialog.showOrHideDialog(false, true, mWalletPlugin);
} }
@Test @Test
@@ -455,6 +458,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase {
GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog; GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog;
assertThat(dialog).isNotNull(); assertThat(dialog).isNotNull();
assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.GONE); assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.GONE);
// Dismiss the dialog so that it does not pollute other tests
mGlobalActionsDialog.showOrHideDialog(false, true, mWalletPlugin);
} }
@Test @Test
@@ -473,6 +479,9 @@ public class GlobalActionsDialogTest extends SysuiTestCase {
GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog; GlobalActionsDialog.ActionsDialog dialog = mGlobalActionsDialog.mDialog;
assertThat(dialog).isNotNull(); assertThat(dialog).isNotNull();
assertThat(dialog.mLockMessageContainer.getVisibility()).isEqualTo(View.GONE); 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() { private void setupDefaultActions() {