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

Merge "Resolve difference between master and rvc-dev." into rvc-dev am: dea08002fa

Browse Source 
Change-Id: I5e040f2db898c2f05d48e2cdb5b4acdcd7087805
This commit is contained in:
Automerger Merge Worker
2020-03-10 21:15:05 +00:00
parent 94417e0f59 dea08002fa
commit b7b93fbec5
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1386,13 +1386,14 @@ public class BubbleStackView extends FrameLayout {
if (DEBUG_BUBBLE_STACK_VIEW) { if (DEBUG_BUBBLE_STACK_VIEW) {
Log.d(TAG, "onBubbleDragStart: bubble=" + bubble); Log.d(TAG, "onBubbleDragStart: bubble=" + bubble);
} }
maybeShowManageEducation(false);
mExpandedAnimationController.prepareForBubbleDrag(bubble, mMagneticTarget); mExpandedAnimationController.prepareForBubbleDrag(bubble, mMagneticTarget);
// We're dragging an individual bubble, so set the magnetized object to the magnetized // We're dragging an individual bubble, so set the magnetized object to the magnetized
// bubble. // bubble.
mMagnetizedObject = mExpandedAnimationController.getMagnetizedBubbleDraggingOut(); mMagnetizedObject = mExpandedAnimationController.getMagnetizedBubbleDraggingOut();
mMagnetizedObject.setMagnetListener(mIndividualBubbleMagnetListener); mMagnetizedObject.setMagnetListener(mIndividualBubbleMagnetListener);
maybeShowManageEducation(false);
} }
/** Called with the coordinates to which an individual bubble has been dragged. */ /** Called with the coordinates to which an individual bubble has been dragged. */