Clean up lint warnings

* Make the names of all the icons used in downloads consistent with the go/icons page again.

* Get rid of a duped drawable.

* Suppress an invalid lint warning.

BUG=623262,623264

Review-Url: https://codereview.chromium.org/2104123003
Cr-Commit-Position: refs/heads/master@{#402701}

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

@@ -11,6 +11,8 @@
 -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MergeRootFrame"
     android:id="@+id/payment_request_spinny"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

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

@@ -278,7 +278,7 @@ public class DownloadNotificationService extends Service {
                 mContext.getResources().getString(R.string.download_notification_cancel_button),
                 cancelIntent);
         if (entry.isResumable) {
-            builder.addAction(R.drawable.resume_download,
+            builder.addAction(R.drawable.ic_get_app_white_24dp,
                     mContext.getResources().getString(
                             R.string.download_notification_resume_button),
                     buildPendingIntent(ACTION_DOWNLOAD_RESUME, entry.notificationId,

chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadManagerUi.java

@@ -106,13 +106,13 @@ public class DownloadManagerUi extends DrawerLayout implements OnMenuItemClickLi
 
         /** Icons and labels for each filter in the menu. */
         private static final int[][] FILTER_LIST = new int[][] {
-            {R.drawable.ic_get_app_white, R.string.download_manager_ui_all_downloads},
-            {R.drawable.ic_drive_site_white, R.string.download_manager_ui_pages},
-            {R.drawable.ic_music_video_white, R.string.download_manager_ui_video},
-            {R.drawable.ic_music_note_white, R.string.download_manager_ui_audio},
-            {R.drawable.ic_image_white, R.string.download_manager_ui_images},
-            {R.drawable.ic_drive_file_white, R.string.download_manager_ui_documents},
-            {R.drawable.ic_folder_white, R.string.download_manager_ui_other}
+            {R.drawable.ic_get_app_white_24dp, R.string.download_manager_ui_all_downloads},
+            {R.drawable.ic_drive_site_white_24dp, R.string.download_manager_ui_pages},
+            {R.drawable.ic_music_video_white_24dp, R.string.download_manager_ui_video},
+            {R.drawable.ic_music_note_white_24dp, R.string.download_manager_ui_audio},
+            {R.drawable.ic_image_white_24dp, R.string.download_manager_ui_images},
+            {R.drawable.ic_drive_file_white_24dp, R.string.download_manager_ui_documents},
+            {R.drawable.ic_folder_white_24dp, R.string.download_manager_ui_other}
         };
 
         private final DrawerLayout mRootLayout;