diff options
author | Tony Wickham <twickham@google.com> | 2016-07-28 11:27:03 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-07-28 11:35:55 -0700 |
commit | c714c0148bb2b39feb31e21cb5a874e1f376b0cc (patch) | |
tree | 47acb9fb27a90bd32191ec1210a597b6bb007273 /src | |
parent | 64035e9ee6909774160b12abbeced91588bc9bb9 (diff) | |
download | android_packages_apps_Trebuchet-c714c0148bb2b39feb31e21cb5a874e1f376b0cc.tar.gz android_packages_apps_Trebuchet-c714c0148bb2b39feb31e21cb5a874e1f376b0cc.tar.bz2 android_packages_apps_Trebuchet-c714c0148bb2b39feb31e21cb5a874e1f376b0cc.zip |
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
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java index 3a513f128..ba48f26bc 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java @@ -43,6 +43,7 @@ import android.view.ViewConfiguration; 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 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC } 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); } |