| commit | 48043ee0d6ad9bee4d10118e5c67fef6c2d0cb5e | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Wed Nov 01 15:40:22 2017 -0700 |
| committer | Jon Miranda <jonmiranda@google.com> | Wed Nov 01 16:01:13 2017 -0700 |
| tree | 5d91c95120c762ae33a88e4a01055ec48dea6638 | |
| parent | 5254944a686311d94897de7f023e966532faf8c9 [diff] [blame] |
Also reset mBadgeScale to 0 when recycling view. When left as 1f, the drawBadgeIfNecessary thinks that there is still a badge -- which results in a NPE when trying to draw the badge. Bug: 68324671 Change-Id: I4eedb5825b3a6429c99de0466a77d368a39b1951
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index f20baea..5bdc4ed 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java
@@ -183,6 +183,7 @@ public void reset() { mBadgeInfo = null; mBadgePalette = null; + mBadgeScale = 0f; mForceHideBadge = false; }