[Snowflake] Use button widget and button bar widget for modal dialog

+ Change buttons to ButtonCompat
+ Change button bar to DualControlLayout so that it is more consistent
  with other button bars
+ Adjust padding to match the current spec

Bug: 856244
Change-Id: I8bd1d211a27fa47769286cf565a627da65657f57
Reviewed-on: https://chromium-review.googlesource.com/c/1351790Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611222}

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

@@ -29,7 +29,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/lightweight_fre_head_image"
         android:layout_marginBottom="32dp"
-        android:fontFamily="sans-serif"
         android:lineSpacingMultiplier="1.64"
         android:paddingEnd="24dp"
         android:paddingStart="24dp"
@@ -46,5 +45,5 @@
         app:buttonAlignment="end"
         app:primaryButtonText="@string/fre_accept_continue"
         app:secondaryButtonText="@string/cancel"
-        app:stackedMargin="@dimen/fre_stacked_button_margin" />
+        app:stackedMargin="@dimen/button_bar_stacked_margin" />
 </RelativeLayout>

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

@@ -48,24 +48,26 @@
         android:layout_weight="1"
         android:visibility="gone" />
 
-    <android.support.v7.widget.ButtonBarLayout
+    <org.chromium.chrome.browser.widget.DualControlLayout
         android:id="@+id/button_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="?attr/buttonBarStyle">
+        android:padding="@dimen/modal_dialog_control_padding"
+        app:stackedMargin="@dimen/button_bar_stacked_margin"
+        app:buttonAlignment="end">
 
-        <android.support.v7.widget.AppCompatButton
-            android:id="@+id/negative_button"
+        <org.chromium.ui.widget.ButtonCompat
+            android:id="@+id/positive_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="?attr/buttonBarNegativeButtonStyle" />
+            style="?attr/buttonBarPositiveButtonStyle" />
 
-        <android.support.v7.widget.AppCompatButton
-            android:id="@+id/positive_button"
+        <org.chromium.ui.widget.ButtonCompat
+            android:id="@+id/negative_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="?attr/buttonBarPositiveButtonStyle" />
+            style="?attr/buttonBarNegativeButtonStyle" />
 
-    </android.support.v7.widget.ButtonBarLayout>
+    </org.chromium.chrome.browser.widget.DualControlLayout>
 
 </org.chromium.chrome.browser.widget.BoundedLinearLayout>

chrome/android/java/res/values-v17/styles.xml

@@ -123,24 +123,10 @@
         <item name="android:windowFrame">@null</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:backgroundDimAmount">0.5</item>
-        <item name="buttonBarStyle">@style/ModalDialogButtonBarStyle</item>
-        <item name="buttonBarButtonStyle">@style/ModalDialogButtonStyle</item>
+        <item name="buttonBarButtonStyle">@style/TextButton</item>
         <item name="android:windowSoftInputMode">adjustResize|stateHidden</item>
     </style>
 
-    <style name="ModalDialogButtonBarStyle" parent="Widget.AppCompat.ButtonBar.AlertDialog">
-        <item name="android:orientation">horizontal</item>
-        <item name="android:gravity">bottom|end</item>
-        <item name="android:paddingStart">@dimen/modal_dialog_control_padding_horizontal</item>
-        <item name="android:paddingEnd">@dimen/modal_dialog_control_padding_horizontal</item>
-        <item name="android:paddingTop">@dimen/modal_dialog_control_padding_vertical</item>
-        <item name="android:paddingBottom">@dimen/modal_dialog_control_padding_vertical</item>
-    </style>
-
-    <style name="ModalDialogButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-        <item name="android:textAppearance">@style/BlueButtonText2</item>
-    </style>
-
     <style name="SimpleDialog" parent="AlertDialogTheme">
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>

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

@@ -180,7 +180,6 @@
     <dimen name="fre_vertical_spacing">32dp</dimen>
     <dimen name="fre_button_bar_height">52dp</dimen>
     <dimen name="fre_button_padding">12dp</dimen>
-    <dimen name="fre_stacked_button_margin">8dp</dimen>
     <dimen name="fre_margin">24dp</dimen>
     <dimen name="fre_image_height">120dp</dimen>
     <dimen name="fre_tos_checkbox_padding">12dp</dimen>
@@ -206,14 +205,16 @@
     <dimen name="autofill_card_unmask_tooltip_horizontal_padding">16dp</dimen>
     <dimen name="autofill_card_unmask_tooltip_vertical_padding">4dp</dimen>
 
+    <!-- Button bar dimensions -->
+    <dimen name="button_bar_stacked_margin">8dp</dimen>
+
     <!-- Alert dialog -->
     <dimen name="dialog_padding_top">@dimen/abc_dialog_padding_top_material</dimen>
     <dimen name="dialog_padding_sides">@dimen/abc_dialog_padding_material</dimen>
     <dimen name="dialog_max_width">600dp</dimen>
 
     <!-- ModalDialogView dimensions -->
-    <dimen name="modal_dialog_control_padding_vertical">4dp</dimen>
-    <dimen name="modal_dialog_control_padding_horizontal">12dp</dimen>
+    <dimen name="modal_dialog_control_padding">8dp</dimen>
     <dimen name="tab_modal_scrim_vertical_margin">16dp</dimen>
 
     <!-- Tab Strip Dimensions -->