| commit | ec448c10ddfd5d93a73c6a97f2d9c2669a06c765 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Wed Jun 30 05:12:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 30 05:12:26 2021 +0000 |
| tree | ef46e4f9f74fe931c913efb67c5840389f46598c | |
| parent | ae7ef2d5c1a5b10dd793a1c373885da0ef8727c8 [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: I9c471e724cdf171e87a97b42622b843258e87788
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"