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

Don't allow the overflow bubble to be dragged out.

Browse Source 
Test: Try and fail to drag out the overflow bubble. Also quick-fling it towards where the dismiss target would be and observe that sysui doesn't crash.
Fixes: 149870727
Change-Id: I23fdfa3a9b0e1b3722704bfc28d5ef42c3bf66c4
This commit is contained in:
Joshua Tsuji
2020-03-04 15:04:59 -05:00
parent 7be4c6166b
commit bc7744b995
1 changed files with 7 additions and 2 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

@@ -1386,6 +1386,11 @@ public class BubbleStackView extends FrameLayout {
if (DEBUG_BUBBLE_STACK_VIEW) {
Log.d(TAG, "onBubbleDragStart: bubble=" + bubble);
}
if (bubble.equals(mBubbleOverflow.getIconView())) {
return;
}
mExpandedAnimationController.prepareForBubbleDrag(bubble, mMagneticTarget);
// We're dragging an individual bubble, so set the magnetized object to the magnetized
@@ -1398,7 +1403,7 @@ 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) {
if (!mIsExpanded || mIsExpansionAnimating || bubble.equals(mBubbleOverflow.getIconView())) {
return;
}
@@ -1413,7 +1418,7 @@ public class BubbleStackView extends FrameLayout {
Log.d(TAG, "onBubbleDragFinish: bubble=" + bubble);
}
if (!mIsExpanded || mIsExpansionAnimating) {
if (!mIsExpanded || mIsExpansionAnimating || bubble.equals(mBubbleOverflow.getIconView())) {
return;
}