[Payment] Componentize Android Web Payment layouts

This patch moves files from chrome/android/java/res/layout/payment*.xml
to components/payments/content/android/java/res/layout/

Bug: 1079291
Change-Id: I109a55c382abc4fa7f0ad96161a1ce78f8c97bb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2291516Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Commit-Queue: DongJun Kim <djmix.kim@samsung.com>
Cr-Commit-Position: refs/heads/master@{#790688}

chrome/android/BUILD.gn

@@ -208,6 +208,7 @@ android_resources("chrome_app_java_resources") {
     "//components/javascript_dialogs/android:java_resources",
     "//components/omnibox/browser:java_resources",
     "//components/page_info/android:java_resources",
+    "//components/payments/content/android:java_resources",
     "//components/permissions/android:java_resources",
     "//components/policy:app_restrictions_resources",
     "//components/strings:components_locale_settings_grd",

chrome/android/chrome_java_resources.gni

@@ -966,19 +966,6 @@ chrome_java_resources = [
   "java/res/layout/password_no_result.xml",
   "java/res/layout/passwords_error_dialog.xml",
   "java/res/layout/passwords_progress_dialog.xml",
-  "java/res/layout/payment_handler_content.xml",
-  "java/res/layout/payment_minimal_ui_content.xml",
-  "java/res/layout/payment_minimal_ui_toolbar.xml",
-  "java/res/layout/payment_option_edit_icon.xml",
-  "java/res/layout/payment_request.xml",
-  "java/res/layout/payment_request_bottom_bar.xml",
-  "java/res/layout/payment_request_dropdown_item.xml",
-  "java/res/layout/payment_request_editor.xml",
-  "java/res/layout/payment_request_editor_dropdown.xml",
-  "java/res/layout/payment_request_editor_label.xml",
-  "java/res/layout/payment_request_header.xml",
-  "java/res/layout/payment_request_spinny.xml",
-  "java/res/layout/payments_request_editor_textview.xml",
   "java/res/layout/personalized_signin_promo_view_body.xml",
   "java/res/layout/personalized_signin_promo_view_bookmarks.xml",
   "java/res/layout/personalized_signin_promo_view_header.xml",

chrome/android/java/res/values-sw600dp/dimens.xml

@@ -41,9 +41,6 @@
     <!-- Recent tabs page -->
     <dimen name="recent_tabs_visible_separator_padding">28dp</dimen>
 
-    <!-- Payments UI -->
-    <dimen name="payments_ui_max_dialog_width">600dp</dimen>
-
     <!-- Preferences dimensions -->
     <dimen name="pref_spinner_padding_end">16dp</dimen>
 

chrome/android/java/res/values/dimens.xml

@@ -461,42 +461,6 @@
     <dimen name="editor_dialog_section_buttons_vertical_padding">10dp</dimen>
     <dimen name="editable_option_section_logo_width">38dp</dimen>
 
-    <!-- Payments UI
-         * payments_section_checking_spacing:
-           The spec says that the "Checking" text should be 32dp above the bottom of its section.
-           We improvise by using 6dp because sections also have a 10dp padding, so we end up with
-           a 16dp bottom margin on the "Checking" text + 10dp section padding + 6dp leftover.
-    -->
-    <dimen name="payments_section_vertical_spacing">10dp</dimen>
-    <dimen name="payments_section_largest_spacing">32dp</dimen>
-    <dimen name="payments_section_checking_spacing">6dp</dimen>
-    <dimen name="payments_section_descriptive_item_spacing">40dp</dimen>
-    <dimen name="payments_section_add_button_height">48dp</dimen>
-    <dimen name="payments_section_dropdown_top_padding">5dp</dimen>
-    <dimen name="payments_ui_max_dialog_width">0dp</dimen>
-    <dimen name="payments_ui_translation">100dp</dimen>
-    <dimen name="payments_favicon_size">24dp</dimen>
-    <dimen name="payments_handler_window_minimum_height">500dp</dimen>
-    <dimen name="payments_request_bottom_bar_vertical_padding">10dp</dimen>
-    <dimen name="payments_request_bottom_bar_horizontal_padding">16dp</dimen>
-
-    <!-- Payment minimal UI spacing -->
-    <dimen name="payment_minimal_ui_amount_currency_spacing">4dp</dimen>
-    <dimen name="payment_minimal_ui_app_icon_bottom_spacing">20dp</dimen>
-    <dimen name="payment_minimal_ui_app_icon_horizontal_spacing">10dp</dimen>
-    <dimen name="payment_minimal_ui_content_bottom_spacing">26dp</dimen>
-    <dimen name="payment_minimal_ui_content_icon_spacing">8dp</dimen>
-    <dimen name="payment_minimal_ui_content_top_spacing">78dp</dimen>
-    <dimen name="payment_minimal_ui_drag_handle_spacing">8dp</dimen>
-    <dimen name="payment_minimal_ui_large_text_vertical_spacing">8dp</dimen>
-    <dimen name="payment_minimal_ui_spacing">16dp</dimen>
-    <dimen name="payment_minimal_ui_toolbar_small_status_text_top_spacing">2dp</dimen>
-
-    <!-- Payment minimal UI element sizes -->
-    <dimen name="payment_minimal_ui_content_icon_size">56dp</dimen>
-    <dimen name="payment_minimal_ui_separator_width">0.5dp</dimen>
-    <dimen name="payment_minimal_ui_toolbar_icon_size">36dp</dimen>
-
     <!-- Preferences dimensions
          pref_autofill_field_horizontal_padding exists because TextInputLayouts have an internal
          padding set.

components/payments/content/android/BUILD.gn

@@ -4,6 +4,7 @@
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
+import("//components/payments/content/android/payments_java_resources.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 static_library("android") {
@@ -66,6 +67,11 @@ generate_jni("jni_headers") {
   ]
 }
 
+android_resources("java_resources") {
+  custom_package = "org.chromium.components.payments"
+  sources = payments_java_resources
+}
+
 android_library("java") {
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [
@@ -105,6 +111,7 @@ android_library("java") {
     "java/src/org/chromium/components/payments/intent/WebPaymentIntentHelperType.java",
   ]
   deps = [
+    ":java_resources",
     "//base:base_java",
     "//base:jni_java",
     "//components/autofill/android:autofill_java",

components/payments/content/android/java/res/values-sw600dp/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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. -->
+
+<resources>
+    <!-- Payments UI -->
+    <dimen name="payments_ui_max_dialog_width">600dp</dimen>
+</resources>

components/payments/content/android/java/res/values/dimens.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2020 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. -->
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Payments UI
+         * payments_section_checking_spacing:
+           The spec says that the "Checking" text should be 32dp above the bottom of its section.
+           We improvise by using 6dp because sections also have a 10dp padding, so we end up with
+           a 16dp bottom margin on the "Checking" text + 10dp section padding + 6dp leftover.
+    -->
+    <dimen name="payments_section_vertical_spacing">10dp</dimen>
+    <dimen name="payments_section_checking_spacing">6dp</dimen>
+    <dimen name="payments_section_descriptive_item_spacing">40dp</dimen>
+    <dimen name="payments_section_add_button_height">48dp</dimen>
+    <dimen name="payments_section_dropdown_top_padding">5dp</dimen>
+    <dimen name="payments_ui_max_dialog_width">0dp</dimen>
+    <dimen name="payments_ui_translation">100dp</dimen>
+    <dimen name="payments_favicon_size">24dp</dimen>
+    <dimen name="payments_handler_window_minimum_height">500dp</dimen>
+    <dimen name="payments_request_bottom_bar_vertical_padding">10dp</dimen>
+    <dimen name="payments_request_bottom_bar_horizontal_padding">16dp</dimen>
+
+    <!-- Payment minimal UI spacing -->
+    <dimen name="payment_minimal_ui_amount_currency_spacing">4dp</dimen>
+    <dimen name="payment_minimal_ui_app_icon_bottom_spacing">20dp</dimen>
+    <dimen name="payment_minimal_ui_app_icon_horizontal_spacing">10dp</dimen>
+    <dimen name="payment_minimal_ui_content_bottom_spacing">26dp</dimen>
+    <dimen name="payment_minimal_ui_content_icon_spacing">8dp</dimen>
+    <dimen name="payment_minimal_ui_content_top_spacing">78dp</dimen>
+    <dimen name="payment_minimal_ui_drag_handle_spacing">8dp</dimen>
+    <dimen name="payment_minimal_ui_large_text_vertical_spacing">8dp</dimen>
+    <dimen name="payment_minimal_ui_spacing">16dp</dimen>
+    <dimen name="payment_minimal_ui_toolbar_small_status_text_top_spacing">2dp</dimen>
+
+    <!-- Payment minimal UI element sizes -->
+    <dimen name="payment_minimal_ui_content_icon_size">56dp</dimen>
+    <dimen name="payment_minimal_ui_separator_width">0.5dp</dimen>
+    <dimen name="payment_minimal_ui_toolbar_icon_size">36dp</dimen>
+</resources>

components/payments/content/android/payments_java_resources.gni

+# Copyright 2020 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.
+
+payments_java_resources = [
+  "//components/payments/content/android/java/res/layout/payment_handler_content.xml",
+  "//components/payments/content/android/java/res/layout/payment_minimal_ui_content.xml",
+  "//components/payments/content/android/java/res/layout/payment_minimal_ui_toolbar.xml",
+  "//components/payments/content/android/java/res/layout/payment_option_edit_icon.xml",
+  "//components/payments/content/android/java/res/layout/payment_request.xml",
+  "//components/payments/content/android/java/res/layout/payment_request_bottom_bar.xml",
+  "//components/payments/content/android/java/res/layout/payment_request_dropdown_item.xml",
+  "//components/payments/content/android/java/res/layout/payment_request_editor.xml",
+  "//components/payments/content/android/java/res/layout/payment_request_editor_dropdown.xml",
+  "//components/payments/content/android/java/res/layout/payment_request_editor_label.xml",
+  "//components/payments/content/android/java/res/layout/payment_request_header.xml",
+  "//components/payments/content/android/java/res/layout/payment_request_spinny.xml",
+  "//components/payments/content/android/java/res/layout/payments_request_editor_textview.xml",
+  "//components/payments/content/android/java/res/values-sw600dp/dimens.xml",
+  "//components/payments/content/android/java/res/values/dimens.xml",
+]