Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4f93964 authored by Alex Stetson's avatar Alex Stetson
Browse files

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
parent bafcdd73

core/res/res/layout/transient_notification.xml

+0 −1
Original line number Diff line number Diff line
@@ -40,6 +40,5 @@ 
        android:maxLines="2"

        android:paddingTop="12dp"

        android:paddingBottom="12dp"

        android:lineHeight="20sp"

        android:textAppearance="@style/TextAppearance.Toast"/>

</LinearLayout>

core/res/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/res/layout/text_toast.xml

+0 −1
Original line number Diff line number Diff line
@@ -45,6 +45,5 @@ 
        android:maxLines="2"

        android:paddingTop="12dp"

        android:paddingBottom="12dp"

        android:lineHeight="20sp"

        android:textAppearance="@*android:style/TextAppearance.Toast"/>

</LinearLayout>