Merge "Fix bubble update animation" into main (c79119e9) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -394,7 +394,8 @@ public class BubbleBarController extends IBubblesListener.Stub {
		BubbleBarBubble bb = mBubbles.get(update.updatedBubble.getKey());
		// If we're not stashed, we're visible so animate
		bb.getView().updateDotVisibility(!mBubbleStashController.isStashed() /* animate */);
		mBubbleBarViewController.animateBubbleNotification(bb, /* isExpanding= */ false);
		mBubbleBarViewController.animateBubbleNotification(
		bb, /* isExpanding= / false, / isUpdate= */ true);
		}
		if (update.bubbleKeysInOrder != null && !update.bubbleKeysInOrder.isEmpty()) {
		// Create the new list

+5 −4

Original line number	Diff line number	Diff line
		@@ -400,7 +400,7 @@ public class BubbleBarViewController {
		addedBubble.getView().setOnClickListener(mBubbleClickListener);
		mBubbleDragController.setupBubbleView(addedBubble.getView());
		if (!suppressAnimation) {
		animateBubbleNotification(addedBubble, isExpanding);
		animateBubbleNotification(addedBubble, isExpanding, /* isUpdate= */ true);
		}
		}

		@@ -428,18 +428,19 @@ public class BubbleBarViewController {
		}
		return;
		}
		animateBubbleNotification(bubble, isExpanding);
		animateBubbleNotification(bubble, isExpanding, /* isUpdate= */ true);
		} else {
		Log.w(TAG, "addBubble, bubble was null!");
		}
		}

		/** Animates the bubble bar to notify the user about a bubble change. */
		public void animateBubbleNotification(BubbleBarBubble bubble, boolean isExpanding) {
		public void animateBubbleNotification(BubbleBarBubble bubble, boolean isExpanding,
		boolean isUpdate) {
		boolean isInApp = mTaskbarStashController.isInApp();
		// if this is the first bubble, animate to the initial state. one bubble is the overflow
		// so check for at most 2 children.
		if (mBarView.getChildCount() <= 2) {
		if (mBarView.getChildCount() <= 2 && !isUpdate) {
		mBubbleBarViewAnimator.animateToInitialState(bubble, isInApp, isExpanding);
		return;
		}