diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-03-02 11:16:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-02 11:16:16 -0800 |
| commit | 7f1435c303f71ad2a31f91040801e2d05dd36c29 (patch) | |
| tree | 6263ac21d25c1a6c4e8617135fe2bc99c1074fb0 /src/com/android/launcher2 | |
| parent | 50bdd86957f9c462980908246d2faa0701a9eca7 (diff) | |
| parent | 85b467bf3f7a483512ca8485c9c18254d460b079 (diff) | |
| download | android_packages_apps_Trebuchet-7f1435c303f71ad2a31f91040801e2d05dd36c29.tar.gz android_packages_apps_Trebuchet-7f1435c303f71ad2a31f91040801e2d05dd36c29.tar.bz2 android_packages_apps_Trebuchet-7f1435c303f71ad2a31f91040801e2d05dd36c29.zip | |
Merge "Fixing animation bug when moving an icon to an adjacent screen"
Diffstat (limited to 'src/com/android/launcher2')
| -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 dffaf896c..7948948d1 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; |