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

Commit fff349dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Apply tint when setting check mark drawable" into nyc-dev

parents a0676c92 28fabe5e

core/java/android/widget/CheckedTextView.java

+5 −2
Original line number Diff line number Diff line
@@ -185,11 +185,12 @@ public class CheckedTextView extends TextView implements Checkable { 
            d.setCallback(this);

            d.setVisible(getVisibility() == VISIBLE, false);

            d.setState(CHECKED_STATE_SET);

            setMinHeight(d.getIntrinsicHeight());



            // Record the intrinsic dimensions when in "checked" state.

            setMinHeight(d.getIntrinsicHeight());

            mCheckMarkWidth = d.getIntrinsicWidth();



            d.setState(getDrawableState());

            applyCheckMarkTint();

        } else {

            mCheckMarkWidth = 0;

        }
@@ -197,6 +198,8 @@ public class CheckedTextView extends TextView implements Checkable { 
        mCheckMarkDrawable = d;

        mCheckMarkResource = resId;



        applyCheckMarkTint();



        // Do padding resolution. This will call internalSetPadding() and do a

        // requestLayout() if needed.

        resolvePadding();