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