commit bf560728c11ef2ab829acb943c1db646b9040ba6
author Tony Wickham <twickham@google.com> Fri Dec 14 00:10:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 14 00:10:24 2018 +0000
tree efa8b6752ea97de11d909ec69fcc224a367ccc94
parent 1ebf6f5d77ac4c0c4191c4ac482fb175e2fc108c
parent 1e58cd727013bcc294c22216fa70513c6263b37d

Merge "Remove notification dot if app is disabled" into ub-launcher3-master

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 56aca02..eb26961 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -3065,9 +3065,9 @@
         mapOverItems(MAP_RECURSE, new ItemOperator() {
             @Override
             public boolean evaluate(ItemInfo info, View v) {
-                if (info instanceof ShortcutInfo && v instanceof BubbleTextView
-                        && packageUserKey.updateFromItemInfo(info)) {
-                    if (updatedDots.contains(packageUserKey)) {
+                if (info instanceof ShortcutInfo && v instanceof BubbleTextView) {
+                    if (!packageUserKey.updateFromItemInfo(info)
+                            || updatedDots.contains(packageUserKey)) {
                         ((BubbleTextView) v).applyDotState(info, true /* animate */);
                         folderIds.add(info.container);
                     }