commit 49b39d667d3fa662352fdcc5278db97ab45de7cf
author Sunny Goyal <sunnygoyal@google.com> Thu Mar 05 19:24:51 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 05 19:24:51 2015 +0000
tree b74facc7ed8c2666ae3fe7debe8843f9f9ea65ad
parent 95deb3a57cfebe51e5b8ea74e0a870123d1347e9
parent bc753359f8b08e0813016eebc8392b83a4d2bd6e

Merge "Extracting a common interface out of FolderCellLayout" into ub-launcher3-burnaby

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 60457fd..3d29b6f 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4169,7 +4169,7 @@
         boolean beingCalledAfterUninstall = mDeferredAction != null;
 
         if (success && !(beingCalledAfterUninstall && !mUninstallSuccessful)) {
-            if (mDragInfo != null) {
+            if (target != this && mDragInfo != null) {
                 removeWorkspaceItem(mDragInfo.cell);
             }
         } else if (mDragInfo != null) {