From ece4f065d291928392c29a012fc5bb150559da09 Mon Sep 17 00:00:00 2001 From: 1 Date: Thu, 27 Apr 2023 18:47:01 +0000 Subject: When showing a single text line in preview, strip out newlines Bug: 279939310 Test: Manual test with a multiline input in portrait and landscape. Change-Id: If271934fdb9ba1bf4a531c5498c901dd839e625f --- .../intentresolver/contentpreview/TextContentPreviewUi.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'java/src') 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); -- cgit v1.2.3-59-g8ed1b