diff options
| author | Mario Bertschler <bmario@google.com> | 2017-06-20 14:08:11 -0700 |
|---|---|---|
| committer | Mario Bertschler <bmario@google.com> | 2017-06-22 12:00:07 -0700 |
| commit | a3f91c97528a52658271bfd480c81f24b0bdeb97 (patch) | |
| tree | f3f926443af2ba5e3af2da4eb8a2c0ff57e8a09e /src/com/android/launcher3/popup | |
| parent | 12461a16c9afed84418d2863bdf00ea512fbeab7 (diff) | |
| download | android_packages_apps_Trebuchet-a3f91c97528a52658271bfd480c81f24b0bdeb97.tar.gz android_packages_apps_Trebuchet-a3f91c97528a52658271bfd480c81f24b0bdeb97.tar.bz2 android_packages_apps_Trebuchet-a3f91c97528a52658271bfd480c81f24b0bdeb97.zip | |
PopupContainerWithArrow accepting bubbletextview without icon being set.
Change-Id: I5f58c339c094b4a88adf27c2ecaa01ba052b2285
Diffstat (limited to 'src/com/android/launcher3/popup')
| -rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index c5daca0e1..77375fa48 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -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) { |