Merge "Fix flake in BubbleBarViewAnimatorTest" into main
diff --git a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt
index 5471072..2f773b3 100644
--- a/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt
+++ b/quickstep/tests/multivalentTests/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimatorTest.kt
@@ -245,6 +245,10 @@
animator.onStashStateChangingWhileAnimating()
}
+ // The physics animation test util posts the cancellation to the looper thread, so we have
+ // to wait again and let it finish.
+ InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
// verify that the hide animation was canceled
assertThat(animatorScheduler.delayedBlock).isNull()
assertThat(animator.isAnimating).isFalse()
@@ -1296,7 +1300,7 @@
animator.animateBubbleInForStashed(updatedBubble, isExpanding = false)
}
- // since animation was interrupted there shouldn`t be additional calls to adjust window
+ // since animation was interrupted there shouldn't be additional calls to adjust window
assertThat(bubbleBarParentViewController.timesInvoked).isEqualTo(1)
InstrumentationRegistry.getInstrumentation().runOnMainSync {}