From 72e9bda3d304540515742135bf12e5f1dbed8857 Mon Sep 17 00:00:00 2001
From: 1 <mrcasey@google.com>
Date: Mon, 8 May 2023 21:01:33 +0000
Subject: Fixes based upon UX feedback

- Align colors with mocks.
- Increase custom action vertical padding
- Align text + image and file + text to the same 56x56 image size
- Reduce target vertical padding
- Don't disable text when share is "image only"
- Add an icon for single-file shares
- Update multi-file icon to align with mocks.
- Vertically align image in text+image
- Show image and title with text in landscape
- Reduce text preview padding to align with file+text padding.

Bug: 281541996
Test: build and test with ShareTest, Files and Photos.
Change-Id: Ia58315d765a824cb45ee1b84625c1262a8a3e76d
---
 .../intentresolver/contentpreview/FileContentPreviewUi.java        | 3 +++
 .../contentpreview/FilesPlusTextContentPreviewUi.java              | 1 -
 .../intentresolver/contentpreview/TextContentPreviewUi.java        | 7 ++-----
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'java/src')

diff --git a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
index 85f94451..13f27493 100644
--- a/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FileContentPreviewUi.java
@@ -22,6 +22,7 @@ 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;
@@ -91,6 +92,8 @@ class FileContentPreviewUi extends ContentPreviewUi {
             secondLine.setText(
                     PluralsMessageFormatter.format(resources, arguments, R.string.more_files));
         } else {
+            ImageView icon = contentPreviewLayout.findViewById(R.id.content_preview_file_icon);
+            icon.setImageResource(R.drawable.single_file);
             secondLine.setVisibility(View.GONE);
         }
 
diff --git a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
index 363508b7..4fe54681 100644
--- a/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/FilesPlusTextContentPreviewUi.java
@@ -181,7 +181,6 @@ class FilesPlusTextContentPreviewUi extends ContentPreviewUi {
         includeText.setText(isLink ? R.string.include_link : R.string.include_text);
         shareTextAction.accept(false);
         includeText.setOnCheckedChangeListener((view, isChecked) -> {
-            textView.setEnabled(isChecked);
             if (isChecked) {
                 textView.setText(mText);
             } else {
diff --git a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
index c429b2d6..3c8a6e48 100644
--- a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
@@ -79,9 +79,6 @@ class TextContentPreviewUi extends ContentPreviewUi {
         ViewGroup contentPreviewLayout = (ViewGroup) layoutInflater.inflate(
                 R.layout.chooser_grid_preview_text, parent, false);
 
-        boolean minimalPreview =
-                parent.getContext().getResources().getBoolean(R.bool.minimal_preview);
-
         final ActionRow actionRow =
                 contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row);
         actionRow.setActions(
@@ -108,7 +105,7 @@ class TextContentPreviewUi extends ContentPreviewUi {
 
         TextView previewTitleView = contentPreviewLayout.findViewById(
                 com.android.internal.R.id.content_preview_title);
-        if (TextUtils.isEmpty(mPreviewTitle) || minimalPreview) {
+        if (TextUtils.isEmpty(mPreviewTitle)) {
             previewTitleView.setVisibility(View.GONE);
         } else {
             previewTitleView.setText(mPreviewTitle);
@@ -116,7 +113,7 @@ class TextContentPreviewUi extends ContentPreviewUi {
 
         ImageView previewThumbnailView = contentPreviewLayout.findViewById(
                 com.android.internal.R.id.content_preview_thumbnail);
-        if (!isOwnedByCurrentUser(mPreviewThumbnail) || minimalPreview) {
+        if (!isOwnedByCurrentUser(mPreviewThumbnail)) {
             previewThumbnailView.setVisibility(View.GONE);
         } else {
             mImageLoader.loadImage(
-- 
cgit v1.2.3-59-g8ed1b