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

Commit ea1414da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838088

Change-Id: Ie0ac87743eefd1aa4a9b6881156d7ab8fe1a730a
parents 3e306330 aaca770c

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>