commit 19bd4b60a786c575bcddba6c5dc702cc5ffa5fff
author Seigo Nonaka <nona@google.com> Sat Feb 22 13:57:32 2025 +0900
committer Seigo Nonaka <nona@google.com> Tue Feb 25 10:50:57 2025 +0900
tree 0ce0cd1c08b27447021ad1d89f5ad84f4c4c3727
parent 4113b5f3ba34ba332c3f4be0bc2c5a42f0bdb26e

Use setFontVariationOverride in TextView

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

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 {