Merge "When showing a single text line in preview, strip out newlines" into udc-dev

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);