From 85b467bf3f7a483512ca8485c9c18254d460b079 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Wed, 29 Feb 2012 15:38:46 -0800 Subject: Fixing animation bug when moving an icon to an adjacent screen Change-Id: I42eed5240bb23689285da8afdd37a1228e4cc486 --- src/com/android/launcher2/Workspace.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/com/android/launcher2') diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 0624d7491..d8c8645c4 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -2313,8 +2313,9 @@ public class Workspace extends SmoothPagedView 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; -- cgit v1.2.3