Merge "Add unified preview UI" into udc-dev

1 files changed, 87 insertions, 4 deletions

diff --git a/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt b/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
index 23bfaf9f..04a136b4 100644
--- a/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
+++ b/java/tests/src/com/android/intentresolver/contentpreview/ChooserContentPreviewUiTest.kt
@@ -39,7 +39,7 @@ import java.util.function.Consumer
 private const val PROVIDER_NAME = "org.pkg.app"
 class ChooserContentPreviewUiTest {
     private val contentResolver = mock<ContentInterface>()
-    private val imageClassifier = ChooserContentPreviewUi.ImageMimeTypeClassifier { mimeType ->
+    private val imageClassifier = MimeTypeClassifier { mimeType ->
         mimeType != null && ClipDescription.compareMimeTypes(mimeType, "image/*")
     }
     private val imageLoader = object : ImageLoader {
@@ -123,7 +123,7 @@ class ChooserContentPreviewUiTest {
     }
 
     @Test
-    fun test_ChooserContentPreview_single_non_image_uri_to_file_preview() {
+    fun test_ChooserContentPreview_single_uri_without_preview_to_file_preview() {
         val uri = Uri.parse("content://$PROVIDER_NAME/test.pdf")
         val targetIntent = Intent(Intent.ACTION_SEND).apply {
             putExtra(Intent.EXTRA_STREAM, uri)
@@ -144,6 +144,29 @@ class ChooserContentPreviewUiTest {
     }
 
     @Test
+    fun test_ChooserContentPreview_single_uri_with_preview_to_image_preview() {
+        val uri = Uri.parse("content://$PROVIDER_NAME/test.pdf")
+        val targetIntent = Intent(Intent.ACTION_SEND).apply {
+            putExtra(Intent.EXTRA_STREAM, uri)
+        }
+        whenever(contentResolver.getType(uri)).thenReturn("application/pdf")
+        whenever(contentResolver.getStreamTypes(uri, "*/*"))
+                .thenReturn(arrayOf("application/pdf", "image/png"))
+        val testSubject = ChooserContentPreviewUi(
+                targetIntent,
+                contentResolver,
+                imageClassifier,
+                imageLoader,
+                actionFactory,
+                transitionCallback,
+                featureFlagRepository
+        )
+        assertThat(testSubject.preferredContentPreview)
+                .isEqualTo(ContentPreviewType.CONTENT_PREVIEW_IMAGE)
+        verify(transitionCallback, never()).onAllTransitionElementsReady()
+    }
+
+    @Test
     fun test_ChooserContentPreview_multiple_image_uri_to_image_preview() {
         val uri1 = Uri.parse("content://$PROVIDER_NAME/test.png")
         val uri2 = Uri.parse("content://$PROVIDER_NAME/test.jpg")
@@ -173,7 +196,7 @@ class ChooserContentPreviewUiTest {
     }
 
     @Test
-    fun test_ChooserContentPreview_some_non_image_uri_to_file_preview() {
+    fun test_ChooserContentPreview_some_non_image_uri_to_image_preview() {
         val uri1 = Uri.parse("content://$PROVIDER_NAME/test.png")
         val uri2 = Uri.parse("content://$PROVIDER_NAME/test.pdf")
         val targetIntent = Intent(Intent.ACTION_SEND_MULTIPLE).apply {
@@ -197,7 +220,67 @@ class ChooserContentPreviewUiTest {
             featureFlagRepository
         )
         assertThat(testSubject.preferredContentPreview)
-            .isEqualTo(ContentPreviewType.CONTENT_PREVIEW_FILE)
+            .isEqualTo(ContentPreviewType.CONTENT_PREVIEW_IMAGE)
+        verify(transitionCallback, never()).onAllTransitionElementsReady()
+    }
+
+    @Test
+    fun test_ChooserContentPreview_some_non_image_uri_with_preview_to_image_preview() {
+        val uri1 = Uri.parse("content://$PROVIDER_NAME/test.mp4")
+        val uri2 = Uri.parse("content://$PROVIDER_NAME/test.pdf")
+        val targetIntent = Intent(Intent.ACTION_SEND_MULTIPLE).apply {
+            putExtra(
+                    Intent.EXTRA_STREAM,
+                    ArrayList<Uri>().apply {
+                        add(uri1)
+                        add(uri2)
+                    }
+            )
+        }
+        whenever(contentResolver.getType(uri1)).thenReturn("video/mpeg4")
+        whenever(contentResolver.getStreamTypes(uri1, "*/*"))
+                .thenReturn(arrayOf("image/png"))
+        whenever(contentResolver.getType(uri2)).thenReturn("application/pdf")
+        val testSubject = ChooserContentPreviewUi(
+                targetIntent,
+                contentResolver,
+                imageClassifier,
+                imageLoader,
+                actionFactory,
+                transitionCallback,
+                featureFlagRepository
+        )
+        assertThat(testSubject.preferredContentPreview)
+                .isEqualTo(ContentPreviewType.CONTENT_PREVIEW_IMAGE)
+        verify(transitionCallback, never()).onAllTransitionElementsReady()
+    }
+
+    @Test
+    fun test_ChooserContentPreview_all_non_image_uris_without_preview_to_file_preview() {
+        val uri1 = Uri.parse("content://$PROVIDER_NAME/test.html")
+        val uri2 = Uri.parse("content://$PROVIDER_NAME/test.pdf")
+        val targetIntent = Intent(Intent.ACTION_SEND_MULTIPLE).apply {
+            putExtra(
+                    Intent.EXTRA_STREAM,
+                    ArrayList<Uri>().apply {
+                        add(uri1)
+                        add(uri2)
+                    }
+            )
+        }
+        whenever(contentResolver.getType(uri1)).thenReturn("text/html")
+        whenever(contentResolver.getType(uri2)).thenReturn("application/pdf")
+        val testSubject = ChooserContentPreviewUi(
+                targetIntent,
+                contentResolver,
+                imageClassifier,
+                imageLoader,
+                actionFactory,
+                transitionCallback,
+                featureFlagRepository
+        )
+        assertThat(testSubject.preferredContentPreview)
+                .isEqualTo(ContentPreviewType.CONTENT_PREVIEW_FILE)
         verify(transitionCallback, times(1)).onAllTransitionElementsReady()
     }
 }