Merge "Don't remove the overflow from the bubble bar" into udc-qpr-dev

This commit is contained in:
Treehugger Robot
2023-06-20 16:29:03 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 2 deletions

View File

@@ -34,4 +34,4 @@ data class BubbleBarBubble(
) : BubbleBarItem(info.key, view)
/** Represents the overflow bubble in the bubble bar. */
data class BubbleBarOverflow(override val view: BubbleView) : BubbleBarItem("overflow", view)
data class BubbleBarOverflow(override val view: BubbleView) : BubbleBarItem("Overflow", view)

View File

@@ -150,7 +150,9 @@ public class BubbleBarView extends FrameLayout {
@Override
public void addView(View child, int index, ViewGroup.LayoutParams params) {
if (getChildCount() + 1 > MAX_BUBBLES) {
removeViewInLayout(getChildAt(getChildCount() - 1));
// the last child view is the overflow bubble and we shouldn't remove that. remove the
// second to last child view.
removeViewInLayout(getChildAt(getChildCount() - 2));
}
super.addView(child, index, params);
}