diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt index 3bff58beeb..745c689541 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt @@ -531,7 +531,7 @@ constructor( bubbleStashController.getStashedHandlePhysicsAnimator().cancelIfRunning() resetBubbleBarPropertiesOnInterrupt() bubbleStashController.onNewBubbleAnimationInterrupted( - /* isStashed= */ bubbleBarView.alpha == 0f, + /* isStashed= */ bubbleStashController.isStashed, bubbleBarView.translationY, ) } 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 44070cf35d..5471072872 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 @@ -240,6 +240,7 @@ class BubbleBarViewAnimatorTest { // verify the hide bubble animation is pending assertThat(animatorScheduler.delayedBlock).isNotNull() + whenever(bubbleStashController.isStashed).thenReturn(true) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.onStashStateChangingWhileAnimating() } @@ -249,7 +250,7 @@ class BubbleBarViewAnimatorTest { assertThat(animator.isAnimating).isFalse() assertThat(bubbleBarView.scaleX).isEqualTo(1) assertThat(bubbleBarView.scaleY).isEqualTo(1) - verify(bubbleStashController).onNewBubbleAnimationInterrupted(any(), any()) + verify(bubbleStashController).onNewBubbleAnimationInterrupted(eq(true), any()) // PhysicsAnimatorTestUtils posts the cancellation to the main thread so we need to wait // again