Fix resource name collision between share and image_editor

The internal image_editor resources had the same names as the resources
in chrome/browser/share, which was causing build errors with the
enable_chrome_module gn arg set to true. This renames the resources so
there is no longer a collision.

Bug: 1126301
Change-Id: I45193677196a6b0e266bbc5e376bc4ddc5ce7d79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2456949Reviewed-by: Jeffrey Cohen <jeffreycohen@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814953}

chrome/browser/share/android/BUILD.gn

@@ -7,16 +7,16 @@ import("//build/config/android/rules.gni")
 android_resources("java_resources") {
   sources = [
     "java/res/drawable/camera_img.xml",
-    "java/res/drawable/delete.xml",
-    "java/res/drawable/edit.xml",
+    "java/res/drawable/delete_icon.xml",
+    "java/res/drawable/edit_icon.xml",
     "java/res/drawable/generic_favicon.xml",
     "java/res/drawable/generic_file.xml",
     "java/res/drawable/link.xml",
     "java/res/drawable/preview_icon_border_background.xml",
     "java/res/drawable/qrcode_background.xml",
-    "java/res/drawable/save.xml",
-    "java/res/drawable/share.xml",
-    "java/res/drawable/text.xml",
+    "java/res/drawable/save_icon.xml",
+    "java/res/drawable/share_icon.xml",
+    "java/res/drawable/text_icon.xml",
     "java/res/layout/qrcode_camera_error_layout.xml",
     "java/res/layout/qrcode_dialog.xml",
     "java/res/layout/qrcode_open_settings_layout.xml",

chrome/browser/share/android/java/res/layout/screenshot_share_sheet.xml

@@ -55,7 +55,7 @@
                     android:id="@+id/edit"
                     android:text="@string/screenshot_edit_title"
                     style="@style/SplitToolbarButton"
-                    android:drawableTop="@drawable/edit"
+                    android:drawableTop="@drawable/edit_icon"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:layout_gravity="end|bottom"
@@ -66,7 +66,7 @@
                     android:id="@+id/delete"
                     android:text="@string/screenshot_delete_title"
                     style="@style/SplitToolbarButton"
-                    android:drawableTop="@drawable/delete"
+                    android:drawableTop="@drawable/delete_icon"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:layout_gravity="center|bottom"
@@ -77,7 +77,7 @@
                     android:id="@+id/save"
                     android:text="@string/screenshot_save_title"
                     style="@style/SplitToolbarButton"
-                    android:drawableTop="@drawable/save"
+                    android:drawableTop="@drawable/save_icon"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:layout_gravity="center|bottom"
@@ -88,7 +88,7 @@
                     android:id="@+id/share"
                     android:text="@string/screenshot_share_title"
                     style="@style/SplitToolbarButton"
-                    android:drawableTop="@drawable/share"
+                    android:drawableTop="@drawable/share_icon"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:layout_gravity="start|bottom"

chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java

@@ -172,7 +172,8 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis
         } else if (contentTypes.size() == 1
                 && (contentTypes.contains(ContentType.HIGHLIGHTED_TEXT)
                         || contentTypes.contains(ContentType.TEXT))) {
-            setDefaultIconForPreview(AppCompatResources.getDrawable(mContext, R.drawable.text));
+            setDefaultIconForPreview(
+                    AppCompatResources.getDrawable(mContext, R.drawable.text_icon));
             title = "";
             subtitle = mParams.getText();
             setSubtitleMaxLines(2);