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

Commit 19bd4b60 authored by Seigo Nonaka's avatar Seigo Nonaka
Browse files

Use setFontVariationOverride in TextView 

Bug: 398103395
Bug: 361260253
Test: TreeHuuger
Flag: com.android.text.flags.typeface_redesign_readonly
Change-Id: I7889f31581701afae2cf683fcf45d395c8fe4e0e
parent 4113b5f3

core/java/android/widget/TextView.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -5211,8 +5211,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     */

     */

    @Nullable

    @Nullable

    public String getFontVariationSettings() {

    public String getFontVariationSettings() {

        if (Flags.typefaceRedesignReadonly()) {

            return mTextPaint.getFontVariationOverride();

        } else {

            return mTextPaint.getFontVariationSettings();

            return mTextPaint.getFontVariationSettings();

        }

        }

    }

















    /**







    /**











     * Sets the break strategy for breaking paragraphs into lines. The default value for







     * Sets the break strategy for breaking paragraphs into lines. The default value for










@@ -5567,10 +5571,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener









                            Math.clamp(400 + mFontWeightAdjustment,







                            Math.clamp(400 + mFontWeightAdjustment,











                                    FontStyle.FONT_WEIGHT_MIN, FontStyle.FONT_WEIGHT_MAX)));







                                    FontStyle.FONT_WEIGHT_MIN, FontStyle.FONT_WEIGHT_MAX)));











                }







                }











                mTextPaint.setFontVariationSettings(







                mTextPaint.setFontVariationOverride(











                        FontVariationAxis.toFontVariationSettings(axes));







                        FontVariationAxis.toFontVariationSettings(axes));











            } else {







            } else {











                mTextPaint.setFontVariationSettings(fontVariationSettings);







                mTextPaint.setFontVariationOverride(fontVariationSettings);











            }







            }











            effective = true;







            effective = true;











        } else {







        } else {