Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd5591a7 authored by Liran Binyamin's avatar Liran Binyamin
Browse files

Don't remove the overflow from the bubble bar 

When a new bubble is added to the bar and we're over the limit
remove the second to last bubble instead of the overflow.

This change also updates the key of the overflow bubble to
match the one in wmshell.

Bug: 287121592
Test: manual - Add 6 bubbles to the bubble bar
             - The overflow bubble should still be there
Change-Id: Ibd3ab73be5d3afb49f771a1925ebda2c45b55136
parent 3b9c6546

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarItem.kt

+1 −1
Original line number Diff line number Diff line
@@ -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)

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

+3 −1
Original line number Diff line number Diff line
@@ -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);

    }