Download Home : Added support for full width image

As per the UX, when there is only one image for a date, the image
should span across the full screen width. Using adjustViewBounds property
of ImageView to readjust the height of the image when in full width mode.

Bug: 868567
Change-Id: Ia6ddf860e3168fda49f5bbf6a1043004e91bd663
Reviewed-on: https://chromium-review.googlesource.com/1162625
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581110}

chrome/android/java/res/layout/download_manager_image_item.xml

@@ -9,16 +9,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:clickable="true"
-    android:background="@color/modern_primary_color" >
+    android:background="@color/google_grey_100" >
 
     <ImageView
         android:id="@+id/thumbnail"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/download_manager_image_width"
+        android:layout_height="wrap_content"
         android:scaleType="centerCrop"
         android:layout_gravity="center"
+        android:adjustViewBounds="true"
         tools:ignore="ContentDescription" />
 
     <org.chromium.chrome.browser.download.home.view.SelectionView

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/DateOrderedListMutator.java

@@ -13,6 +13,7 @@ import org.chromium.chrome.browser.download.home.list.ListItem.OfflineItemListIt
 import org.chromium.chrome.browser.download.home.list.ListItem.SectionHeaderListItem;
 import org.chromium.chrome.browser.download.home.list.ListItem.SeparatorViewListItem;
 import org.chromium.components.offline_items_collection.OfflineItem;
+import org.chromium.components.offline_items_collection.OfflineItemFilter;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -150,8 +151,13 @@ class DateOrderedListMutator implements OfflineItemFilterObserver {
                 }
 
                 // Add the items in the section.
