Merge "Ellipsize user edu title/desc; max 2 line title" into rvc-dev am: af0ddb78fd am: c2989e34f2 am: 1ff1e7a0fe

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

Change-Id: Ie932ae213afc0e232b013f75f3561b253b5347bf
This commit is contained in:
Lyn Han
2020-06-18 16:18:57 +00:00
committed by Automerger Merge Worker

View File

@@ -33,7 +33,8 @@
android:layout_height="wrap_content"
android:paddingBottom="16dp"
android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
android:maxLines="1"
android:maxLines="2"
android:ellipsize="end"
android:text="@string/bubbles_user_education_title"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
@@ -41,6 +42,7 @@
android:id="@+id/user_education_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:text="@string/bubbles_user_education_description"
android:fontFamily="@*android:string/config_bodyFontFamily"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>