commit 04030d5a449cb251fb8db2f74d054c4f3a4a608b
author Tony Wickham <twickham@google.com> Mon Mar 13 19:01:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 13 19:01:10 2017 +0000
tree 3cc3f54fc7ed829aeaa14b95633a4ea9f9336dd8
parent 4eaacc7485b85ec964c0ff384dda781f7f17ec74
parent 0402efbad8cd67eb2745e4189f8f474345aa2586

Merge "Remove badge info from map when count is 0." into ub-launcher3-dorval
am: 0402efbad8

Change-Id: I4134b0df23339d5c376a31b9e0f9cd8518e62f0e

src/com/android/launcher3/popup/PopupDataProvider.java

diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index ee2930f..f0ccb1b 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -75,6 +75,9 @@
             notificationWasAddedOrRemoved = shouldBeFilteredOut
                     ? badgeInfo.removeNotificationKey(notificationKey)
                     : badgeInfo.addNotificationKeyIfNotExists(notificationKey);
+            if (badgeInfo.getNotificationCount() == 0) {
+                mPackageUserToBadgeInfos.remove(postedPackageUserKey);
+            }
         }
         updateLauncherIconBadges(Utilities.singletonHashSet(postedPackageUserKey),
                 notificationWasAddedOrRemoved);