PopupContainerWithArrow accepting bubbletextview without icon being set.

Change-Id: I5f58c339c094b4a88adf27c2ecaa01ba052b2285
2017-06-20 14:08:11 -07:00
parent 12461a16c9
commit a3f91c9752
1 changed files with 3 additions and 1 deletions
@@ -459,7 +459,9 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra
        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) {