diff options
| author | Mario Bertschler <bmario@google.com> | 2017-06-22 19:34:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-22 19:34:59 +0000 |
| commit | 293fba031e77ac85f81830fb01fbc30a71c6523a (patch) | |
| tree | 612da599b645f59c89c6537617f91ea25943372d | |
| parent | 3fede16f22a226ce7e009e1015873ee9d7757dcb (diff) | |
| parent | a3f91c97528a52658271bfd480c81f24b0bdeb97 (diff) | |
| download | android_packages_apps_Trebuchet-293fba031e77ac85f81830fb01fbc30a71c6523a.tar.gz android_packages_apps_Trebuchet-293fba031e77ac85f81830fb01fbc30a71c6523a.tar.bz2 android_packages_apps_Trebuchet-293fba031e77ac85f81830fb01fbc30a71c6523a.zip | |
Merge "PopupContainerWithArrow accepting bubbletextview without icon being set." into ub-launcher3-dorval-polish
| -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) { |