[NTP::Downloads] Scale up type based icons.

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadUtils.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.download;
 
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.StrictMode;
 import android.provider.Browser;
+import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.support.customtabs.CustomTabsIntent;
 import android.text.TextUtils;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ContentUriUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
@@ skipping 15 matching lines @@
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.document.TabDelegate;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.content_public.browser.DownloadState;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.widget.Toast;
 
 import java.io.File;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 /**
  * A class containing some utility static methods.
  */
 public class DownloadUtils {
 
@@ skipping 15 matching lines @@
             "org.chromium.chrome.browser.download.IS_OFF_THE_RECORD";
 
     private static final long BYTES_PER_KILOBYTE = 1024;
     private static final long BYTES_PER_MEGABYTE = 1024 * 1024;
     private static final long BYTES_PER_GIGABYTE = 1024 * 1024 * 1024;
 
     @VisibleForTesting
     static final String ELLIPSIS = "\u2026";
 
     /**
+     * Possible sizes of type-based icons.
+     */
+    @IntDef({ICON_SIZE_24_DP, ICON_SIZE_36_DP})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface IconSize {}
+
+    public static final int ICON_SIZE_24_DP = 24;
+    public static final int ICON_SIZE_36_DP = 36;
+
+    /**
      * Displays the download manager UI. Note the UI is different on tablets and on phones.
      * @return Whether the UI was shown.
      */
     public static boolean showDownloadManager(@Nullable Activity activity, @Nullable Tab tab) {
         // Figure out what tab was last being viewed by the user.
         if (activity == null) activity = ApplicationStatus.getLastTrackedFocusedActivity();
         if (tab == null && activity instanceof ChromeTabbedActivity) {
             tab = ((ChromeTabbedActivity) activity).getActivityTab();
         }
 
@@ skipping 543 matching lines @@
         } else {
             resourceId = stringSet[2];
             bytesInCorrectUnits = bytes / (float) BYTES_PER_GIGABYTE;
         }
 
         return context.getResources().getString(resourceId, bytesInCorrectUnits);
     }
 
     /**
      * Abbreviate a file name into a given number of characters with ellipses.
-     * e.g. thisisaverylongfilename.txt => thisisave....txt
-     * @param fileName File name to abbreviate
-     * @param limit Character limit
-     * @return Abbreviated file name
+     * e.g. "thisisaverylongfilename.txt" => "thisisave....txt".
+     * @param fileName File name to abbreviate.
+     * @param limit Character limit.
+     * @return Abbreviated file name.
      */
     public static String getAbbreviatedFileName(String fileName, int limit) {
         assert limit >= 1;  // Abbreviated file name should at least be 1 characters (a...)
 
         if (TextUtils.isEmpty(fileName)) return fileName;
 
         if (fileName.length() <= limit) return fileName;
 
         // Find the file name extension
         int index = fileName.lastIndexOf(".");
         int extensionLength = fileName.length() - index;
 
         // If the extension is too long, just use truncate the string from beginning.
         if (extensionLength >= limit) {
             return fileName.substring(0, limit) + ELLIPSIS;
         }
         int remainingLength = limit - extensionLength;
         return fileName.substring(0, remainingLength) + ELLIPSIS + fileName.substring(index);
     }
 
     /**
      * Return an icon for a given file type.
-     * @param fileType Type of the file as returned by DownloadFilter
-     * @return Resource ID of the corresponding icon
+     * @param fileType Type of the file as returned by DownloadFilter.
+     * @param iconSize Size of the returned icon.
+     * @return Resource ID of the corresponding icon.
      */
-    public static int getIconResId(int fileType) {
+    public static int getIconResId(int fileType, @IconSize int iconSize) {
         switch (fileType) {
             case DownloadFilter.FILTER_PAGE:
-                return R.drawable.ic_drive_site_white_24dp;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_drive_site_white_24dp
+                                                   : R.drawable.ic_drive_site_white_36dp;
             case DownloadFilter.FILTER_VIDEO:
-                return R.drawable.ic_play_arrow_white_24dp;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_play_arrow_white_24dp
+                                                   : R.drawable.ic_play_arrow_white_36dp;
             case DownloadFilter.FILTER_AUDIO:
-                return R.drawable.ic_music_note_white_24dp;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_music_note_white_24dp
+                                                   : R.drawable.ic_music_note_white_36dp;
             case DownloadFilter.FILTER_IMAGE:
-                return R.drawable.ic_image_white_24dp;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_image_white_24dp
+                                                   : R.drawable.ic_image_white_36dp;
             case DownloadFilter.FILTER_DOCUMENT:
-                return R.drawable.ic_drive_text_white_24dp;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_drive_text_white_24dp
+                                                   : R.drawable.ic_drive_text_white_36dp;
             default:
-                return R.drawable.ic_drive_file_white_24dp;
+                return iconSize == ICON_SIZE_24_DP ? R.drawable.ic_drive_file_white_24dp
+                                                   : R.drawable.ic_drive_text_white_36dp;

[Theresa, 2017/05/24 21:57:11]

Is this supposed to be ic_drive_file_white_36dp?

[vitaliii, 2017/05/26 09:41:12]

Yes (copy-paste mistake). Good catch! 

Fix: https://chromium-review.googlesource.com/c/517062/

         }
     }
 
     /**
      * Return a background color for the file type icon.
-     * @param context Context from which to extract the resources
-     * @return Background color
+     * @param context Context from which to extract the resources.
+     * @return Background color.
      */
     public static int getIconBackgroundColor(Context context) {
         return ApiCompatibilityUtils.getColor(context.getResources(), R.color.light_active_color);
     }
 
     /**
      * Return a foreground color list for the file type icon.
-     * @param context Context from which to extract the resources
-     * @return a foreground color list
+     * @param context Context from which to extract the resources.
+     * @return a foreground color list.
      */
     public static ColorStateList getIconForegroundColorList(Context context) {
         return ApiCompatibilityUtils.getColorStateList(
                 context.getResources(), R.color.white_mode_tint);
     }
 
     private static boolean isMimeTypeVideo(String mimeType) {
         if (TextUtils.isEmpty(mimeType)) return false;
 
         String[] pieces = mimeType.split(MIME_TYPE_DELIMITER);
         if (pieces.length != 2) return false;
 
         return MIME_TYPE_VIDEO.equals(pieces[0]);
     }
 }