From b4f939647d3988917f0fceb2272045a73e5c50b0 Mon Sep 17 00:00:00 2001
From: Alex Stetson <alexstetson@google.com>
Date: Wed, 15 Sep 2021 10:11:14 -0700
Subject: [PATCH] Move toast line height attribute to default style

To allow for the toast line height attribute to be overridden more
easily, relocating it to the TextAppearance.Toast style.

Bug: 191880008
Test: manual
Change-Id: I954d574383ecfc3bdc17d48725ea2e0f08b3b59c
---
 core/res/res/layout/transient_notification.xml | 1 -
 core/res/res/values/styles.xml                 | 1 +
 packages/SystemUI/res/layout/text_toast.xml    | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/res/res/layout/transient_notification.xml b/core/res/res/layout/transient_notification.xml
index 8a3d73491af37..3259201f6e9bf 100644
--- a/core/res/res/layout/transient_notification.xml
+++ b/core/res/res/layout/transient_notification.xml
@@ -40,6 +40,5 @@
         android:maxLines="2"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
-        android:lineHeight="20sp"
         android:textAppearance="@style/TextAppearance.Toast"/>
 </LinearLayout>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index bac9cf23b1764..9553f95fe5c91 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -966,6 +966,7 @@ please see styles_device_defaults.xml.
     <style name="TextAppearance.Toast">
         <item name="fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="textSize">14sp</item>
+        <item name="lineHeight">20sp</item>
         <item name="textColor">?android:attr/textColorPrimary</item>
     </style>
 
diff --git a/packages/SystemUI/res/layout/text_toast.xml b/packages/SystemUI/res/layout/text_toast.xml
index 49b182addd059..a3fe8efa48bfd 100644
--- a/packages/SystemUI/res/layout/text_toast.xml
+++ b/packages/SystemUI/res/layout/text_toast.xml
@@ -45,6 +45,5 @@
         android:maxLines="2"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
-        android:lineHeight="20sp"
         android:textAppearance="@*android:style/TextAppearance.Toast"/>
 </LinearLayout>