diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java index 1a51861b36..33d8a8430f 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java @@ -495,11 +495,6 @@ public class BubbleBarController extends IBubblesListener.Stub { () -> mBubbleBarViewController.animateBubbleBarLocation(bubbleBarLocation)); } - /** Notifies WMShell to show the expanded view. */ - void showExpandedView() { - mSystemUiProxy.showExpandedView(); - } - // // Loading data for the bubbles // diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java index 17ccfc56eb..3261262621 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java @@ -119,8 +119,7 @@ public class BubbleBarViewController { mBubbleDragController = bubbleControllers.bubbleDragController; mTaskbarStashController = controllers.taskbarStashController; mTaskbarInsetsController = controllers.taskbarInsetsController; - mBubbleBarViewAnimator = new BubbleBarViewAnimator( - mBarView, mBubbleStashController, mBubbleBarController::showExpandedView); + mBubbleBarViewAnimator = new BubbleBarViewAnimator(mBarView, mBubbleStashController); mTaskbarViewPropertiesProvider = taskbarViewPropertiesProvider; onBubbleBarConfigurationChanged(/* animate= */ false); mActivity.addOnDeviceProfileChangeListener( 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 99c50f248d..2ed88d83f1 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/animation/BubbleBarViewAnimator.kt @@ -36,7 +36,6 @@ class BubbleBarViewAnimator constructor( private val bubbleBarView: BubbleBarView, private val bubbleStashController: BubbleStashController, - private val onExpanded: Runnable, private val scheduler: Scheduler = HandlerScheduler(bubbleBarView) ) { @@ -407,7 +406,7 @@ constructor( springBackAnimation.spring(DynamicAnimation.TRANSLATION_Y, ty) springBackAnimation.addEndListener { _, _, _, _, _, _, _ -> if (animatingBubble?.expand == true) { - expandBubbleBar() + bubbleBarView.isExpanded = true cancelHideAnimation() } else { moveToState(AnimatingBubble.State.IN) @@ -418,7 +417,7 @@ constructor( ObjectAnimator.ofFloat(bubbleBarView, View.TRANSLATION_Y, ty - bubbleBarBounceDistanceInPx) .withDuration(BUBBLE_BAR_BOUNCE_ANIMATION_DURATION_MS) .withEndAction { - if (animatingBubble?.expand == true) expandBubbleBar() + if (animatingBubble?.expand == true) bubbleBarView.isExpanded = true springBackAnimation.start() } .start() @@ -452,7 +451,7 @@ constructor( this.animatingBubble = animatingBubble.copy(expand = true) // if we're fully in and waiting to hide, cancel the hide animation and clean up if (animatingBubble.state == AnimatingBubble.State.IN) { - expandBubbleBar() + bubbleBarView.isExpanded = true cancelHideAnimation() } } @@ -490,11 +489,6 @@ constructor( this.animatingBubble = animatingBubble.copy(state = state) } - private fun expandBubbleBar() { - bubbleBarView.isExpanded = true - onExpanded.run() - } - /** * Tracks the translation Y of the bubble bar during the animation. When the bubble bar expands * as part of the animation, the expansion should start after the bubble bar reaches the peak @@ -516,7 +510,7 @@ constructor( } val expand = animatingBubble?.expand ?: false if (reachedPeak && expand && !startedExpanding) { - expandBubbleBar() + bubbleBarView.isExpanded = true startedExpanding = true } previousTy = ty diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index fb19aa27a0..59e9f054c8 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -923,17 +923,6 @@ public class SystemUiProxy implements ISystemUiProxy, NavHandle, SafeCloseable { } } - /** Tells SysUI to show the expanded view. */ - public void showExpandedView() { - try { - if (mBubbles != null) { - mBubbles.showExpandedView(); - } - } catch (RemoteException e) { - Log.w(TAG, "Failed to call showExpandedView"); - } - } - // // Splitscreen // 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 7928ce92b4..4da06e1286 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 @@ -64,7 +64,6 @@ class BubbleBarViewAnimatorTest { private lateinit var bubble: BubbleBarBubble private lateinit var bubbleBarView: BubbleBarView private lateinit var bubbleStashController: BubbleStashController - private val onExpandedNoOp = Runnable {} @Before fun setUp() { @@ -82,12 +81,7 @@ class BubbleBarViewAnimatorTest { whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpandedNoOp, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleInForStashed(bubble, isExpanding = false) @@ -131,12 +125,7 @@ class BubbleBarViewAnimatorTest { whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpandedNoOp, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleInForStashed(bubble, isExpanding = false) @@ -179,12 +168,7 @@ class BubbleBarViewAnimatorTest { whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpandedNoOp, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleInForStashed(bubble, isExpanding = false) @@ -224,12 +208,7 @@ class BubbleBarViewAnimatorTest { whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpandedNoOp, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleInForStashed(bubble, isExpanding = false) @@ -270,12 +249,7 @@ class BubbleBarViewAnimatorTest { whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpandedNoOp, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleInForStashed(bubble, isExpanding = false) @@ -304,15 +278,8 @@ class BubbleBarViewAnimatorTest { val handleAnimator = PhysicsAnimator.getInstance(handle) whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleInForStashed(bubble, isExpanding = true) @@ -336,7 +303,6 @@ class BubbleBarViewAnimatorTest { assertThat(animatorScheduler.delayedBlock).isNull() verify(bubbleStashController).showBubbleBarImmediate() - assertThat(notifiedExpanded).isTrue() } @Test @@ -348,15 +314,8 @@ class BubbleBarViewAnimatorTest { val handleAnimator = PhysicsAnimator.getInstance(handle) whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleInForStashed(bubble, isExpanding = false) @@ -386,7 +345,6 @@ class BubbleBarViewAnimatorTest { .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) verifyBubbleBarIsExpandedWithTranslation(BAR_TRANSLATION_Y_FOR_TASKBAR) assertThat(animator.isAnimating).isFalse() - assertThat(notifiedExpanded).isTrue() } @Test @@ -398,15 +356,8 @@ class BubbleBarViewAnimatorTest { val handleAnimator = PhysicsAnimator.getInstance(handle) whenever(bubbleStashController.getStashedHandlePhysicsAnimator()).thenReturn(handleAnimator) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleInForStashed(bubble, isExpanding = false) @@ -433,7 +384,6 @@ class BubbleBarViewAnimatorTest { .isEqualTo(DIFF_BETWEEN_HANDLE_AND_BAR_CENTERS + BAR_TRANSLATION_Y_FOR_TASKBAR) verifyBubbleBarIsExpandedWithTranslation(BAR_TRANSLATION_Y_FOR_TASKBAR) assertThat(animator.isAnimating).isFalse() - assertThat(notifiedExpanded).isTrue() } @Test @@ -450,12 +400,7 @@ class BubbleBarViewAnimatorTest { val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpandedNoOp, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateToInitialState(bubble, isInApp = true, isExpanding = false) @@ -497,15 +442,8 @@ class BubbleBarViewAnimatorTest { val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateToInitialState(bubble, isInApp = true, isExpanding = true) @@ -521,7 +459,6 @@ class BubbleBarViewAnimatorTest { assertThat(animatorScheduler.delayedBlock).isNull() verify(bubbleStashController).showBubbleBarImmediate() - assertThat(notifiedExpanded).isTrue() } @Test @@ -534,12 +471,7 @@ class BubbleBarViewAnimatorTest { val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpandedNoOp, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateToInitialState(bubble, isInApp = false, isExpanding = false) @@ -570,15 +502,8 @@ class BubbleBarViewAnimatorTest { whenever(bubbleStashController.bubbleBarTranslationY) .thenReturn(BAR_TRANSLATION_Y_FOR_HOTSEAT) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateToInitialState(bubble, isInApp = false, isExpanding = false) @@ -608,7 +533,6 @@ class BubbleBarViewAnimatorTest { verifyBubbleBarIsExpandedWithTranslation(BAR_TRANSLATION_Y_FOR_HOTSEAT) assertThat(animator.isAnimating).isFalse() verify(bubbleStashController).showBubbleBarImmediate() - assertThat(notifiedExpanded).isTrue() } @Test @@ -618,15 +542,8 @@ class BubbleBarViewAnimatorTest { whenever(bubbleStashController.bubbleBarTranslationY) .thenReturn(BAR_TRANSLATION_Y_FOR_HOTSEAT) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateToInitialState(bubble, isInApp = false, isExpanding = false) @@ -649,7 +566,6 @@ class BubbleBarViewAnimatorTest { verifyBubbleBarIsExpandedWithTranslation(BAR_TRANSLATION_Y_FOR_HOTSEAT) assertThat(animator.isAnimating).isFalse() - assertThat(notifiedExpanded).isTrue() } @Test @@ -662,12 +578,7 @@ class BubbleBarViewAnimatorTest { val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpandedNoOp, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleBarForCollapsed(bubble, isExpanding = false) @@ -706,15 +617,8 @@ class BubbleBarViewAnimatorTest { val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleBarForCollapsed(bubble, isExpanding = true) @@ -741,7 +645,6 @@ class BubbleBarViewAnimatorTest { assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) assertThat(bubbleBarView.isExpanded).isTrue() verify(bubbleStashController).showBubbleBarImmediate() - assertThat(notifiedExpanded).isTrue() } @Test @@ -753,15 +656,8 @@ class BubbleBarViewAnimatorTest { val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleBarForCollapsed(bubble, isExpanding = false) @@ -799,7 +695,6 @@ class BubbleBarViewAnimatorTest { assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) assertThat(bubbleBarView.isExpanded).isTrue() verify(bubbleStashController).showBubbleBarImmediate() - assertThat(notifiedExpanded).isTrue() } @Test @@ -811,15 +706,8 @@ class BubbleBarViewAnimatorTest { val barAnimator = PhysicsAnimator.getInstance(bubbleBarView) - var notifiedExpanded = false - val onExpanded = Runnable { notifiedExpanded = true } val animator = - BubbleBarViewAnimator( - bubbleBarView, - bubbleStashController, - onExpanded, - animatorScheduler - ) + BubbleBarViewAnimator(bubbleBarView, bubbleStashController, animatorScheduler) InstrumentationRegistry.getInstrumentation().runOnMainSync { animator.animateBubbleBarForCollapsed(bubble, isExpanding = false) @@ -854,7 +742,6 @@ class BubbleBarViewAnimatorTest { assertThat(bubbleBarView.translationY).isEqualTo(BAR_TRANSLATION_Y_FOR_HOTSEAT) assertThat(bubbleBarView.isExpanded).isTrue() verify(bubbleStashController).showBubbleBarImmediate() - assertThat(notifiedExpanded).isTrue() } private fun setUpBubbleBar() {