commit a707b2a3f459cfd740e99f49e38bd49ac52b7609
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Feb 25 08:23:37 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 25 08:23:37 2025 -0800
tree 3be276a92698bd6c0b2577bf294bd9ec86811246
parent bb13b093d2a7cadee90cd8826f742f79af226f3e
parent 19bd4b60a786c575bcddba6c5dc702cc5ffa5fff

Merge "Use setFontVariationOverride in TextView" into main

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 99fe0cb..5e828ba 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5211,7 +5211,11 @@
      */
     @Nullable
     public String getFontVariationSettings() {
-        return mTextPaint.getFontVariationSettings();
+        if (Flags.typefaceRedesignReadonly()) {
+            return mTextPaint.getFontVariationOverride();
+        } else {
+            return mTextPaint.getFontVariationSettings();
+        }
     }
 
     /**
@@ -5567,10 +5571,10 @@
                             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 {