commit 5254944a686311d94897de7f023e966532faf8c9
author Jon Miranda <jonmiranda@google.com> Thu Oct 26 11:28:06 2017 -0700
committer Jon Miranda <jonmiranda@google.com> Thu Oct 26 11:34:55 2017 -0700
tree 24975587dd9f31c78c5fb7307104a321de6db0b0
parent 2ff529a57542772d710026435b87ab7a6b3ed25c

Fix bug where recycled BubbleTextView kept their badges.

Bug: 68324671
Change-Id: Id5f4db6706afd002242d95d44422fc61042798c8

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index ac842f9..f20baea 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -177,6 +177,15 @@
 
     }
 
+    /**
+     * Resets the view so it can be recycled.
+     */
+    public void reset() {
+        mBadgeInfo = null;
+        mBadgePalette = null;
+        mForceHideBadge = false;
+    }
+
     public void applyFromShortcutInfo(ShortcutInfo info) {
         applyFromShortcutInfo(info, false);
     }

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 1f60fcc..48e6caa 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -336,6 +336,7 @@
             case VIEW_TYPE_PREDICTION_ICON:
                 AppInfo info = mApps.getAdapterItems().get(position).appInfo;
                 BubbleTextView icon = (BubbleTextView) holder.itemView;
+                icon.reset();
                 icon.applyFromApplicationInfo(info);
                 break;
             case VIEW_TYPE_DISCOVERY_ITEM: