diff options
| author | Winson Chung <winsonc@google.com> | 2012-05-08 14:17:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 14:17:14 -0700 |
| commit | 7112d5dbdf1861227499ecb509b1a12343215f92 (patch) | |
| tree | 9997a8618cc6811542917cf1a486e8ed18771c43 /src | |
| parent | c76b0646efe2c58fef82159461e3350f69904583 (diff) | |
| parent | 2c4cf411f6c30fb2bfb47d2b13b680bda7a266dc (diff) | |
| download | android_packages_apps_Trebuchet-7112d5dbdf1861227499ecb509b1a12343215f92.tar.gz android_packages_apps_Trebuchet-7112d5dbdf1861227499ecb509b1a12343215f92.tar.bz2 android_packages_apps_Trebuchet-7112d5dbdf1861227499ecb509b1a12343215f92.zip | |
Merge "Do not defer removing the drag view if we don't animate the item back into the folder. (Bug 6249514)" into jb-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Folder.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java index 36913ca6a..e8f1ac96b 100644 --- a/src/com/android/launcher2/Folder.java +++ b/src/com/android/launcher2/Folder.java @@ -978,6 +978,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList if (d.dragView.hasDrawn()) { mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, mCurrentDragView); } else { + d.deferDragViewCleanupPostAnimation = false; mCurrentDragView.setVisibility(VISIBLE); } mItemsInvalidated = true; |