Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 293fba03 authored by Mario Bertschler's avatar Mario Bertschler Committed by Android (Google) Code Review
Browse files

Merge "PopupContainerWithArrow accepting bubbletextview without icon being... 

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

src/com/android/launcher3/popup/PopupContainerWithArrow.java

+3 −1
Original line number Diff line number Diff line
@@ -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) {