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

Commit 5dfae054 authored by Haoyu Zhang's avatar Haoyu Zhang
Browse files

Change TextView.TextAppearanceAttributes.mStyleIndex to mTextStyle 

Currently mStyleIndex is used as a flag int, but its default value is -1.
Rename it to mTextStyle and change the default value to 0 in order to avoid confusion.
Also fix the bug that when fontWeight is specified while not textStyle is
specified in XML, the typeface unexpectedly becomes italic.

Bug: 78873447
Test: atest TextViewTest
Change-Id: I819b8f15e1dcaae7b16f7c97b489b4ed8db494c6
parent fb301a47

core/java/android/widget/TextView.java

+4 −4
Original line number Diff line number Diff line
@@ -3521,7 +3521,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        Typeface mFontTypeface = null;

        boolean mFontFamilyExplicit = false;

        int mTypefaceIndex = -1;

        int mStyleIndex = -1;

        int mTextStyle = 0;

        int mFontWeight = -1;

        boolean mAllCaps = false;

        int mShadowColor = 0;
@@ -3547,7 +3547,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                    + "    mFontTypeface:" + mFontTypeface + "\n"

                    + "    mFontFamilyExplicit:" + mFontFamilyExplicit + "\n"

                    + "    mTypefaceIndex:" + mTypefaceIndex + "\n"

                    + "    mStyleIndex:" + mStyleIndex + "\n"

                    + "    mTextStyle:" + mTextStyle + "\n"

                    + "    mFontWeight:" + mFontWeight + "\n"

                    + "    mAllCaps:" + mAllCaps + "\n"

                    + "    mShadowColor:" + mShadowColor + "\n"
@@ -3672,7 +3672,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                    attributes.mFontFamilyExplicit = true;

                    break;

                case com.android.internal.R.styleable.TextAppearance_textStyle:

                    attributes.mStyleIndex = appearance.getInt(attr, attributes.mStyleIndex);

                    attributes.mTextStyle = appearance.getInt(attr, attributes.mTextStyle);

                    break;

                case com.android.internal.R.styleable.TextAppearance_textFontWeight:

                    attributes.mFontWeight = appearance.getInt(attr, attributes.mFontWeight);
@@ -3742,7 +3742,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            attributes.mFontFamily = null;

        }

        setTypefaceFromAttrs(attributes.mFontTypeface, attributes.mFontFamily,

                attributes.mTypefaceIndex, attributes.mStyleIndex, attributes.mFontWeight);

                attributes.mTypefaceIndex, attributes.mTextStyle, attributes.mFontWeight);



        if (attributes.mShadowColor != 0) {

            setShadowLayer(attributes.mShadowRadius, attributes.mShadowDx, attributes.mShadowDy,