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

Commit a81e601a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 9fb2079f cd5591a7

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);

    }