commit 232d7196fa35f3aaa73f196f811faeb358509551
author Android Build Merger (Role) <android-build-merger@google.com> Thu Oct 26 18:35:10 2017 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> Thu Oct 26 18:35:10 2017 +0000
tree 5420e70fc45e53580ec8585e25774f23d448405a
parent b871c13ee3391d69a8df10448c4cc414b51dc185
parent 5254944a686311d94897de7f023e966532faf8c9

[automerger] Fix bug where recycled BubbleTextView kept their badges. am: 5254944a68

Change-Id: Icb486e7a529aae15d5f959487c489ef1ad5798b1

src/com/android/launcher3/BubbleTextView.java

diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index cd72fba..364b204 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -178,6 +178,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 f7ce8c1..ed5bf9f 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: