diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-26 22:21:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-26 22:21:04 +0000 |
| commit | d4ece005e43a39af08a17acc9ad801729a5dc9d4 (patch) | |
| tree | a76debf9c58c8ba317e5c1addcffcf18881b012e | |
| parent | 7268ed6c27cf9b35322b8300e03b7887c12dd569 (diff) | |
| parent | 232d7196fa35f3aaa73f196f811faeb358509551 (diff) | |
| download | android_packages_apps_Trebuchet-d4ece005e43a39af08a17acc9ad801729a5dc9d4.tar.gz android_packages_apps_Trebuchet-d4ece005e43a39af08a17acc9ad801729a5dc9d4.tar.bz2 android_packages_apps_Trebuchet-d4ece005e43a39af08a17acc9ad801729a5dc9d4.zip | |
Merge changes from topic "am-5f0a0fef-5aba-4af5-b148-430430ddfffb" into ub-launcher3-master
* changes:
[automerger] Fix bug where recycled BubbleTextView kept their badges. am: 5254944a68
Fix bug where recycled BubbleTextView kept their badges.
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 9 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index cd72fbace..364b2040e 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -178,6 +178,15 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, } + /** + * 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); } diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index f7ce8c11e..ed5bf9f8b 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -336,6 +336,7 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. 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: |