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

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

Merge "Allow 0sp text size in xml for TextView"

parents 8225c852 f03b7543

core/java/android/widget/TextView.java

+2 −2
Original line number Diff line number Diff line
@@ -3451,7 +3451,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        ColorStateList mTextColor = null;

        ColorStateList mTextColorHint = null;

        ColorStateList mTextColorLink = null;

        int mTextSize = 0;

        int mTextSize = -1;

        String mFontFamily = null;

        Typeface mFontTypeface = null;

        boolean mFontFamilyExplicit = false;
@@ -3662,7 +3662,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            setHighlightColor(attributes.mTextColorHighlight);

        }



        if (attributes.mTextSize != 0) {

        if (attributes.mTextSize != -1) {

            setRawTextSize(attributes.mTextSize, true /* shouldRequestLayout */);

        }