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

Commit 3e787142 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Fixing background being drawn multiple times for BubbleTextView" into ub-now-master

parents e639d6b6 15872dad

src/com/android/launcher3/BubbleTextView.java

+9 −3
Original line number Diff line number Diff line
@@ -66,11 +66,11 @@ public class BubbleTextView extends TextView { 
    private float mSlop;



    private int mTextColor;

    private boolean mCustomShadowsEnabled = true;

    private final boolean mCustomShadowsEnabled;

    private boolean mIsTextVisible;



    private boolean mBackgroundSizeChanged;

    private Drawable mBackground;

    private final Drawable mBackground;



    private boolean mStayPressed;

    private CheckLongPressHelper mLongPressHelper;
@@ -96,6 +96,13 @@ public class BubbleTextView extends TextView { 
        mCustomShadowsEnabled = a.getBoolean(R.styleable.BubbleTextView_customShadows, true);

        a.recycle();



        if (mCustomShadowsEnabled) {

            // Draw the background itself as the parent is drawn twice.

            mBackground = getBackground();

            setBackground(null);

        } else {

            mBackground = null;

        }

        init();

    }
@@ -110,7 +117,6 @@ public class BubbleTextView extends TextView { 


    private void init() {

        mLongPressHelper = new CheckLongPressHelper(this);

        mBackground = getBackground();



        mOutlineHelper = HolographicOutlineHelper.obtain(getContext());

        if (mCustomShadowsEnabled) {