Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5485f40 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I2f5a0576d96ec72705259124bf2490907d09fc6f
parents 9de9cb8e dea08002

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -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. */