Merge "Manage education title and description are two lines and ellipsized" into rvc-dev am: df38e692a5 am: 2cfedf4f5b am: 6e15084b39

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

Change-Id: Ie55e0a2b31ec5c52a57d09daf1000c8258378524
This commit is contained in:
Alex Mang
2020-06-17 20:38:08 +00:00
committed by Automerger Merge Worker

View File

@@ -41,7 +41,8 @@
android:paddingStart="16dp"
android:paddingBottom="16dp"
android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
android:maxLines="1"
android:maxLines="2"
android:ellipsize="end"
android:text="@string/bubbles_user_education_manage_title"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
@@ -52,6 +53,8 @@
android:paddingStart="16dp"
android:paddingBottom="24dp"
android:text="@string/bubbles_user_education_manage"
android:maxLines="2"
android:ellipsize="end"
android:fontFamily="@*android:string/config_bodyFontFamily"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>