commit daf30c1505cb9a9c07bc3d0562d31f258752efa0
author Tony Wickham <twickham@google.com> Tue Sep 20 21:05:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 20 21:05:17 2016 +0000
tree eb6fc0907b83af0e6eef51e1528812ad033b817b
parent 62891bca458245d22878afc58b951006debfeae5
parent 12624a5a17a8fb7839330af1c6781fdcc375da40

When shortcuts close, only set text visible if not in hotseat.
am: 12624a5a17

Change-Id: I0c6fedcb89d626e3bddca98610ec3da808cdc68e

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 aa0deea..b02e8ab 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java
@@ -52,6 +52,7 @@
 import com.android.launcher3.LauncherAnimUtils;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherModel;
+import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.LauncherViewPropertyAnimator;
 import com.android.launcher3.R;
 import com.android.launcher3.ShortcutInfo;
@@ -688,7 +689,9 @@
         mDeferContainerRemoval = false;
         // Make the original icon visible in All Apps, but not in Workspace or Folders.
         cleanupDeferredDrag(mDeferredDragIcon.getTag() instanceof AppInfo);
-        mDeferredDragIcon.setTextVisibility(true);
+        boolean isInHotseat = ((ItemInfo) mDeferredDragIcon.getTag()).container
+                == LauncherSettings.Favorites.CONTAINER_HOTSEAT;
+        mDeferredDragIcon.setTextVisibility(!isInHotseat);
         mLauncher.getDragController().removeDragListener(this);
         mLauncher.getDragLayer().removeView(this);
     }