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

Commit aaca770c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents a47b439b b4f93964

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>