diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java index bf4c605534..e014326b24 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarViewController.java @@ -282,7 +282,7 @@ public class BubbleBarViewController { mBarView.setController(new BubbleBarView.Controller() { @Override public float getBubbleBarTranslationY() { - return mBubbleStashController.getBubbleBarTranslationY(); + return mBubbleStashController.getTargetTranslationYForState(); } @Override diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleStashController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleStashController.kt index ec272ac873..56622020e8 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleStashController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/BubbleStashController.kt @@ -186,12 +186,14 @@ interface BubbleStashController { fun getHandleViewAlpha(): MultiPropertyFactory.MultiProperty? = null /** - * Returns bubble bar Y position according to [isBubblesShowingOnHome] and - * [isBubblesShowingOnOverview] values. Default implementation only analyse - * [isBubblesShowingOnHome] and return translationY to align with the hotseat vertical center. - * For Other cases align bubbles with the taskbar. + * Default implementation only analyse [isBubblesShowingOnHome] and return value is equal to + * [targetTranslationYForState]. */ val bubbleBarTranslationY: Float + get() = targetTranslationYForState + + /** Returns bubble bar Y target position according to [isBubblesShowingOnHome] value. */ + val targetTranslationYForState: Float get() = if (isBubblesShowingOnHome) { bubbleBarTranslationYForHotseat diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashController.kt b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashController.kt index 1309070f81..5c8746cb8b 100644 --- a/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashController.kt +++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/stashing/PersistentBubbleStashController.kt @@ -104,6 +104,10 @@ class PersistentBubbleStashController( return -bubbleBarVerticalCenterForHome + bubbleBarHeight / 2 } + /** + * Returns bubble bar Y target position according to [isBubblesShowingOnHome] value. Value could + * be adjusted to the display override progress. + */ override val bubbleBarTranslationY: Float get() = if (inAppDisplayOverrideProgress > 0f && launcherState == BubbleLauncherState.HOME) { @@ -116,7 +120,7 @@ class PersistentBubbleStashController( Interpolators.LINEAR, ) } else { - super.bubbleBarTranslationY + targetTranslationYForState } override var inAppDisplayOverrideProgress: Float = 0f