diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-25 20:02:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-25 20:02:37 +0000 |
| commit | 0fa96ea2f6c8a48917e619b3120beaa90698cb43 (patch) | |
| tree | 2214ca7abfc9d66c6625dcedade887e582609071 /src/com/android/launcher3/popup | |
| parent | 2a120d448e74598e49f561ca296ca98095fe5308 (diff) | |
| parent | 1237df0a7cb89570b90b30fa30a3c76417ce3b64 (diff) | |
| download | android_packages_apps_Trebuchet-0fa96ea2f6c8a48917e619b3120beaa90698cb43.tar.gz android_packages_apps_Trebuchet-0fa96ea2f6c8a48917e619b3120beaa90698cb43.tar.bz2 android_packages_apps_Trebuchet-0fa96ea2f6c8a48917e619b3120beaa90698cb43.zip | |
Merge "Update icon badges to match spec" into ub-launcher3-dorval
Diffstat (limited to 'src/com/android/launcher3/popup')
| -rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index a4823ae3e..ee64ef9e1 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -213,8 +213,8 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra animateOpen(); mOriginalIcon = originalIcon; - mLauncher.getDragController().addDragListener(this); + mOriginalIcon.forceHideBadge(true); // Load the shortcuts on a background thread and update the container as it animates. final Looper workerLooper = LauncherModel.getWorkerLooper(); @@ -799,6 +799,7 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra }); mOpenCloseAnimator = shortcutAnims; shortcutAnims.start(); + mOriginalIcon.forceHideBadge(false); } /** @@ -814,6 +815,7 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra boolean isInHotseat = ((ItemInfo) mOriginalIcon.getTag()).container == LauncherSettings.Favorites.CONTAINER_HOTSEAT; mOriginalIcon.setTextVisibility(!isInHotseat); + mOriginalIcon.forceHideBadge(false); mLauncher.getDragController().removeDragListener(this); mLauncher.getDragLayer().removeView(this); } |