Merge "Resolve difference between master and rvc-dev." into rvc-dev am:... (23d9438b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1386,13 +1386,14 @@ public class BubbleStackView extends FrameLayout {
		if (DEBUG_BUBBLE_STACK_VIEW) {
		Log.d(TAG, "onBubbleDragStart: bubble=" + bubble);
		}
		maybeShowManageEducation(false);
		mExpandedAnimationController.prepareForBubbleDrag(bubble, mMagneticTarget);

		// We're dragging an individual bubble, so set the magnetized object to the magnetized
		// bubble.
		mMagnetizedObject = mExpandedAnimationController.getMagnetizedBubbleDraggingOut();
		mMagnetizedObject.setMagnetListener(mIndividualBubbleMagnetListener);

		maybeShowManageEducation(false);
		}

		/** Called with the coordinates to which an individual bubble has been dragged. */