| commit | 8bf82f25bc9edd11d73e96d437b061a5be5618c8 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Wed Jun 30 05:22:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 30 05:22:25 2021 +0000 |
| tree | bab4b699adba853b8016f9ae324a823f20087b90 | |
| parent | ea895791cca3184637f8ed0a80a46c703ae37702 [diff] | |
| parent | a305214073667993207b0506ede81a23f6664ceb [diff] |
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae am: a305214073 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388 Change-Id: I1b4f0d02726f990671fe15dbc4ac23da197e5be5
diff --git a/res/layout/system_shortcut.xml b/res/layout/system_shortcut.xml index 2cdf1f4..de091c5 100644 --- a/res/layout/system_shortcut.xml +++ b/res/layout/system_shortcut.xml
@@ -32,7 +32,8 @@ android:paddingStart="@dimen/deep_shortcuts_text_padding_start" android:paddingEnd="@dimen/popup_padding_end" android:textSize="14sp" - android:singleLine="true" + android:minLines="1" + android:maxLines="2" android:ellipsize="end" android:textColor="?android:attr/textColorPrimary" launcher:iconDisplay="shortcut_popup"