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

Commit cc9c9c10 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "If DismissDragToEdge is disabled, don't show Magnetized target."

parents 7bfa9de2 7aeac460

packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java

+6 −2
Original line number Diff line number Diff line
@@ -272,7 +272,9 @@ public class PipTouchHandler { 


        mMagnetizedPip.setAnimateStuckToTarget(

                (target, velX, velY, flung, after) -> {

                    if (mEnableDismissDragToEdge) {

                        mMotionHelper.animateIntoDismissTarget(target, velX, velY, flung, after);

                    }

                    return Unit.INSTANCE;

                });

        mMagnetizedPip.setMagnetListener(new MagnetizedObject.MagnetListener() {
@@ -280,8 +282,10 @@ public class PipTouchHandler { 
            public void onStuckToTarget(@NonNull MagnetizedObject.MagneticTarget target) {

                // Show the dismiss target, in case the initial touch event occurred within the

                // magnetic field radius.

                if (mEnableDismissDragToEdge) {

                    showDismissTargetMaybe();

                }

            }



            @Override

            public void onUnstuckFromTarget(@NonNull MagnetizedObject.MagneticTarget target,