[Payments] Update autofill/payments spacings

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

Index: chrome/android/java/res/layout/autofill_local_card_editor.xml
diff --git a/chrome/android/java/res/layout/autofill_local_card_editor.xml b/chrome/android/java/res/layout/autofill_local_card_editor.xml
index a1ec078d0c8879d44e9ea52535c1ee1cefa14fb3..443474707679490e25f2f1d296d335b09f308db4 100644
--- a/chrome/android/java/res/layout/autofill_local_card_editor.xml
+++ b/chrome/android/java/res/layout/autofill_local_card_editor.xml
@@ -10,10 +10,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <!-- Name -->
     <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout
         android:id="@+id/credit_card_name_label"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/pref_autofill_content_spacing">
+
         <EditText
             android:id="@+id/credit_card_name_edit"
             android:layout_width="match_parent"
@@ -21,12 +24,16 @@
             android:imeOptions="flagNoExtractUi"
             android:inputType="textCapWords"
             android:hint="@string/autofill_credit_card_editor_name" />
+
     </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout>
 
+    <!-- Credit card number -->
     <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout
         android:id="@+id/credit_card_number_label"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/pref_autofill_content_spacing">
+
         <EditText
             android:id="@+id/credit_card_number_edit"
             android:layout_width="match_parent"
@@ -35,8 +42,10 @@
             android:inputType="phone"
             android:digits="0123456789- "
             android:hint="@string/autofill_credit_card_editor_number" />
+
     </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout>
 
+    <!-- Expiration date -->
     <TextView
         android:id="@+id/credit_card_expiration_label"
         android:layout_width="match_parent"
@@ -51,10 +60,11 @@
         android:id="@+id/credit_card_expiration_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/pref_autofill_field_top_margin"
+        android:layout_marginBottom="@dimen/pref_autofill_content_spacing"
         android:layout_marginStart="@dimen/pref_autofill_field_horizontal_padding"
         android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
         android:orientation="horizontal"
-        android:paddingTop="8dp"
         android:baselineAligned="false">
 
         <LinearLayout
@@ -67,7 +77,8 @@
             <android.support.v7.widget.AppCompatSpinner

[Ian Wen, 2016/07/01 19:19:03]

Correct me if I'm wrong. I thought the inflater we get from AppCompatActivity
should automatically convert Spinner in XML to AppCompatSpinner. Is it necessary
to specify "AppCompat" here?

[gone, 2016/07/01 23:00:49]

It doesn't always work.  Current guess is that we're passing around an
application Context instead of the correct themed context, which results in the
real spinner appearing instead of the AppCompatSpinner.  We had to do this in
infobars, for example.

                 android:id="@+id/autofill_credit_card_editor_month_spinner"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:focusable="true" />

[Ian Wen, 2016/07/01 19:19:03]

Don't we need to set focusableInTouchmode to be true as well? If the purpose is
to make it focusable for keyboard navigation, "touch mode" should be a
requirement as well.

[gone, 2016/07/01 23:00:49]

Focus in these XML files seems fairly wonky; I've tried to edit the ones that
might make sense.

 
             <View style="@style/PreferenceSpinnerUnderlineView" />
 
@@ -81,8 +92,11 @@
               <android.support.v7.widget.AppCompatSpinner
                   android:id="@+id/autofill_credit_card_editor_year_spinner"
                   android:layout_width="match_parent"
-                  android:layout_height="wrap_content" />
-              <View style="@style/PreferenceSpinnerUnderlineView" />
+                  android:layout_height="wrap_content"
+                  android:focusable="true" />
+
+              <View style="@style/PreferenceSpinnerUnderlineView"  />
+
         </LinearLayout>
     </LinearLayout>