PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mario Bertschler
2017-06-22 19:34:58 +00:00
committed by Android (Google) Code Review
parent 3fede16f22 a3f91c9752
commit 293fba031e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/popup/PopupContainerWithArrow.java
+3 -1
View File
@@ -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) {