Merge changes I7ad8d0b9,I8afdb13b into udc-dev

* changes:
  Reduce preview height on landscape phones.
  Simplify resource definition for landscape phones.

2 files changed, 19 insertions, 10 deletions

diff --git a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
index 6bf9a1cc..a3a42efc 100644
--- a/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/TextContentPreviewUi.java
@@ -77,6 +77,9 @@ 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(
@@ -97,7 +100,7 @@ class TextContentPreviewUi extends ContentPreviewUi {
 
         TextView previewTitleView = contentPreviewLayout.findViewById(
                 com.android.internal.R.id.content_preview_title);
-        if (TextUtils.isEmpty(mPreviewTitle)) {
+        if (TextUtils.isEmpty(mPreviewTitle) || minimalPreview) {
             previewTitleView.setVisibility(View.GONE);
         } else {
             previewTitleView.setText(mPreviewTitle);
@@ -105,7 +108,7 @@ class TextContentPreviewUi extends ContentPreviewUi {
 
         ImageView previewThumbnailView = contentPreviewLayout.findViewById(
                 com.android.internal.R.id.content_preview_thumbnail);
-        if (!validForContentPreview(mPreviewThumbnail)) {
+        if (!validForContentPreview(mPreviewThumbnail) || minimalPreview) {
             previewThumbnailView.setVisibility(View.GONE);
         } else {
             mImageLoader.loadImage(
diff --git a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
index 6f1be116..ada344de 100644
--- a/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
+++ b/java/src/com/android/intentresolver/contentpreview/UnifiedContentPreviewUi.java
@@ -81,7 +81,7 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
                 R.layout.chooser_grid_preview_image, parent, false);
         ScrollableImagePreviewView imagePreview =
                 contentPreviewLayout.findViewById(R.id.scrollable_image_preview);
-        imagePreview.setOnNoPreviewCallback(() -> imagePreview.setVisibility(View.GONE));
+        boolean showImages = !parent.getContext().getResources().getBoolean(R.bool.minimal_preview);
 
         final ActionRow actionRow =
                 contentPreviewLayout.findViewById(com.android.internal.R.id.chooser_action_row);
@@ -100,8 +100,6 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
             return contentPreviewLayout;
         }
 
-        imagePreview.setTransitionElementStatusCallback(mTransitionElementStatusCallback);
-
         List<ScrollableImagePreviewView.Preview> previews = new ArrayList<>();
         boolean allImages = !mFiles.isEmpty();
         boolean allVideos = !mFiles.isEmpty();
@@ -111,16 +109,24 @@ class UnifiedContentPreviewUi extends ContentPreviewUi {
             allImages = allImages && previewType == ScrollableImagePreviewView.PreviewType.Image;
             allVideos = allVideos && previewType == ScrollableImagePreviewView.PreviewType.Video;
 
-            if (fileInfo.getPreviewUri() != null) {
+            if (showImages && fileInfo.getPreviewUri() != null) {
                 previews.add(new ScrollableImagePreviewView.Preview(
                         previewType,
                         fileInfo.getPreviewUri()));
             }
         }
-        imagePreview.setPreviews(
-                previews,
-                mFiles.size() - previews.size(),
-                mImageLoader);
+
+        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();
+        }
 
         if (allImages) {
             displayHeadline(