commit 7cb0133d8444c4859691f943c17183f1c9679e79
author Federico Baron <fbaron@google.com> Wed Jan 04 23:22:36 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 04 23:22:36 2023 +0000
tree 338b13aa6e2b107b7cdbfd82199a6e9e4e7c7e29
parent 19aeae3e66c8d082ad05f9013d45e03994eed951
parent 7f823d10b4882c62ccee9540decd94bcb7c987df

Merge "Fix bug where dragging icons in folders causes error" into tm-qpr-dev

src/com/android/launcher3/dragndrop/DragView.java

diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 09fe740..f54d05d 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -568,7 +568,8 @@
                     .setSpring(new SpringForce(0)
                             .setDampingRatio(DAMPENING_RATIO)
                             .setStiffness(STIFFNESS));
-            mDelta = view.getResources().getDisplayMetrics().density * PARALLAX_MAX_IN_DP;
+            mDelta = Math.min(
+                    range, view.getResources().getDisplayMetrics().density * PARALLAX_MAX_IN_DP);
         }
 
         public void animateToPos(float value) {