diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-02-29 15:38:46 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-02-29 15:38:46 -0800 |
| commit | 85b467bf3f7a483512ca8485c9c18254d460b079 (patch) | |
| tree | f7e53917482b204b34fcd7883d4c00972b87c9dd /src | |
| parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
| download | android_packages_apps_Trebuchet-85b467bf3f7a483512ca8485c9c18254d460b079.tar.gz android_packages_apps_Trebuchet-85b467bf3f7a483512ca8485c9c18254d460b079.tar.bz2 android_packages_apps_Trebuchet-85b467bf3f7a483512ca8485c9c18254d460b079.zip | |
Fixing animation bug when moving an icon to an adjacent screen
Change-Id: I42eed5240bb23689285da8afdd37a1228e4cc486
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 5 |
1 files changed, 3 insertions, 2 deletions
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; |