From a2ef1a02384181ca17ae48f4bab14ec375006845 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Wed, 19 May 2021 09:38:35 -0700 Subject: [PATCH] Remove min/max values for RectFSpringAnim2. - Fixes crash on landscape - We added this to stop the windows from going way out of bounds. But we no longer need it since we've tightened up the stiffness so that it would take a super aggressive swipe/high velocity for the window to go out of bounds Bug: 188617892 Test: manual Change-Id: Icc2a0af0a1b26985502ddbc7a5a370e7eecdb346 --- .../src/com/android/quickstep/util/RectFSpringAnim2.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java index 97be2b1787..edd3dc3e29 100644 --- a/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java +++ b/quickstep/src/com/android/quickstep/util/RectFSpringAnim2.java @@ -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)