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

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

Change-Id: I3312fd095bcdfde209c65ffe7f262d1acd5314b2
This commit is contained in:
TreeHugger Robot
2020-06-15 11:14:27 +00:00
committed by Automerger Merge Worker

View File

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