diff options
| author | 2023-04-28 01:55:49 +0000 | |
|---|---|---|
| committer | 2023-04-28 01:55:49 +0000 | |
| commit | a7a2244d397acb68118e8b135ed68534900516b3 (patch) | |
| tree | b5535d1083775f5195f9d3dc6855c66280de98bf /java | |
| parent | be75ef548c4da02c8404aec17b628a3ae8021179 (diff) | |
| parent | f5c207adda4e8d018598278301b75499d0b45cc7 (diff) | |
Merge "When showing a single text line in preview, strip out newlines" into udc-dev am: f5c207adda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22907818
Change-Id: Ibdd054ed1a8ae4a70e644a69f28bd1d674ec954f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java index 3f662ce3..ccf5061d 100644 --- a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java +++ b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java @@ -96,7 +96,13 @@ class TextContentPreviewUi extends ContentPreviewUi { TextView textView = contentPreviewLayout.findViewById( com.android.internal.R.id.content_preview_text); - textView.setText(mSharingText); + String text = mSharingText.toString(); + + // If we're only previewing one line, then strip out newlines. + if (textView.getMaxLines() == 1) { + text = text.replace("\n", " "); + } + textView.setText(text); TextView previewTitleView = contentPreviewLayout.findViewById( com.android.internal.R.id.content_preview_title); |