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

Commit 254dcfd5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only take vertical, upward velocity into account for escaping the... 

Merge "Only take vertical, upward velocity into account for escaping the dismiss target." into rvc-dev
parents ab2b90ef 4ca06c1e

packages/SystemUI/src/com/android/systemui/util/magnetictarget/MagnetizedObject.kt

+5 −4
Original line number Original line Diff line number Diff line
@@ -241,7 +241,7 @@ abstract class MagnetizedObject<T : Any>( 
     * to the target. If this velocity is reached, the object will be freed even if it wasn't moved

     * to the target. If this velocity is reached, the object will be freed even if it wasn't moved

     * outside the magnetic field radius.

     * outside the magnetic field radius.

     */

     */

    var flingUnstuckFromTargetMinVelocity = 1000f

    var flingUnstuckFromTargetMinVelocity = 4000f





    /**

    /**

     * Sets the maximum X velocity above which the object will not stick to the target. Even if the

     * Sets the maximum X velocity above which the object will not stick to the target. Even if the
@@ -414,9 +414,10 @@ abstract class MagnetizedObject<T : Any>( 
            cancelAnimations()

            cancelAnimations()





            if (objectStuckToTarget) {

            if (objectStuckToTarget) {

                if (hypot(velX, velY) > flingUnstuckFromTargetMinVelocity) {

                if (-velY > flingUnstuckFromTargetMinVelocity) {

                    // If the object is stuck, but it was forcefully flung away from the target,

                    // If the object is stuck, but it was forcefully flung away from the target in

                    // tell the listener so the object can be animated out of the target.

                    // the upward direction, tell the listener so the object can be animated out of

                    // the target.

                    magnetListener.onUnstuckFromTarget(

                    magnetListener.onUnstuckFromTarget(

                            targetObjectIsStuckTo!!, velX, velY, wasFlungOut = true)

                            targetObjectIsStuckTo!!, velX, velY, wasFlungOut = true)

                } else {

                } else {