diff options
| -rw-r--r-- | core/java/android/widget/TextView.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 5e828ba46df7..99fe0cbdca25 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -5211,11 +5211,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener */ @Nullable public String getFontVariationSettings() { - if (Flags.typefaceRedesignReadonly()) { - return mTextPaint.getFontVariationOverride(); - } else { - return mTextPaint.getFontVariationSettings(); - } + return mTextPaint.getFontVariationSettings(); } /** @@ -5571,10 +5567,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener Math.clamp(400 + mFontWeightAdjustment, FontStyle.FONT_WEIGHT_MIN, FontStyle.FONT_WEIGHT_MAX))); } - mTextPaint.setFontVariationOverride( + mTextPaint.setFontVariationSettings( FontVariationAxis.toFontVariationSettings(axes)); } else { - mTextPaint.setFontVariationOverride(fontVariationSettings); + mTextPaint.setFontVariationSettings(fontVariationSettings); } effective = true; } else { |