diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-09-12 14:36:30 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-09-12 14:37:46 -0700 |
| commit | d139b0aa7d03f676dc7869dc5b39fd9f24ff0a1d (patch) | |
| tree | 95ceabb5b61bac8bb4f7cd4588047ad90ca3704c /src/com/android/launcher3/ButtonDropTarget.java | |
| parent | 1e35fbbac778a973fefd2f6e0061d4ece8aeff2b (diff) | |
| download | android_packages_apps_Trebuchet-d139b0aa7d03f676dc7869dc5b39fd9f24ff0a1d.tar.gz android_packages_apps_Trebuchet-d139b0aa7d03f676dc7869dc5b39fd9f24ff0a1d.tar.bz2 android_packages_apps_Trebuchet-d139b0aa7d03f676dc7869dc5b39fd9f24ff0a1d.zip | |
Adding support for multiwindow drag and drop
Change-Id: I95b46e3c3f1238307d3ef5a6c81a8e530ba0987a
Diffstat (limited to 'src/com/android/launcher3/ButtonDropTarget.java')
| -rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 2dde7caa6..cf8abae2e 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -259,7 +259,8 @@ public abstract class ButtonDropTarget extends TextView } }; dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f, - DRAG_VIEW_DROP_DURATION, new DecelerateInterpolator(2), + mLauncher.getDragController().isExternalDrag() ? 1 : DRAG_VIEW_DROP_DURATION, + new DecelerateInterpolator(2), new LinearInterpolator(), onAnimationEndRunnable, DragLayer.ANIMATION_END_DISAPPEAR, null); } |