commit 293fba031e77ac85f81830fb01fbc30a71c6523a
author Mario Bertschler <bmario@google.com> Thu Jun 22 19:34:58 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 22 19:34:59 2017 +0000
tree 612da599b645f59c89c6537617f91ea25943372d
parent 3fede16f22a226ce7e009e1015873ee9d7757dcb
parent a3f91c97528a52658271bfd480c81f24b0bdeb97

Merge "PopupContainerWithArrow accepting bubbletextview without icon being set." into ub-launcher3-dorval-polish

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) {