[Typography] Add variable font support to TextAppearance

PiperOrigin-RevId: 650200668

Author: hunterstich

catalog/java/io/material/catalog/font/FontMainDemoFragment.java

@@ -20,6 +20,8 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -103,6 +105,16 @@ protected String convertFontFamilyToDescription(String fontFamily) {
     }
   }
 
+  @NonNull
+  protected String maybeGetFontVariationSettingsDescription(
+      @Nullable String fontVariationSettings) {
+    if (VERSION.SDK_INT < VERSION_CODES.O || fontVariationSettings == null) {
+      return "";
+    } else {
+      return " " + fontVariationSettings;
+    }
+  }
+
   private class FontStyleAdapter extends Adapter<FontStyleViewHolder> {
 
     private final List<Integer> styles = new ArrayList<>();
@@ -191,7 +203,8 @@ private String createDescription(String name, @StyleRes int style) {
           + convertFontFamilyToDescription(textAppearance.fontFamily)
           + " "
           + pxToSp(textAppearance.getTextSize())
-          + "sp";
+          + "sp"
+          + maybeGetFontVariationSettingsDescription(textAppearance.fontVariationSettings);
     }
 
     private int pxToSp(float px) {

catalog/java/io/material/catalog/font/res/layout/cat_font_styles_item.xml

@@ -15,17 +15,19 @@
   limitations under the License.
   -->
 
-<FrameLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
   <LinearLayout
-      android:layout_width="match_parent"
+      android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:paddingTop="8dp"
       android:paddingBottom="8dp"
+      android:layout_weight="1"
       android:orientation="vertical">
     <TextView
         android:id="@+id/description"
@@ -36,8 +38,7 @@
     <TextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxLines="1"/>
+        android:layout_height="wrap_content" />
   </LinearLayout>
 
   <ImageView
@@ -49,5 +50,5 @@
       android:background="?attr/selectableItemBackgroundBorderless"
       android:contentDescription="Information"
       app:srcCompat="@drawable/ic_info_outline_24px"
-      app:tint="?attr/colorControlNormal"/>
-</FrameLayout>
+      app:tint="?attr/colorControlNormal" />
+</LinearLayout>

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

@@ -34,6 +34,7 @@
 import androidx.annotation.FontRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
 import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.StyleRes;
@@ -62,6 +63,7 @@ public class TextAppearance {
   @Nullable public final ColorStateList textColorLink;
   @Nullable public final ColorStateList shadowColor;
   @Nullable public final String fontFamily;
+  @Nullable public String fontVariationSettings;
 
   public final int textStyle;
   public final int typeface;
@@ -119,6 +121,13 @@ public TextAppearance(@NonNull Context context, @StyleRes int id) {
       a = context.obtainStyledAttributes(id, R.styleable.MaterialTextAppearance);
       hasLetterSpacing = a.hasValue(R.styleable.MaterialTextAppearance_android_letterSpacing);
       letterSpacing = a.getFloat(R.styleable.MaterialTextAppearance_android_letterSpacing, 0);
+      if (VERSION.SDK_INT >= VERSION_CODES.O) {
+        int fontVariationSettingsIndex = MaterialResources.getIndexWithValue(
+            a,
+            R.styleable.MaterialTextAppearance_fontVariationSettings,
+            R.styleable.MaterialTextAppearance_android_fontVariationSettings);
+        fontVariationSettings = a.getString(fontVariationSettingsIndex);
+      }
       a.recycle();
     } else {
       hasLetterSpacing = false;
@@ -354,6 +363,10 @@ public void updateTextPaintMeasureState(
 
     textPaint.setTextSize(textSize);
 
+    if (VERSION.SDK_INT >= VERSION_CODES.O) {
+      textPaint.setFontVariationSettings(fontVariationSettings);
+    }
+
     if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
       if (hasLetterSpacing) {
         textPaint.setLetterSpacing(letterSpacing);
@@ -378,6 +391,17 @@ public void setTextSize(float textSize) {
     this.textSize = textSize;
   }
 
+  @RequiresApi(VERSION_CODES.O)
+  @Nullable
+  public String getFontVariationSettings() {
+    return fontVariationSettings;
+  }
+
+  @RequiresApi(VERSION_CODES.O)
+  public void setFontVariationSettings(@Nullable String fontVariationSettings) {
+    this.fontVariationSettings = fontVariationSettings;
+  }
+
   private boolean maybeLoadFontSynchronously(Context context) {
     if (TextAppearanceConfig.shouldLoadFontSynchronously()) {
       getFont(context);

lib/java/com/google/android/material/resources/res/values/attrs.xml

@@ -43,6 +43,8 @@
     <attr name="android:lineHeight"/>
     <attr name="lineHeight" format="dimension"/>
     <attr name="android:letterSpacing"/>
+    <attr name="android:fontVariationSettings"/>
+    <attr name="fontVariationSettings" format="string"/>
   </declare-styleable>
 
 </resources>