Merge "Check bubble count for initial state animation" into main

This commit is contained in:
Liran Binyamin
2024-08-20 14:08:14 +00:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 4 deletions
@@ -1320,7 +1320,7 @@ public class BubbleBarView extends FrameLayout {
}
/** Returns the child count excluding the overflow if it's present. */
private int getBubbleChildCount() {
int getBubbleChildCount() {
return hasOverflow() ? getChildCount() - 1 : getChildCount();
}
@@ -583,9 +583,8 @@ public class BubbleBarViewController {
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 && !isUpdate) {
// if this is the first bubble, animate to the initial state.
if (mBarView.getBubbleChildCount() == 1 && !isUpdate) {
mBubbleBarViewAnimator.animateToInitialState(bubble, isInApp, isExpanding);
return;
}