diff options
| author | 2023-06-02 15:58:28 +0000 | |
|---|---|---|
| committer | 2023-06-02 15:58:28 +0000 | |
| commit | 2ec00dd65a38cc4668bdb58e3d047fb75588da14 (patch) | |
| tree | 476ec51ce0c8b99456aca0a47f8102dee6b5ab0a /java/src | |
| parent | b3545d7c4c9220df9f39f3694a92e2ec32b526cb (diff) | |
| parent | 40562cc4a8d0693a51a057119d1f3d4821105a81 (diff) | |
Always use file or image preview UI when sending files am: 8764dfb8c1 am: 40562cc4a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/23521228
Change-Id: I82d31b8ee0e7a27082afe72d399474e229911804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/intentresolver/contentpreview/MimeTypeClassifier.java | 7 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/contentpreview/PreviewDataProvider.kt | 6 |
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) { |