| commit | 1cbb2bec7d5d785d5d1ab95f0304233609e2d88e | [log] [tgz] |
|---|---|---|
| author | Federico Baron <fbaron@google.com> | Wed Jan 04 23:51:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 04 23:51:25 2023 +0000 |
| tree | d8165d0ad79e1d211a7be1bd4be0cdecf5cf536f | |
| parent | 6a7b45937d8f585e5c4ad98d5f956aa5338ba9f2 [diff] | |
| parent | e80898c6f1b3862d8ad2f466ae9cdfea8c2ed351 [diff] |
Merge "Fix bug where dragging icons in folders causes error" into tm-qpr-dev am: 7cb0133d84 am: e80898c6f1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20806533 Change-Id: I6c92b40e5e25b4fba30ecdf6d7b3afd8fc810a3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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) {