Merge "Fix NPE in BubbleTextView" into tm-dev am: 2f06a23ed7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17199276

Change-Id: I3f77711ebb3602f1e3b9148d8a4efc658f20b2a8

src/com/android/launcher3/BubbleTextView.java

@@ -867,6 +867,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     }
 
     protected void applyCompoundDrawables(Drawable icon) {
+        if (icon == null) {
+            // Icon can be null when we use the BubbleTextView for text only.
+            return;
+        }
+
         // If we had already set an icon before, disable relayout as the icon size is the
         // same as before.
         mDisableRelayout = mIcon != null;