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

Commit 9995737d authored by Daria Evdokimova's avatar Daria Evdokimova
Browse files

DO NOT MERGE Mirroring merge conflict resolution from mnc-dev 

ag/692970

Change-Id: I5155777a29a6c6dd08bd7d9c9d0f15857642670e
parent b49f1356

src/com/android/deskclock/widget/sgv/OverScrollerSGV.java

+1 −3
Original line number Diff line number Diff line
@@ -176,9 +176,7 @@ public class OverScrollerSGV { 
     * @return The original velocity less the deceleration, norm of the X and Y velocity vector.

     */

    public float getCurrVelocity() {

        float squaredNorm = mScrollerX.mCurrVelocity * mScrollerX.mCurrVelocity;

        squaredNorm += mScrollerY.mCurrVelocity * mScrollerY.mCurrVelocity;

        return (float) Math.sqrt(squaredNorm);

        return (float) Math.hypot(mScrollerX.mCurrVelocity, mScrollerY.mCurrVelocity);

    }



    /**