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

Merge "Fix NPE with disabled overflow." into rvc-dev

Browse Source
This commit is contained in:
Josh Tsuji
2020-03-13 14:38:20 +00:00
committed by Android (Google) Code Review
parent 75e2ea6bb4 a2433db0ab
commit 25eee749f9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -424,6 +424,7 @@ public class BubbleStackView extends FrameLayout {
private int mOrientation = Configuration.ORIENTATION_UNDEFINED;
@Nullable
private BubbleOverflow mBubbleOverflow;
private boolean mShouldShowUserEducation;
@@ -1387,7 +1388,7 @@ public class BubbleStackView extends FrameLayout {
Log.d(TAG, "onBubbleDragStart: bubble=" + bubble);
}
if (bubble.equals(mBubbleOverflow.getIconView())) {
if (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView())) {
return;
}
@@ -1403,7 +1404,8 @@ public class BubbleStackView extends FrameLayout {
/** Called with the coordinates to which an individual bubble has been dragged. */
public void onBubbleDragged(View bubble, float x, float y) {
if (!mIsExpanded || mIsExpansionAnimating || bubble.equals(mBubbleOverflow.getIconView())) {
if (!mIsExpanded || mIsExpansionAnimating
|| (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView()))) {
return;
}
@@ -1418,7 +1420,8 @@ public class BubbleStackView extends FrameLayout {
Log.d(TAG, "onBubbleDragFinish: bubble=" + bubble);
}
if (!mIsExpanded || mIsExpansionAnimating || bubble.equals(mBubbleOverflow.getIconView())) {
if (!mIsExpanded || mIsExpansionAnimating
|| (mBubbleOverflow != null && bubble.equals(mBubbleOverflow.getIconView()))) {
return;
}