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

Commit 898a7ccb authored by Kevin Lim's avatar Kevin Lim Committed by Automerger Merge Worker
Browse files

Merge "[NexusLauncher] Expose setLayoutHorizontal." into udc-qpr-dev am: ceab9a2c am: 6cd69b0e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24156948



Change-Id: Icdb67a085616c599ffe2f0304711d0b4c756a67a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 652f66d9 6cd69b0e

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) {