commit fa2c33f9a37829b4ff4bea8c794e9b7905407001
author Tony Wickham <twickham@google.com> Thu Jul 28 18:52:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 28 18:52:04 2016 +0000
tree 47acb9fb27a90bd32191ec1210a597b6bb007273
parent e3b04f006c500b4781a6b757728cd5948c9665c0
parent c714c0148bb2b39feb31e21cb5a874e1f376b0cc

Stop setting original icon visible when dragging app with shortcuts.
am: c714c0148b

Change-Id: If5c0e4adbcd388f56e2bbb1994b1d72001a6a6d2

src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java

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);
     }