Merge "Fix testGlobalActions_doesntStealImeControl" into rvc-dev am: ccd0d1e05d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851473 Change-Id: I04c914a6908565636b694aca0b0db1d8f7387727
This commit is contained in:
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user