| commit | a305214073667993207b0506ede81a23f6664ceb | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Wed Jun 30 05:10:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 30 05:10:20 2021 +0000 |
| tree | 021a52f84aaee0705ecd4da8261da65241379d5e | |
| parent | 895dd1cb876048ac3ba4a762f31c3a8d1026fbf9 [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: I023a9d099fb0f57aa15540d4d4fe00366b3df315
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"