From b4d445064faebeebb417f721f3cc19ed84e7444a Mon Sep 17 00:00:00 2001
From: pekingme <8545955+pekingme@users.noreply.github.com>
Date: Fri, 4 Mar 2022 14:27:51 -0500
Subject: [PATCH] [Tokens] Added lineHeight attr into TextAppearance.

PiperOrigin-RevId: 432493474
---
 .../typography/res/values-v21/tokens.xml      | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/lib/java/com/google/android/material/typography/res/values-v21/tokens.xml b/lib/java/com/google/android/material/typography/res/values-v21/tokens.xml
index 10b2eefc81b..d0ce55c836a 100644
--- a/lib/java/com/google/android/material/typography/res/values-v21/tokens.xml
+++ b/lib/java/com/google/android/material/typography/res/values-v21/tokens.xml
@@ -17,7 +17,7 @@
 <!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
 <!-- Version: v0.73 -->
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="NewApi">
   <!-- Generated from token set (md.sys.typescale) in default context. -->
   <!-- Display Large -->
   <style name="TextAppearance.M3.Sys.Typescale.DisplayLarge" parent="TextAppearance.AppCompat.Display3">
@@ -26,6 +26,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">57sp</item>
     <item name="android:letterSpacing">-0.00438596</item>
+    <item name="lineHeight">64sp</item>
+    <item name="android:lineHeight">64sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Display Medium -->
@@ -35,6 +37,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">45sp</item>
     <item name="android:letterSpacing">0</item>
+    <item name="lineHeight">52sp</item>
+    <item name="android:lineHeight">52sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Display Small -->
@@ -44,6 +48,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">36sp</item>
     <item name="android:letterSpacing">0</item>
+    <item name="lineHeight">44sp</item>
+    <item name="android:lineHeight">44sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Headline Large -->
@@ -53,6 +59,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">32sp</item>
     <item name="android:letterSpacing">0</item>
+    <item name="lineHeight">40sp</item>
+    <item name="android:lineHeight">40sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Headline Medium -->
@@ -62,6 +70,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">28sp</item>
     <item name="android:letterSpacing">0</item>
+    <item name="lineHeight">36sp</item>
+    <item name="android:lineHeight">36sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Headline Small -->
@@ -71,6 +81,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">24sp</item>
     <item name="android:letterSpacing">0</item>
+    <item name="lineHeight">32sp</item>
+    <item name="android:lineHeight">32sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Title Large -->
@@ -80,6 +92,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">22sp</item>
     <item name="android:letterSpacing">0</item>
+    <item name="lineHeight">28sp</item>
+    <item name="android:lineHeight">28sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Title Medium -->
@@ -89,6 +103,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">16sp</item>
     <item name="android:letterSpacing">0.009375</item>
+    <item name="lineHeight">24sp</item>
+    <item name="android:lineHeight">24sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Title Small -->
@@ -98,6 +114,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">14sp</item>
     <item name="android:letterSpacing">0.00714286</item>
+    <item name="lineHeight">20sp</item>
+    <item name="android:lineHeight">20sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Body Large -->
@@ -107,6 +125,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">16sp</item>
     <item name="android:letterSpacing">0.03125</item>
+    <item name="lineHeight">24sp</item>
+    <item name="android:lineHeight">24sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Body Medium -->
@@ -116,6 +136,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">14sp</item>
     <item name="android:letterSpacing">0.01785714</item>
+    <item name="lineHeight">20sp</item>
+    <item name="android:lineHeight">20sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Body Small -->
@@ -125,6 +147,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">12sp</item>
     <item name="android:letterSpacing">0.03333333</item>
+    <item name="lineHeight">16sp</item>
+    <item name="android:lineHeight">16sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Label Large -->
@@ -134,6 +158,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">14sp</item>
     <item name="android:letterSpacing">0.00714286</item>
+    <item name="lineHeight">20sp</item>
+    <item name="android:lineHeight">20sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Label Medium -->
@@ -143,6 +169,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">12sp</item>
     <item name="android:letterSpacing">0.04166667</item>
+    <item name="lineHeight">16sp</item>
+    <item name="android:lineHeight">16sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
   <!-- Label Small -->
@@ -152,15 +180,8 @@
     <item name="android:textStyle">normal</item>
     <item name="android:textSize">11sp</item>
     <item name="android:letterSpacing">0.04545455</item>
+    <item name="lineHeight">16sp</item>
+    <item name="android:lineHeight">16sp</item>
     <item name="android:textAllCaps">false</item>
   </style>
-  <!-- Generated from token set (md.ref.typeface) in context (audience=3p). -->
-  <!-- Deprecated tokens -->
-  <string name="m3_ref_typeface_brand_display_regular" translatable="false">sans-serif</string>
-  <!-- Brand -->
-  <string name="m3_ref_typeface_brand_regular" translatable="false">sans-serif</string>
-  <string name="m3_ref_typeface_brand_medium" translatable="false">sans-serif-medium</string>
-  <!-- Plain -->
-  <string name="m3_ref_typeface_plain_regular" translatable="false">sans-serif</string>
-  <string name="m3_ref_typeface_plain_medium" translatable="false">sans-serif-medium</string>
 </resources>