From 19bd4b60a786c575bcddba6c5dc702cc5ffa5fff Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Sat, 22 Feb 2025 13:57:32 +0900
Subject: 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 | 10 +++++++---
 1 file 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 {
-- 
cgit v1.2.3-59-g8ed1b