| commit | 8703ceb1a61aab1a147c31c786d8f5b7b77ada3d | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Wed Jun 30 05:11:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 30 05:11:45 2021 +0000 |
| tree | dfb2851f38f41af7091b788d7faea2c59b375ace | |
| parent | 9227721d72d5a67f97f6ee244609497681a4c798 [diff] | |
| parent | d4b713c7aeb4fb13eb2206175bd580dc00e4dc1e [diff] |
Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15135388 Change-Id: Ibc5d7a5f683d2551fdd03b8d0335e7d93847d9e3
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"