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

Merge changes I23fdfa3a,Ibe43fd74 into rvc-dev am: 49f0b3e281

Browse Source 
Change-Id: Ibdf6cc5f79dfccbcc52581f03376c2ddd1aa15ae
This commit is contained in:
Automerger Merge Worker
2020-03-11 21:59:00 +00:00
parent 03678599df 49f0b3e281
commit 5b5d16db31
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
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;
}
@@ -1421,6 +1426,18 @@ public class BubbleStackView extends FrameLayout {
hideDismissTarget();
}
/** Expands the clicked bubble. */
public void expandBubble(Bubble bubble) {
if (bubble.equals(mBubbleData.getSelectedBubble())) {
// If the bubble we're supposed to expand is the selected bubble, that means the
// overflow bubble is currently expanded. Don't tell BubbleData to set this bubble as
// selected, since it already is. Just call the stack's setSelectedBubble to expand it.
setSelectedBubble(bubble);
} else {
mBubbleData.setSelectedBubble(bubble);
}
}
void onDragStart() {
if (DEBUG_BUBBLE_STACK_VIEW) {
Log.d(TAG, "onDragStart()");

2
packages/SystemUI/src/com/android/systemui/bubbles/BubbleTouchHandler.java
View File

@@ -189,7 +189,7 @@ class BubbleTouchHandler implements View.OnTouchListener {
if (key == BubbleOverflow.KEY) {
mStack.showOverflow();
} else {
mBubbleData.setSelectedBubble(mBubbleData.getBubbleWithKey(key));
mStack.expandBubble(mBubbleData.getBubbleWithKey(key));
}
}
resetForNextGesture();