From b2494b73cfb4802e694fa45a088334b628b85837 Mon Sep 17 00:00:00 2001
From: 1 <mrcasey@google.com>
Date: Thu, 27 Apr 2023 16:50:07 +0000
Subject: Landscape UI tweaks based upon UX/product feedback

- Show preview images but reduce height.
- Reduce top margin above icons in target list.

Bug: 267522604
Test: Manual test with a variety of inputs from ShareTest in portrait
      and landscape.
Change-Id: I4a373b5c9cab555ffb4c28447f76e057d4114902
---
 java/res/layout/resolve_grid_item.xml                |  2 +-
 java/res/values-h480dp/dimens.xml                    |  2 ++
 java/res/values/dimens.xml                           |  3 ++-
 .../contentpreview/UnifiedContentPreviewUi.java      | 20 +++++++-------------
 4 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'java')

diff --git a/java/res/layout/resolve_grid_item.xml b/java/res/layout/resolve_grid_item.xml
index 168397db..4cf7d04b 100644
--- a/java/res/layout/resolve_grid_item.xml
+++ b/java/res/layout/resolve_grid_item.xml
@@ -24,7 +24,7 @@
               android:layout_height="wrap_content"
               android:minHeight="100dp"
               android:gravity="center"
-              android:paddingTop="24dp"
+              android:paddingTop="@dimen/grid_padding_top"
               android:paddingBottom="12dp"
               android:paddingHorizontal="4dp"
               android:focusable="true"
diff --git a/java/res/values-h480dp/dimens.xml b/java/res/values-h480dp/dimens.xml
index 3bfa3083..3d9e72b8 100644
--- a/java/res/values-h480dp/dimens.xml
+++ b/java/res/values-h480dp/dimens.xml
@@ -25,4 +25,6 @@
     <dimen name="chooser_view_spacing">18dp</dimen>
     <dimen name="chooser_action_max_width">80dp</dimen>
     <dimen name="width_text_image_preview_size">100dp</dimen>
+    <dimen name="chooser_preview_image_height_tall">192dp</dimen>
+    <dimen name="grid_padding_top">24dp</dimen>
 </resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index e0a3b2c6..64f21800 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -49,7 +49,6 @@
     <dimen name="resolver_empty_state_container_padding_top">48dp</dimen>
     <dimen name="resolver_empty_state_container_padding_bottom">8dp</dimen>
     <dimen name="resolver_profile_tab_margin">4dp</dimen>
-    <dimen name="chooser_preview_image_height_tall">192dp</dimen>
     <dimen name="chooser_action_view_icon_size">22dp</dimen>
     <dimen name="chooser_action_margin">0dp</dimen>
 
@@ -59,5 +58,7 @@
     <dimen name="chooser_view_spacing">8dp</dimen>
     <dimen name="chooser_action_max_width">120dp</dimen>
     <dimen name="width_text_image_preview_size">32dp</dimen>
+    <dimen name="chooser_preview_image_height_tall">64dp</dimen>
+    <dimen name="grid_padding_top">8dp</dimen>
     <!-- END SECTION -->
 </resources>
diff --git a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
index 04c1664b..c918a7f6 100644
--- a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
@@ -81,7 +81,6 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
                 R.layout.chooser_grid_preview_image, parent, false);
         ScrollableImagePreviewView imagePreview =
                 contentPreviewLayout.findViewById(R.id.scrollable_image_preview);
-        boolean showImages = !parent.getContext().getResources().getBoolean(R.bool.minimal_preview);
 
         final ActionRow actionRow =
                 contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row);
@@ -113,24 +112,19 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
             allImages = allImages && previewType == ScrollableImagePreviewView.PreviewType.Image;
             allVideos = allVideos && previewType == ScrollableImagePreviewView.PreviewType.Video;
 
-            if (showImages && fileInfo.getPreviewUri() != null) {
+            if (fileInfo.getPreviewUri() != null) {
                 previews.add(new ScrollableImagePreviewView.Preview(
                         previewType,
                         fileInfo.getPreviewUri()));
             }
         }
 
-        if (showImages) {
-            imagePreview.setOnNoPreviewCallback(() -> imagePreview.setVisibility(View.GONE));
-            imagePreview.setTransitionElementStatusCallback(mTransitionElementStatusCallback);
-            imagePreview.setPreviews(
-                    previews,
-                    mFiles.size() - previews.size(),
-                    mImageLoader);
-        } else {
-            imagePreview.setVisibility(View.GONE);
-            mTransitionElementStatusCallback.onAllTransitionElementsReady();
-        }
+        imagePreview.setOnNoPreviewCallback(() -> imagePreview.setVisibility(View.GONE));
+        imagePreview.setTransitionElementStatusCallback(mTransitionElementStatusCallback);
+        imagePreview.setPreviews(
+                previews,
+                mFiles.size() - previews.size(),
+                mImageLoader);
 
         if (allImages) {
             displayHeadline(
-- 
cgit v1.2.3-59-g8ed1b