[Autofill Assistant] Update the terms checkbox.

This patch adds a title to the terms checkbox using the same style as
the payment request section titles.

R=arbesser@google.com, twellington@chromium.org

Bug: 806868
Change-Id: Ia13f80491ad062dcdc1e84d4dcd0cd7fb504cf63
Reviewed-on: https://chromium-review.googlesource.com/c/1340314
Commit-Queue: Mathias Carlen <mcarlen@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609246}

chrome/android/java/res_autofill_assistant/layout/autofill_assistant_payment_request.xml

@@ -30,6 +30,8 @@
             android:id="@+id/payment_container_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:orientation="vertical" />
 
     </org.chromium.chrome.browser.widget.FadingEdgeScrollView>
@@ -39,13 +41,21 @@
     checkbox field, so we wrap it in a FrameLayout and control the margins and
     padding there.
     -->
+    <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/editor_dialog_section_large_spacing"
+        android:layout_marginTop="@dimen/editor_dialog_section_small_spacing"
+        android:textAppearance="@style/BlueLink2"
+        android:text="@string/autofill_assistant_terms_title" />
+
     <FrameLayout
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="28dp"
-        android:layout_marginBottom="20dp"
+        android:layout_marginStart="@dimen/editor_dialog_section_large_spacing"
+        android:layout_marginEnd="@dimen/editor_dialog_section_large_spacing"
+        android:layout_marginTop="@dimen/editor_dialog_section_small_spacing"
+        android:layout_marginBottom="@dimen/editor_dialog_section_small_spacing"
         android:paddingTop="9dp"
         android:paddingBottom="9dp"
         android:paddingStart="12dp"

chrome/android/java/res_autofill_assistant/layout/autofill_assistant_payment_request_bottom_bar.xml

@@ -20,6 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:minHeight="36dp"
+        android:layout_marginEnd="0dp"
         android:text="@string/next"
         style="@style/FilledButton.Flat" />
 </org.chromium.chrome.browser.autofill_assistant.ui.PaymentRequestBottomBar>

components/autofill_assistant_strings.grdp

@@ -17,7 +17,10 @@
       Confirm
     </message>
     <message name="IDS_AUTOFILL_ASSISTANT_TERMS" desc="The text for the terms and service acceptance checkbox. Sentence-cased." formatter_data="android_java">
-      I know the terms and conditions, privacy policy and right of withdrawal of <ph name="BEGIN_BOLD">&lt;b&gt;</ph><ph name="ORIGIN">%1$s<ex>google.com</ex></ph><ph name="END_BOLD">&lt;/b&gt;</ph> (leave unchecked to read).
+      I know the terms &amp; conditions, privacy policy and right of withdrawal of <ph name="BEGIN_BOLD">&lt;b&gt;</ph><ph name="ORIGIN">%1$s<ex>google.com</ex></ph><ph name="END_BOLD">&lt;/b&gt;</ph> (leave unchecked to read).
+    </message>
+    <message name="IDS_AUTOFILL_ASSISTANT_TERMS_TITLE" desc="The title for the terms and service checkbox." formatter_data="android_java">
+      Terms &amp; Conditions
     </message>
     <message name="IDS_AUTOFILL_ASSISTANT_DETAILS_DIFFER" desc="Shown as Status Message when details differ." formatter_data="android_java">
       The movie screening is different, do you want to continue?