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

Commit 8d4401ad authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix crash when opening bubble overflow" into rvc-dev am: 141b5e79 am:... 

Merge "Fix crash when opening bubble overflow" into rvc-dev am: 141b5e79 am: 7f121c0d am: 9456f3e5

Change-Id: I15435ecf4362ebb46ca033d38213ab622d2cf659
parents 426a9f7e 9456f3e5

packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflow.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -62,11 +62,12 @@ public class BubbleOverflow implements BubbleViewProvider { 
                R.dimen.bubble_overflow_icon_bitmap_size);

                R.dimen.bubble_overflow_icon_bitmap_size);

    }

    }





    public void setUpOverflow(ViewGroup parentViewGroup) {

    void setUpOverflow(ViewGroup parentViewGroup, BubbleStackView stackView) {

        mOverflowExpandedView = (BubbleExpandedView) mInflater.inflate(

        mOverflowExpandedView = (BubbleExpandedView) mInflater.inflate(

                R.layout.bubble_expanded_view, parentViewGroup /* root */,

                R.layout.bubble_expanded_view, parentViewGroup /* root */,

                false /* attachToRoot */);

                false /* attachToRoot */);

        mOverflowExpandedView.setOverflow(true);

        mOverflowExpandedView.setOverflow(true);

        mOverflowExpandedView.setStackView(stackView);





        updateIcon(mContext, parentViewGroup);

        updateIcon(mContext, parentViewGroup);

    }

    }

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -522,8 +522,8 @@ public class BubbleStackView extends FrameLayout { 
    private void setUpOverflow() {

    private void setUpOverflow() {

        int overflowBtnIndex = 0;

        int overflowBtnIndex = 0;

        if (mBubbleOverflow == null) {

        if (mBubbleOverflow == null) {

            mBubbleOverflow = new BubbleOverflow(mContext);

            mBubbleOverflow = new BubbleOverflow(getContext());

            mBubbleOverflow.setUpOverflow(this);

            mBubbleOverflow.setUpOverflow(mBubbleContainer, this);

        } else {

        } else {

            mBubbleContainer.removeView(mBubbleOverflow.getBtn());

            mBubbleContainer.removeView(mBubbleOverflow.getBtn());

            mBubbleOverflow.updateIcon(mContext, this);

            mBubbleOverflow.updateIcon(mContext, this);