[TextAppearance] fix drawables not applying system level bold

PiperOrigin-RevId: 421066050

Author: veganafro

lib/java/com/google/android/material/chip/Chip.java

@@ -18,14 +18,12 @@
 
 import com.google.android.material.R;
 
-import static android.graphics.fonts.FontStyle.FONT_WEIGHT_MIN;
 import static com.google.android.material.theme.overlay.MaterialThemeOverlay.wrap;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Outline;
 import android.graphics.PorterDuff.Mode;
@@ -178,9 +176,6 @@ public class Chip extends AppCompatCheckBox implements Delegate, Shapeable {
         public void onFontRetrieved(@NonNull Typeface typeface, boolean fontResolvedSynchronously) {
           // Set text to re-trigger internal ellipsize width calculation.
           setText(chipDrawable.shouldDrawText() ? chipDrawable.getText() : getText());
-          if (!fontResolvedSynchronously) {
-            maybeUpdateFontWeightAdjustment();
-          }
           requestLayout();
           invalidate();
         }
@@ -1374,16 +1369,6 @@ private void updateTextPaintDrawState() {
     TextAppearance textAppearance = getTextAppearance();
     if (textAppearance != null) {
       textAppearance.updateDrawState(getContext(), textPaint, fontCallback);
-      maybeUpdateFontWeightAdjustment();
-    }
-  }
-
-  private void maybeUpdateFontWeightAdjustment() {
-    Configuration config = getResources().getConfiguration();
-    if (VERSION.SDK_INT >= VERSION_CODES.S && config.fontWeightAdjustment >= FONT_WEIGHT_MIN) {
-      // Re-apply typeface to take into account fontWeightAdjustment, see similar logic used in
-      // TextView#onConfigurationChanged
-      setTypeface(getTypeface());
     }
   }
 

lib/java/com/google/android/material/resources/TextAppearance.java

@@ -20,10 +20,12 @@
 
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.Typeface;
+import android.graphics.fonts.FontStyle;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.text.TextPaint;
@@ -228,19 +230,19 @@ public void onFontRetrievalFailed(int reason) {
    * @see #getFontAsync(Context, TextAppearanceFontCallback)
    */
   public void getFontAsync(
-      @NonNull Context context,
+      @NonNull final Context context,
       @NonNull final TextPaint textPaint,
       @NonNull final TextAppearanceFontCallback callback) {
     // Updates text paint using fallback font while waiting for font to be requested.
-    updateTextPaintMeasureState(textPaint, getFallbackFont());
+    updateTextPaintMeasureState(context, textPaint, getFallbackFont());
 
     getFontAsync(
         context,
         new TextAppearanceFontCallback() {
           @Override
           public void onFontRetrieved(
               @NonNull Typeface typeface, boolean fontResolvedSynchronously) {
-            updateTextPaintMeasureState(textPaint, typeface);
+            updateTextPaintMeasureState(context, textPaint, typeface);
             callback.onFontRetrieved(typeface, fontResolvedSynchronously);
           }
 
@@ -326,7 +328,7 @@ public void updateMeasureState(
       @NonNull TextPaint textPaint,
       @NonNull TextAppearanceFontCallback callback) {
     if (shouldLoadFontSynchronously(context)) {
-      updateTextPaintMeasureState(textPaint, getFont(context));
+      updateTextPaintMeasureState(context, textPaint, getFont(context));
     } else {
       getFontAsync(context, textPaint, callback);
     }
@@ -338,7 +340,16 @@ public void updateMeasureState(
    * @see android.text.style.TextAppearanceSpan#updateMeasureState(TextPaint)
    */
   public void updateTextPaintMeasureState(
-      @NonNull TextPaint textPaint, @NonNull Typeface typeface) {
+      @NonNull Context context, @NonNull TextPaint textPaint, @NonNull Typeface typeface) {
+    Configuration configuration = context.getResources().getConfiguration();
+    if (VERSION.SDK_INT >= VERSION_CODES.S
+        && configuration.fontWeightAdjustment >= FontStyle.FONT_WEIGHT_MIN) {
+      int fontWeightAdjustment = configuration.fontWeightAdjustment;
+      typeface = Typeface.create(
+          typeface,
+          typeface.getWeight() + fontWeightAdjustment,
+          typeface.isItalic());
+    }
     textPaint.setTypeface(typeface);
 
     int fake = textStyle & ~typeface.getStyle();