Stop setting original icon visible when dragging app with shortcuts.
- This was leaving a "ghost" icon behind, which looked really weird.
- We still need to make it visible for All Apps, or else you can get
in a state where the icon is gone from all apps indefinitely.
Bug: 30465972
Change-Id: I79eacf2dfdb0cd267732ae63ef69a9bb193933a5
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
index 3a513f1..ba48f26 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -43,6 +43,7 @@
import android.view.animation.DecelerateInterpolator;
import android.widget.LinearLayout;
+import com.android.launcher3.AppInfo;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.DragSource;
import com.android.launcher3.DropTarget;
@@ -718,7 +719,8 @@
}
mIsOpen = false;
mDeferContainerRemoval = false;
- cleanupDeferredDrag(true);
+ // Make the original icon visible in All Apps, but not in Workspace or Folders.
+ cleanupDeferredDrag(mDeferredDragIcon.getTag() instanceof AppInfo);
mLauncher.getDragController().removeDragListener(this);
mLauncher.getDragLayer().removeView(this);
}