Merge cherrypicks of [14647401, 14647577, 14647578, 14647582, 14649097] into sc-v2-release

Change-Id: Ie9da3ba73f48094af3f3e097cf89685f07ff9de6
This commit is contained in:
android-build-team Robot
2021-05-19 22:26:50 +00:00
@@ -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)