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

Merge "Temporary fix DialogLaunchAnimatorTest#testShowDialogFromView" into sc-v2-dev am: d7b0a36294

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

Change-Id: Idde6c8d69dbe24f89d44df16092150ba9f78c8a9
This commit is contained in:
Jordan Demeulenaere
2021-11-12 10:57:28 +00:00
committed by Automerger Merge Worker
parent 1572daff43 d7b0a36294
commit c35d7beb06
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/tests/src/com/android/systemui/animation/DialogLaunchAnimatorTest.kt
View File

@@ -86,7 +86,14 @@ class DialogLaunchAnimatorTest : SysuiTestCase() {
assertFalse(dialog.isShowing) assertFalse(dialog.isShowing)
assertFalse(dialog.onStopCalled) assertFalse(dialog.onStopCalled)
runOnMainThreadAndWaitForIdleSync { dialog.dismiss() } runOnMainThreadAndWaitForIdleSync {
// TODO(b/204561691): Remove this call to disableAllCurrentDialogsExitAnimations() and
// make sure that the test still pass on git_master/cf_x86_64_phone-userdebug in
// Forrest.
dialogLaunchAnimator.disableAllCurrentDialogsExitAnimations()
dialog.dismiss()
}
assertFalse(hostDialog.isShowing) assertFalse(hostDialog.isShowing)
assertFalse(dialog.isShowing) assertFalse(dialog.isShowing)
assertTrue(hostDialog.wasDismissed) assertTrue(hostDialog.wasDismissed)