Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cbb2bec authored by Federico Baron's avatar Federico Baron Committed by Automerger Merge Worker
Browse files

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

Merge "Fix bug where dragging icons in folders causes error" into tm-qpr-dev am: 7cb0133d am: e80898c6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20806533



Change-Id: I6c92b40e5e25b4fba30ecdf6d7b3afd8fc810a3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a7b4593 e80898c6

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -568,7 +568,8 @@ public abstract class DragView<T extends Context & ActivityContext> extends Fram 
                    .setSpring(new SpringForce(0)

                    .setSpring(new SpringForce(0)

                            .setDampingRatio(DAMPENING_RATIO)

                            .setDampingRatio(DAMPENING_RATIO)

                            .setStiffness(STIFFNESS));

                            .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) {

        public void animateToPos(float value) {