Merge "Files + text in a separate preview layout." into udc-dev

2 files changed, 19 insertions, 8 deletions

diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
index acced89f..385f9fd8 100644
--- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
+++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
@@ -857,9 +857,9 @@ public class UnbundledChooserActivityTest {
                 .perform(click());
         waitForIdle();
 
-        onView(withId(R.id.scrollable_image_preview))
+        onView(withId(R.id.image_view))
                 .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
-        onView(withId(com.android.internal.R.id.content_preview_text))
+        onView(withId(R.id.content_preview_text))
                 .check(matches(allOf(isDisplayed(), not(isEnabled()))));
     }
 
@@ -1074,7 +1074,7 @@ public class UnbundledChooserActivityTest {
     }
 
     @Test
-    public void testNoTextPreviewWhenTextIsSharedWithMultipleImages() {
+    public void testTextPreviewWhenTextIsSharedWithMultipleImages() {
         final Uri uri = Uri.parse("android.resource://com.android.frameworks.coretests/"
                 + R.drawable.test320x240);
         final String sharedText = "text-" + System.currentTimeMillis();
@@ -1104,8 +1104,7 @@ public class UnbundledChooserActivityTest {
                 .thenReturn(resolvedComponentInfos);
         mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));
         waitForIdle();
-        onView(withId(com.android.internal.R.id.content_preview_text))
-                .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)));
+        onView(withText(sharedText)).check(matches(isDisplayed()));
     }
 
     @Test
diff --git a/java/tests/src/com/android/intentresolver/contentpreview/HeadlineGeneratorImplTest.kt b/java/tests/src/com/android/intentresolver/contentpreview/HeadlineGeneratorImplTest.kt
index 9becce99..aac6caa7 100644
--- a/java/tests/src/com/android/intentresolver/contentpreview/HeadlineGeneratorImplTest.kt
+++ b/java/tests/src/com/android/intentresolver/contentpreview/HeadlineGeneratorImplTest.kt
@@ -28,14 +28,26 @@ class HeadlineGeneratorImplTest {
     fun testHeadlineGeneration() {
         val generator = HeadlineGeneratorImpl(
             InstrumentationRegistry.getInstrumentation().getTargetContext())
-        val str = "Some sting"
+        val str = "Some string"
         val url = "http://www.google.com"
 
         assertThat(generator.getTextHeadline(str)).isEqualTo("Sharing text")
         assertThat(generator.getTextHeadline(url)).isEqualTo("Sharing link")
 
-        assertThat(generator.getImageWithTextHeadline(str)).isEqualTo("Sharing image with text")
-        assertThat(generator.getImageWithTextHeadline(url)).isEqualTo("Sharing image with link")
+        assertThat(generator.getImagesWithTextHeadline(str, 1)).isEqualTo("Sharing image with text")
+        assertThat(generator.getImagesWithTextHeadline(url, 1)).isEqualTo("Sharing image with link")
+        assertThat(generator.getImagesWithTextHeadline(str, 5)).isEqualTo("Sharing 5 images with text")
+        assertThat(generator.getImagesWithTextHeadline(url, 5)).isEqualTo("Sharing 5 images with link")
+
+        assertThat(generator.getVideosWithTextHeadline(str, 1)).isEqualTo("Sharing video with text")
+        assertThat(generator.getVideosWithTextHeadline(url, 1)).isEqualTo("Sharing video with link")
+        assertThat(generator.getVideosWithTextHeadline(str, 5)).isEqualTo("Sharing 5 videos with text")
+        assertThat(generator.getVideosWithTextHeadline(url, 5)).isEqualTo("Sharing 5 videos with link")
+
+        assertThat(generator.getFilesWithTextHeadline(str, 1)).isEqualTo("Sharing file with text")
+        assertThat(generator.getFilesWithTextHeadline(url, 1)).isEqualTo("Sharing file with link")
+        assertThat(generator.getFilesWithTextHeadline(str, 5)).isEqualTo("Sharing 5 files with text")
+        assertThat(generator.getFilesWithTextHeadline(url, 5)).isEqualTo("Sharing 5 files with link")
 
         assertThat(generator.getImagesHeadline(1)).isEqualTo("Sharing image")
         assertThat(generator.getImagesHeadline(4)).isEqualTo("Sharing 4 images")