commit 169c1f5fe242a3042f04e4a762f0bd595731c2e5
author Eric Fischer <enf@google.com> Fri Mar 02 11:44:59 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 02 11:44:59 2012 -0800
tree 247431662001b26bb8561fea962e699045ff3d29
parent 7f1435c303f71ad2a31f91040801e2d05dd36c29
parent ee10efd08a54cf841023c215f9736199a42e45f9

Merge "Import translations. DO NOT MERGE"

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index dffaf89..7948948 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2313,8 +2313,9 @@
                     animateWidgetDrop(info, parent, d.dragView,
                             onCompleteRunnable, animationType, cell, false);
                 } else {
-                    mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, cell,
-                            onCompleteRunnable);
+                    int duration = snapScreen < 0 ? -1 : ADJACENT_SCREEN_DROP_DURATION;
+                    mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, cell, duration,
+                            onCompleteRunnable, this);
                 }
             } else {
                 d.deferDragViewCleanupPostAnimation = false;