diff options
| author | Tony Wickham <twickham@google.com> | 2016-09-20 20:49:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-20 20:49:37 +0000 |
| commit | 41253866876bc3cbb7d52cd0f28063cea7aca59d (patch) | |
| tree | 2f1d6b65692f82480f2cdebe67430d828df4ba86 /src | |
| parent | 6a7ca92f726968b5301444131bf75ca74e934788 (diff) | |
| parent | 12624a5a17a8fb7839330af1c6781fdcc375da40 (diff) | |
| download | android_packages_apps_Trebuchet-41253866876bc3cbb7d52cd0f28063cea7aca59d.tar.gz android_packages_apps_Trebuchet-41253866876bc3cbb7d52cd0f28063cea7aca59d.tar.bz2 android_packages_apps_Trebuchet-41253866876bc3cbb7d52cd0f28063cea7aca59d.zip | |
Merge "When shortcuts close, only set text visible if not in hotseat." into ub-launcher3-calgary-polish
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java index cfa6efd51..7657ed610 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.Launcher; 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; @@ -687,7 +688,9 @@ public class DeepShortcutsContainer extends LinearLayout implements View.OnLongC 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); } |