-                for (OfflineItem item : section.items.values()) {
-                    listItems.add(new OfflineItemListItem(item));
+                for (OfflineItem offlineItem : section.items.values()) {
+                    OfflineItemListItem item = new OfflineItemListItem(offlineItem);
+                    if (section.items.size() == 1
+                            && offlineItem.filter == OfflineItemFilter.FILTER_IMAGE) {
+                        item.spanFullWidth = true;
+                    }
+                    listItems.add(item);
                 }
 
                 // Add a section separator if needed.

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/ListItem.java

@@ -132,6 +132,7 @@ public abstract class ListItem {
     /** A {@link ListItem} that involves a {@link OfflineItem}. */
     public static class OfflineItemListItem extends DateListItem {
         public final OfflineItem item;
+        public boolean spanFullWidth;
 
         /** Creates an {@link OfflineItemListItem} wrapping {@code item}. */
         public OfflineItemListItem(OfflineItem item) {

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/ListUtils.java

@@ -120,6 +120,10 @@ public class ListUtils {
      * @see             GridLayoutManager.SpanSizeLookup
      */
     public static int getSpanSize(ListItem item, int spanCount) {
+        if (item instanceof OfflineItemListItem && ((OfflineItemListItem) item).spanFullWidth) {
+            return spanCount;
+        }
+
         return getViewTypeForItem(item) == ViewType.IMAGE ? 1 : spanCount;
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/holder/CustomViewHolder.java

@@ -14,8 +14,7 @@ import org.chromium.chrome.browser.modelutil.PropertyModel;
 
 /** A {@link RecyclerView.ViewHolder} that holds a {@link View} that is opaque to the holder. */
 public class CustomViewHolder extends ListItemViewHolder {
-    /** Creates a new {@link org.chromium.chrome.browser.download.home.list.holder.CustomViewHolder}
-     * instance. */
+    /** Creates a new {@link CustomViewHolder} instance. */
     public CustomViewHolder(ViewGroup parent) {
         super(new FrameLayout(parent.getContext()));
         itemView.setLayoutParams(new ViewGroup.LayoutParams(

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/holder/DateViewHolder.java

@@ -16,8 +16,7 @@ import org.chromium.chrome.browser.modelutil.PropertyModel;
 
 /** A {@link RecyclerView.ViewHolder} specifically meant to display a date header. */
 public class DateViewHolder extends ListItemViewHolder {
-    /** Creates a new {@link org.chromium.chrome.browser.download.home.list.holder.DateViewHolder}
-     * instance. */
+    /** Creates a new {@link DateViewHolder} instance. */
     public static org.chromium.chrome.browser.download.home.list.holder.DateViewHolder create(
             ViewGroup parent) {
         View view = LayoutInflater.from(parent.getContext())

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/holder/GenericViewHolder.java

@@ -38,16 +38,13 @@ public class GenericViewHolder extends ThumbnailAwareViewHolder {
     /** The icon to use when there is no thumbnail. */
     private @DrawableRes int mIconId = INVALID_ID;
 
-    /** Creates a new {@link
-     * org.chromium.chrome.browser.download.home.list.holder.GenericViewHolder} instance. */
-    public static org.chromium.chrome.browser.download.home.list.holder.GenericViewHolder create(
-            ViewGroup parent) {
+    /** Creates a new {@link GenericViewHolder} instance. */
+    public static GenericViewHolder create(ViewGroup parent) {
         View view = LayoutInflater.from(parent.getContext())
                             .inflate(R.layout.download_manager_generic_item, null);
         int imageSize = parent.getContext().getResources().getDimensionPixelSize(
                 R.dimen.download_manager_generic_thumbnail_size);
-        return new org.chromium.chrome.browser.download.home.list.holder.GenericViewHolder(
-                view, imageSize);
+        return new GenericViewHolder(view, imageSize);
     }
 
     private GenericViewHolder(View view, int thumbnailSizePx) {

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/holder/ImageViewHolder.java

@@ -16,18 +16,19 @@ import org.chromium.components.offline_items_collection.OfflineItemVisuals;
 
 /** A {@link RecyclerView.ViewHolder} specifically meant to display an image {@code OfflineItem}. */
 public class ImageViewHolder extends ThumbnailAwareViewHolder {
-    public static org.chromium.chrome.browser.download.home.list.holder.ImageViewHolder create(
-            ViewGroup parent) {
+    private final int mImageHeightPx;
+
+    public static ImageViewHolder create(ViewGroup parent) {
         View view = LayoutInflater.from(parent.getContext())
                             .inflate(R.layout.download_manager_image_item, null);
         int imageSize = parent.getContext().getResources().getDimensionPixelSize(
                 R.dimen.download_manager_image_width);
-        return new org.chromium.chrome.browser.download.home.list.holder.ImageViewHolder(
-                view, imageSize);
+        return new ImageViewHolder(view, imageSize);
     }
 
     public ImageViewHolder(View view, int thumbnailSizePx) {
         super(view, thumbnailSizePx, thumbnailSizePx);
+        mImageHeightPx = thumbnailSizePx;
     }
 
     // ThumbnailAwareViewHolder implementation.
@@ -37,6 +38,9 @@ public class ImageViewHolder extends ThumbnailAwareViewHolder {
         ListItem.OfflineItemListItem offlineItem = (ListItem.OfflineItemListItem) item;
         View imageView = itemView.findViewById(R.id.thumbnail);
         imageView.setContentDescription(offlineItem.item.title);
+        ViewGroup.LayoutParams layoutParams = imageView.getLayoutParams();
+        layoutParams.height =
+                offlineItem.spanFullWidth ? ViewGroup.LayoutParams.WRAP_CONTENT : mImageHeightPx;
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/holder/InProgressViewHolder.java

@@ -18,8 +18,10 @@ import org.chromium.chrome.browser.modelutil.PropertyModel;
 import org.chromium.chrome.browser.widget.TintedImageButton;
 import org.chromium.components.offline_items_collection.OfflineItemState;
 
-/** A {@link RecyclerView.ViewHolder} specifically meant to display an in-progress {@code
- * OfflineItem}. */
+/**
+ * A {@link RecyclerView.ViewHolder} specifically meant to display an in-progress {@code
+ * OfflineItem}.
+ */
 public class InProgressViewHolder extends ListItemViewHolder {
     private final ProgressBar mProgressBar;
     private final TextView mTitle;
@@ -28,20 +30,15 @@ public class InProgressViewHolder extends ListItemViewHolder {
     private final TintedImageButton mCancelButton;
 
     /**
-     * Creates a new {@link
-     * org.chromium.chrome.browser.download.home.list.holder.InProgressViewHolder} instance.
+     * Creates a new {@link InProgressViewHolder} instance.
      */
-    public static org.chromium.chrome.browser.download.home.list.holder.InProgressViewHolder create(
-            ViewGroup parent) {
+    public static InProgressViewHolder create(ViewGroup parent) {
         View view = LayoutInflater.from(parent.getContext())
                             .inflate(R.layout.download_manager_in_progress_item, null);
-        return new org.chromium.chrome.browser.download.home.list.holder.InProgressViewHolder(view);
+        return new InProgressViewHolder(view);
     }
 
-    /**
-     * Creates a new {@link
-     * org.chromium.chrome.browser.download.home.list.holder.InProgressViewHolder} instance.
-     */
+    /** Constructor. */
     public InProgressViewHolder(View view) {
         super(view);
         mProgressBar = view.findViewById(R.id.progress_bar);

chrome/android/java/src/org/chromium/chrome/browser/download/home/list/holder/PrefetchViewHolder.java

@@ -25,17 +25,14 @@ public class PrefetchViewHolder extends ThumbnailAwareViewHolder {
     private final TextView mTimestamp;
 
     /**
-     * Creates a new instance of a {@link
-     * org.chromium.chrome.browser.download.home.list.holder.PrefetchViewHolder}.
+     * Creates a new instance of a {@link PrefetchViewHolder}.
      */
-    public static org.chromium.chrome.browser.download.home.list.holder.PrefetchViewHolder create(
-            ViewGroup parent) {
+    public static PrefetchViewHolder create(ViewGroup parent) {
         View view = LayoutInflater.from(parent.getContext())
                             .inflate(R.layout.download_manager_prefetch_item, null);
         int imageSize = parent.getContext().getResources().getDimensionPixelSize(
                 R.dimen.download_manager_prefetch_thumbnail_size);
-        return new org.chromium.chrome.browser.download.home.list.holder.PrefetchViewHolder(
-                view, imageSize);
+        return new PrefetchViewHolder(view, imageSize);
     }
 
     private PrefetchViewHolder(View view, int thumbnailSizePx) {