diff options
| author | Tony Wickham <twickham@google.com> | 2017-04-25 23:59:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-25 23:59:41 +0000 |
| commit | 0e96f3fea90ffaf2da20a9c5476e342c8f866d76 (patch) | |
| tree | 88582bce023a0919dc8539ac094e2b5c71f38601 /src/com/android/launcher3/popup | |
| parent | 03a222ee866a64ed8da855f0a06c5549dcc18a26 (diff) | |
| parent | 0fa96ea2f6c8a48917e619b3120beaa90698cb43 (diff) | |
| download | android_packages_apps_Trebuchet-0e96f3fea90ffaf2da20a9c5476e342c8f866d76.tar.gz android_packages_apps_Trebuchet-0e96f3fea90ffaf2da20a9c5476e342c8f866d76.tar.bz2 android_packages_apps_Trebuchet-0e96f3fea90ffaf2da20a9c5476e342c8f866d76.zip | |
Merge "Update icon badges to match spec" into ub-launcher3-dorval
am: 0fa96ea2f6
Change-Id: I5f8e6bdbca13435d54e3b636564f7d3eef58ca5c
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); } |