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