Merge "Move toast line height attribute to default style" into sc-v2-dev

This commit is contained in:
TreeHugger Robot
2021-09-17 20:29:36 +00:00
committed by Android (Google) Code Review
3 changed files with 1 additions and 2 deletions

View File

@@ -40,6 +40,5 @@
android:maxLines="2"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:lineHeight="20sp"
android:textAppearance="@style/TextAppearance.Toast"/>
</LinearLayout>

View File

@@ -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>

View File

@@ -45,6 +45,5 @@
android:maxLines="2"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:lineHeight="20sp"
android:textAppearance="@*android:style/TextAppearance.Toast"/>
</LinearLayout>