diff options
| author | Tony Wickham <twickham@google.com> | 2016-08-30 15:48:43 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2016-08-30 23:12:57 +0000 |
| commit | 12624a5a17a8fb7839330af1c6781fdcc375da40 (patch) | |
| tree | 9c1063e1ee76f92f49796cd389bbe6c7c8e1ea0b | |
| parent | 0a6dde72657ed1f95e81b7d769c77f457c73de62 (diff) | |
| download | android_packages_apps_Trebuchet-12624a5a17a8fb7839330af1c6781fdcc375da40.tar.gz android_packages_apps_Trebuchet-12624a5a17a8fb7839330af1c6781fdcc375da40.tar.bz2 android_packages_apps_Trebuchet-12624a5a17a8fb7839330af1c6781fdcc375da40.zip | |
When shortcuts close, only set text visible if not in hotseat.
Bug: 31195155
Change-Id: I3ee6f45f1dd421fcad6ed22b444efd2922b0a32b
(cherry picked from commit e53abfa993f94dea119d99221ea5bbdba87303cb)
| -rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java index 4d1050640..5a7044aa4 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutsContainer.java @@ -31,7 +31,6 @@ import android.graphics.drawable.ShapeDrawable; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.text.TextUtils; import android.util.AttributeSet; import android.view.Gravity; import android.view.HapticFeedbackConstants; @@ -53,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; @@ -689,7 +689,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); } |