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

Commit 9a1fb275 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Follow changes for MagneticTarget.Listener to pass the dragged object" into main

parents 0190ea3e 31f53abe

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();

            }

        });