diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-08-29 00:00:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-29 00:00:40 +0000 |
| commit | bf3706f01e9a1a6c167f39c744ff4001e325c7fa (patch) | |
| tree | 06b2c9dbce61fa767246c926d0eeca5914258389 | |
| parent | cf29e8a8fa2c181af089b211707890cb471d62a7 (diff) | |
| parent | 83acc755ac17b741fd9088efeed99fcd304071cc (diff) | |
| download | android_packages_apps_Trebuchet-bf3706f01e9a1a6c167f39c744ff4001e325c7fa.tar.gz android_packages_apps_Trebuchet-bf3706f01e9a1a6c167f39c744ff4001e325c7fa.tar.bz2 android_packages_apps_Trebuchet-bf3706f01e9a1a6c167f39c744ff4001e325c7fa.zip | |
am 83acc755: Merge "Clear the draginfo object once the item is dropped inside a folder" into ub-now-porkchop
* commit '83acc755ac17b741fd9088efeed99fcd304071cc':
Clear the draginfo object once the item is dropped inside a folder
| -rw-r--r-- | src/com/android/launcher3/Folder.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 6bd4e0e2f..a27e51986 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -1295,6 +1295,8 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mSuppressOnAdd = true; mInfo.add(si); mSuppressOnAdd = false; + // Clear the drag info, as it is no longer being dragged. + mCurrentDragInfo = null; } // This is used so the item doesn't immediately appear in the folder when added. In one case |