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

Commit 31f53abe authored by Mady Mellor's avatar Mady Mellor
Browse files

Follow changes for MagneticTarget.Listener to pass the dragged object 

Flag: None; bug fix
Test: atest MagnetizedObjectTest MenuViewLayerTest DragToInteractAnimationControllerTest
Test: manual - drag and dismiss bubbles while stack is expanded
                 - drag and dismiss the stack
Bug: 315127709

Change-Id: I74d6711d822ea8873f468b1a4745d45937b81ef9
parent 422b9739

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleDismissController.java

+5 −2
Original line number Diff line number Diff line
@@ -185,20 +185,23 @@ public class BubbleDismissController { 
        }

        mMagnetizedObject.setMagnetListener(new MagnetizedObject.MagnetListener() {

            @Override

            public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) {

            public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target,

                    @NonNull MagnetizedObject<?> draggedObject) {

                if (mAnimator == null) return;

                mAnimator.animateDismissCaptured();

            }



            @Override

            public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target,

                    @NonNull MagnetizedObject<?> draggedObject,

                    float velX, float velY, boolean wasFlungOut) {

                if (mAnimator == null) return;

                mAnimator.animateDismissReleased();

            }



            @Override

            public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) {

            public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target,

                    @NonNull MagnetizedObject<?> draggedObject) {

                dismissMagnetizedObject();

            }

        });