Always use file or image preview UI when sending files

When sending files, always use the file preivew UI (or the image preview
UI, when applicable) regardless of the intent type.

Fix: 285174069
Test: manual testing, unit tests
Change-Id: I6f27839427b58a09ffb397ba56c2ce8401380a21

2 files changed, 1 insertions, 12 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/MimeTypeClassifier.java b/java/src/com/android/intentresolver/contentpreview/MimeTypeClassifier.java
index c86b0fe2..0c333b68 100644
--- a/java/src/com/android/intentresolver/contentpreview/MimeTypeClassifier.java
+++ b/java/src/com/android/intentresolver/contentpreview/MimeTypeClassifier.java
@@ -33,11 +33,4 @@ public interface MimeTypeClassifier {
     default boolean isVideoType(@Nullable String mimeType) {
         return (mimeType != null) && ClipDescription.compareMimeTypes(mimeType, "video/*");
     }
-
-    /**
-     * @return whether the specified {@code mimeType} is classified as "text" type
-     */
-    default boolean isTextType(@Nullable String mimeType) {
-        return (mimeType != null) && ClipDescription.compareMimeTypes(mimeType, "text/*");
-    }
 }
diff --git a/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt b/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
index ae705369..8ab3a272 100644
--- a/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
+++ b/java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt
@@ -104,11 +104,7 @@ constructor(
              * that broadly covers all data being shared, such as '*' when sending an image
              * and text. We therefore should inspect each item for the preferred type, in order:
              * IMAGE, FILE, TEXT. */
-            if (
-                !targetIntent.isSend ||
-                    typeClassifier.isTextType(targetIntent.type) ||
-                    records.isEmpty()
-            ) {
+            if (!targetIntent.isSend || records.isEmpty()) {
                 CONTENT_PREVIEW_TEXT
             } else {
                 runBlocking(dispatcher) {