commit 85b467bf3f7a483512ca8485c9c18254d460b079
author Adam Cohen <adamcohen@google.com> Wed Feb 29 15:38:46 2012 -0800
committer Adam Cohen <adamcohen@google.com> Wed Feb 29 15:38:46 2012 -0800
tree f7e53917482b204b34fcd7883d4c00972b87c9dd
parent ca83eeb0919b690350d86a9562f58a5a56d196bf

Fixing animation bug when moving an icon to an adjacent screen

Change-Id: I42eed5240bb23689285da8afdd37a1228e4cc486

src/com/android/launcher2/Workspace.java

diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 0624d74..d8c8645 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;