Fix handle color when interrupting the animation

Pass the correct stash value to the controller after interrupting
an ongoing animation due to stash state changing. We previously
incorrectly passed a value that depended on the alpha value of the
bubble bar. This allows sampling to happen and for the handle to
have the correct color.

Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 377604151
Test: atest BubbleBarViewAnimatorTest
Test: manual
       1. Create 1+ bubble
       2. Receive new message and see the flyout
       3. Open an app immediately (Don't wait until the flyout disappear)
Change-Id: I739bcbd8fe4f7e02285244d78d7159c571be1ec2
This commit is contained in:
Liran Binyamin
2024-12-05 16:32:01 -05:00
parent 0bcafa66d4
commit b94fce457e
2 changed files with 3 additions and 2 deletions

View File

@@ -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