Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash when opening bubble overflow" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-28 02:04:09 +00:00
committed by Android (Google) Code Review
parent aa62588560 0122cc904f
commit 141b5e79c3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflow.java
View File

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

4
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

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