Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Iaa7adc0924e76cdd96235ba8dfccec42cbdc0447
This commit is contained in:
Lyn Han
2020-06-18 15:45:28 +00:00
committed by Automerger Merge Worker
parent b73ac9086b af0ddb78fd
commit 0e6a737eb4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/bubble_stack_user_education.xml
View File

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