| Index: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java
|
| index 511aa92893c48e7a19147abac5a40e8e9a397c35..f704a88a6afc6d86cb58e1411555a9f28392f415 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java
|
| @@ -62,12 +62,19 @@ public class DownloadItemView extends SelectableItemView<DownloadHistoryItemWrap
|
| public DownloadItemView(Context context, AttributeSet attrs) {
|
| super(context, attrs);
|
| mMargin = context.getResources().getDimensionPixelSize(R.dimen.downloads_item_margin);
|
| - mIconBackgroundColor =
|
| - ApiCompatibilityUtils.getColor(context.getResources(), R.color.light_active_color);
|
| + mIconBackgroundColor = getIconBackgroundColor(context);
|
| mIconBackgroundColorSelected =
|
| ApiCompatibilityUtils.getColor(context.getResources(), R.color.google_grey_600);
|
| - mWhiteTint =
|
| - ApiCompatibilityUtils.getColorStateList(getResources(), R.color.white_mode_tint);
|
| + mWhiteTint = getWhiteTint(context);
|
| + }
|
| +
|
| + public static int getIconBackgroundColor(Context context) {
|
| + return ApiCompatibilityUtils.getColor(context.getResources(), R.color.light_active_color);
|
| + }
|
| +
|
| + public static ColorStateList getWhiteTint(Context context) {
|
| + return ApiCompatibilityUtils.getColorStateList(
|
| + context.getResources(), R.color.white_mode_tint);
|
| }
|
|
|
| @Override
|
| @@ -122,6 +129,23 @@ public class DownloadItemView extends SelectableItemView<DownloadHistoryItemWrap
|
| }
|
| }
|
|
|
| + public static int getIconResId(int fileType) {
|
| + switch (fileType) {
|
| + case DownloadFilter.FILTER_PAGE:
|
| + return R.drawable.ic_drive_site_white_24dp;
|
| + case DownloadFilter.FILTER_VIDEO:
|
| + return R.drawable.ic_play_arrow_white_24dp;
|
| + case DownloadFilter.FILTER_AUDIO:
|
| + return R.drawable.ic_music_note_white_24dp;
|
| + case DownloadFilter.FILTER_IMAGE:
|
| + return R.drawable.ic_image_white_24dp;
|
| + case DownloadFilter.FILTER_DOCUMENT:
|
| + return R.drawable.ic_drive_text_white_24dp;
|
| + default:
|
| + return R.drawable.ic_drive_file_white_24dp;
|
| + }
|
| + }
|
| +
|
| /**
|
| * Initialize the DownloadItemView. Must be called before the item can respond to click events.
|
| *
|
| @@ -146,26 +170,7 @@ public class DownloadItemView extends SelectableItemView<DownloadHistoryItemWrap
|
| }
|
|
|
| // Pick what icon to display for the item.
|
| - mIconResId = R.drawable.ic_drive_file_white_24dp;
|
| - switch (fileType) {
|
| - case DownloadFilter.FILTER_PAGE:
|
| - mIconResId = R.drawable.ic_drive_site_white_24dp;
|
| - break;
|
| - case DownloadFilter.FILTER_VIDEO:
|
| - mIconResId = R.drawable.ic_play_arrow_white_24dp;
|
| - break;
|
| - case DownloadFilter.FILTER_AUDIO:
|
| - mIconResId = R.drawable.ic_music_note_white_24dp;
|
| - break;
|
| - case DownloadFilter.FILTER_IMAGE:
|
| - mIconResId = R.drawable.ic_image_white_24dp;
|
| - break;
|
| - case DownloadFilter.FILTER_DOCUMENT:
|
| - mIconResId = R.drawable.ic_drive_text_white_24dp;
|
| - break;
|
| - default:
|
| - }
|
| -
|
| + mIconResId = getIconResId(fileType);
|
| updateIconView();
|
|
|
| Context context = mFilesizeView.getContext();
|
|
|