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

Commit ee43020d authored by Jonathan Miranda's avatar Jonathan Miranda Committed by Android (Google) Code Review
Browse files

Merge "Remove min/max values for RectFSpringAnim2." into sc-dev

parents 2c216332 a2ef1a02

quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java

+0 −8
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import androidx.dynamicanimation.animation.FloatPropertyCompat; 
import androidx.dynamicanimation.animation.SpringAnimation;

import androidx.dynamicanimation.animation.SpringForce;



import com.android.launcher3.DeviceProfile;

import com.android.launcher3.InvariantDeviceProfile;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.util.DynamicResource;
@@ -193,12 +191,8 @@ public class RectFSpringAnim2 extends RectFSpringAnim { 
     * @param velocityPxPerMs Velocity of swipe in px/ms.

     */

    public void start(Context context, PointF velocityPxPerMs) {

        DeviceProfile dp = InvariantDeviceProfile.INSTANCE.get(context).getDeviceProfile(context);



        mRectXAnim = new SpringAnimation(this, RECT_CENTER_X)

                .setStartValue(mCurrentCenterX)

                .setMinValue(Math.min(0, mCurrentCenterX))

                .setMaxValue(Math.max(dp.widthPx, mCurrentCenterX))

                .setStartVelocity(velocityPxPerMs.x * 1000)

                .setSpring(new SpringForce(mTargetX)

                        .setStiffness(mXStiffness)
@@ -210,8 +204,6 @@ public class RectFSpringAnim2 extends RectFSpringAnim { 


        mRectYAnim = new SpringAnimation(this, RECT_Y)

                .setStartValue(mCurrentCenterY)

                .setMinValue(Math.min(0, mCurrentCenterY))

                .setMaxValue(Math.max(dp.heightPx, mCurrentCenterY))

                .setStartVelocity(velocityPxPerMs.y * 1000)

                .setSpring(new SpringForce(mTargetY)

                        .setStiffness(mYStiffness)