commit a3f91c97528a52658271bfd480c81f24b0bdeb97
author Mario Bertschler <bmario@google.com> Tue Jun 20 14:08:11 2017 -0700
committer Mario Bertschler <bmario@google.com> Thu Jun 22 12:00:07 2017 -0700
tree f3f926443af2ba5e3af2da4eb8a2c0ff57e8a09e
parent 12461a16c9afed84418d2863bdf00ea512fbeab7

PopupContainerWithArrow accepting bubbletextview without icon being set.

Change-Id: I5f58c339c094b4a88adf27c2ecaa01ba052b2285

src/com/android/launcher3/popup/PopupContainerWithArrow.java

diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index c5daca0..77375fa 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -459,7 +459,9 @@
         x += mIsLeftAligned ? xOffset : -xOffset;
 
         // Open above icon if there is room.
-        int iconHeight = icon.getIcon().getBounds().height();
+        int iconHeight = icon.getIcon() != null
+                ? icon.getIcon().getBounds().height()
+                : icon.getHeight();
         int y = mTempRect.top + icon.getPaddingTop() - height;
         mIsAboveIcon = y > dragLayer.getTop() + insets.top;
         if (!mIsAboveIcon) {