diff options
author | Tony Wickham <twickham@google.com> | 2015-12-04 14:21:19 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-12-04 14:21:19 -0800 |
commit | 11c45f114165330ea9c895ca6fdf83fdaa2e5fad (patch) | |
tree | ad7606d0d7309af50df5bacf10cf404d6c490445 /src/com/android/launcher3/dragndrop | |
parent | 92b3397711a05481793ea71b7d90da8813feda7a (diff) | |
parent | 8db5d7ca60e79f007bfce7952c15c74d0ee44bc0 (diff) | |
download | android_packages_apps_Trebuchet-11c45f114165330ea9c895ca6fdf83fdaa2e5fad.tar.gz android_packages_apps_Trebuchet-11c45f114165330ea9c895ca6fdf83fdaa2e5fad.tar.bz2 android_packages_apps_Trebuchet-11c45f114165330ea9c895ca6fdf83fdaa2e5fad.zip |
Merge "Add appropriate (tiny) offset to widget drops so they land correctly." into ub-launcher3-burnaby-polish
am: 8db5d7ca60
* commit '8db5d7ca60e79f007bfce7952c15c74d0ee44bc0':
Add appropriate (tiny) offset to widget drops so they land correctly.
Diffstat (limited to 'src/com/android/launcher3/dragndrop')
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 4 | ||||
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragView.java | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index adcc12cb6..1fcb5234e 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -578,10 +578,6 @@ public class DragLayer extends InsettableFrameLayout { resizeFrame.snapToWidget(false); } - public void animateViewIntoPosition(DragView dragView, final View child) { - animateViewIntoPosition(dragView, child, null, null); - } - public void animateViewIntoPosition(DragView dragView, final int[] pos, float alpha, float scaleX, float scaleY, int animationEndStyle, Runnable onFinishRunnable, int duration) { diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java index f663d00d1..01189d0e9 100644 --- a/src/com/android/launcher3/dragndrop/DragView.java +++ b/src/com/android/launcher3/dragndrop/DragView.java @@ -329,10 +329,10 @@ public class DragView extends View { setTranslationY(touchY - mRegistrationY); // Post the animation to skip other expensive work happening on the first frame post(new Runnable() { - public void run() { - mAnim.start(); - } - }); + public void run() { + mAnim.start(); + } + }); } public void cancelAnimation() { |