mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-20 19:38:21 +00:00
Merge "Remove min/max values for RectFSpringAnim2." into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ee43020d0b
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user