From db1d2e882009e1144ac2fac4786fa9c74af9e211 Mon Sep 17 00:00:00 2001 From: Joshua Tsuji Date: Tue, 10 Mar 2020 15:09:08 -0400 Subject: [PATCH] Resolve difference between master and rvc-dev. Test: atest SystemUITests Change-Id: I288b95af7e964c5b69f7e3c027d9d0c19aa81299 Bug: 151171515 --- .../src/com/android/systemui/bubbles/BubbleStackView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java index e8acbabe980d8..aedd2db738ee0 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java @@ -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. */