diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-15 14:34:05 -0700 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-05 23:03:34 -0700 |
| commit | 8a6a85b913ec57b792bc4bcf850bf18433e602bf (patch) | |
| tree | 23cfbb3e0eb346e6eec12298bc88a473033d87d1 /src/com/android/launcher3/DragLayer.java | |
| parent | abf9b9bf847eba0231d03b3c4a7ffddcff728825 (diff) | |
| download | android_packages_apps_Trebuchet-8a6a85b913ec57b792bc4bcf850bf18433e602bf.tar.gz android_packages_apps_Trebuchet-8a6a85b913ec57b792bc4bcf850bf18433e602bf.tar.bz2 android_packages_apps_Trebuchet-8a6a85b913ec57b792bc4bcf850bf18433e602bf.zip | |
Fix drop animation issue in springloaded
Change-Id: I1d8bf9d92ab7b94238e3e6a27b0eebf2c9af6872
Diffstat (limited to 'src/com/android/launcher3/DragLayer.java')
| -rw-r--r-- | src/com/android/launcher3/DragLayer.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/launcher3/DragLayer.java b/src/com/android/launcher3/DragLayer.java index 14c08b65d..12aa321fa 100644 --- a/src/com/android/launcher3/DragLayer.java +++ b/src/com/android/launcher3/DragLayer.java @@ -483,7 +483,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang } public void animateViewIntoPosition(DragView dragView, final View child) { - animateViewIntoPosition(dragView, child, null); + animateViewIntoPosition(dragView, child, null, null); } public void animateViewIntoPosition(DragView dragView, final int[] pos, float alpha, @@ -499,8 +499,8 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang } public void animateViewIntoPosition(DragView dragView, final View child, - final Runnable onFinishAnimationRunnable) { - animateViewIntoPosition(dragView, child, -1, onFinishAnimationRunnable, null); + final Runnable onFinishAnimationRunnable, View anchorView) { + animateViewIntoPosition(dragView, child, -1, onFinishAnimationRunnable, anchorView); } public void animateViewIntoPosition(DragView dragView, final View child, int duration, @@ -648,8 +648,10 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang int x = (int) (fromLeft + Math.round(((to.left - fromLeft) * motionPercent))); int y = (int) (fromTop + Math.round(((to.top - fromTop) * motionPercent))); - int xPos = x - mDropView.getScrollX() + (mAnchorView != null - ? (mAnchorViewInitialScrollX - mAnchorView.getScrollX()) : 0); + int anchorAdjust = mAnchorView == null ? 0 : (int) (mAnchorView.getScaleX() * + (mAnchorViewInitialScrollX - mAnchorView.getScrollX())); + + int xPos = x - mDropView.getScrollX() + anchorAdjust; int yPos = y - mDropView.getScrollY(); mDropView.setTranslationX(xPos); |