Merge "Add lineHeight to text scale textAppearance defs"

Author: hunterstich

app/src/main/res/layout/fragment_email.xml

@@ -122,8 +122,7 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/sender_profile_image_view"
                     android:text="@{email.body}"
-                    android:textAppearance="?attr/textAppearanceBody1"
-                    app:lineHeight="24sp" />
+                    android:textAppearance="?attr/textAppearanceBody1" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/attachment_recycler_view"

app/src/main/res/values/type.xml

@@ -44,6 +44,7 @@
         <item name="fontFamily">@font/work_sans</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/color_on_surface_emphasis_high</item>
+        <item name="lineHeight">24sp</item>
     </style>
 
     <style name="TextAppearance.Reply.Body2" parent="TextAppearance.MaterialComponents.Body2">