Merge "Align file sharing UI with mocks." into udc-dev

5 files changed, 17 insertions, 25 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
index e9d65eed..d7d35100 100644
--- a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
@@ -22,7 +22,6 @@ import android.util.PluralsMessageFormatter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.intentresolver.R;
@@ -69,7 +68,7 @@ class FileContentPreviewUi extends ContentPreviewUi {
 
         final int uriCount = mFiles.size();
 
-        displayHeadline(contentPreviewLayout, mHeadlineGenerator.getItemsHeadline(mFiles.size()));
+        displayHeadline(contentPreviewLayout, mHeadlineGenerator.getFilesHeadline(mFiles.size()));
 
         if (uriCount == 0) {
             contentPreviewLayout.setVisibility(View.GONE);
@@ -79,26 +78,21 @@ class FileContentPreviewUi extends ContentPreviewUi {
         }
 
         FileInfo fileInfo = mFiles.get(0);
-        final CharSequence fileName;
-        final int iconId;
-        if (uriCount == 1) {
-            fileName = fileInfo.getName();
-            iconId = R.drawable.chooser_file_generic;
-        } else {
+        TextView fileNameView = contentPreviewLayout.findViewById(
+                R.id.content_preview_filename);
+        fileNameView.setText(fileInfo.getName());
+
+        TextView secondLine = contentPreviewLayout.findViewById(
+                R.id.content_preview_more_files);
+        if (uriCount > 1) {
             int remUriCount = uriCount - 1;
             Map<String, Object> arguments = new HashMap<>();
             arguments.put(PLURALS_COUNT, remUriCount);
-            arguments.put(PLURALS_FILE_NAME, fileInfo.getName());
-            fileName = PluralsMessageFormatter.format(resources, arguments, R.string.file_count);
-            iconId = R.drawable.ic_file_copy;
+            secondLine.setText(
+                    PluralsMessageFormatter.format(resources, arguments, R.string.more_files));
+        } else {
+            secondLine.setVisibility(View.GONE);
         }
-        TextView fileNameView = contentPreviewLayout.findViewById(
-                com.android.internal.R.id.content_preview_filename);
-        fileNameView.setText(fileName);
-
-        ImageView fileIconView = contentPreviewLayout.findViewById(
-                com.android.internal.R.id.content_preview_file_icon);
-        fileIconView.setImageResource(iconId);
 
         final ActionRow actionRow =
                 contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row);
diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
index 5174234a..12843e0a 100644
--- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
@@ -153,7 +153,7 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
             } else if (mAllVideos) {
                 headline = mHeadlineGenerator.getVideosHeadline(mFiles.size());
             } else {
-                headline = mHeadlineGenerator.getItemsHeadline(mFiles.size());
+                headline = mHeadlineGenerator.getFilesHeadline(mFiles.size());
             }
         }
 
diff --git a/java/src/com/android/intentresolver/contentpreview/HeadlineGenerator.kt b/java/src/com/android/intentresolver/contentpreview/HeadlineGenerator.kt
index ad2a7ada..5f87c924 100644
--- a/java/src/com/android/intentresolver/contentpreview/HeadlineGenerator.kt
+++ b/java/src/com/android/intentresolver/contentpreview/HeadlineGenerator.kt
@@ -16,8 +16,6 @@
 
 package com.android.intentresolver.contentpreview
 
-private const val PLURALS_COUNT = "count"
-
 /**
  * HeadlineGenerator generates the text to show at the top of the sharesheet as a brief
  * description of the content being shared.
@@ -35,5 +33,5 @@ interface HeadlineGenerator {
 
     fun getVideosHeadline(count: Int): String
 
-    fun getItemsHeadline(count: Int): String
+    fun getFilesHeadline(count: Int): String
 }
diff --git a/java/src/com/android/intentresolver/contentpreview/HeadlineGeneratorImpl.kt b/java/src/com/android/intentresolver/contentpreview/HeadlineGeneratorImpl.kt
index a6b782ad..1aace8c3 100644
--- a/java/src/com/android/intentresolver/contentpreview/HeadlineGeneratorImpl.kt
+++ b/java/src/com/android/intentresolver/contentpreview/HeadlineGeneratorImpl.kt
@@ -56,8 +56,8 @@ class HeadlineGeneratorImpl(private val context: Context) : HeadlineGenerator {
         return getPluralString(R.string.sharing_videos, count)
     }
 
-    override fun getItemsHeadline(count: Int): String {
-        return getPluralString(R.string.sharing_items, count)
+    override fun getFilesHeadline(count: Int): String {
+        return getPluralString(R.string.sharing_files, count)
     }
 
     private fun getPluralString(@StringRes templateResource: Int, count: Int): String {
diff --git a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
index ada344de..22e98373 100644
--- a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
@@ -136,7 +136,7 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
                     contentPreviewLayout, mHeadlineGenerator.getVideosHeadline(mFiles.size()));
         } else {
             displayHeadline(
-                    contentPreviewLayout, mHeadlineGenerator.getItemsHeadline(mFiles.size()));
+                    contentPreviewLayout, mHeadlineGenerator.getFilesHeadline(mFiles.size()));
         }
 
         return contentPreviewLayout;