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

Commit b3b467c2 authored by Kevin Lim's avatar Kevin Lim
Browse files

[NexusLauncher] Expose setLayoutHorizontal. 

mLayoutHorizontal is exposed so that classes that extend BubbleTextView
can override this programmatically based on LayoutType.

mLayoutHorizontal prevents the title in horizontal cases affecting the
icon bounds measure, and shifting things such as the icon halo.

Bug: b/288471727
Test: See ag/24199217
Test: New tests in SearchResultIconTest
Test: No regression in SearchResultSmallIconRowTest
Change-Id: I424c1597d29ed26d7dea9e666ff2d274847e3217
parent 14223c8f

src/com/android/launcher3/BubbleTextView.java

+18 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 


    private final CheckLongPressHelper mLongPressHelper;



    private final boolean mLayoutHorizontal;

    private boolean mLayoutHorizontal;

    private final boolean mIsRtl;

    private final int mIconSize;
@@ -665,6 +665,18 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        }

    }



    /**

     * Sets whether the layout is horizontal.

     */

    public void setLayoutHorizontal(boolean layoutHorizontal) {

        if (mLayoutHorizontal == layoutHorizontal) {

            return;

        }



        mLayoutHorizontal = layoutHorizontal;

        applyCompoundDrawables(getIconOrTransparentColor());

    }



    /**

     * Sets whether to vertically center the content.

     */
@@ -991,10 +1003,14 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
        if (!mIsIconVisible) {

            resetIconScale();

        }

        Drawable icon = visible ? mIcon : new ColorDrawable(Color.TRANSPARENT);

        Drawable icon = getIconOrTransparentColor();

        applyCompoundDrawables(icon);

    }



    private Drawable getIconOrTransparentColor() {

        return mIsIconVisible ? mIcon : new ColorDrawable(Color.TRANSPARENT);

    }



    /** Sets the icon visual state to disabled or not. */

    public void setIconDisabled(boolean isDisabled) {

        if (mIcon != null) {