[Payments] Update autofill/payments spacings

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

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2016 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. -->
 
 <!-- EditText views in FloatLabelLayout require both hint and contentDescription to be set
      to work correctly for accessibility because FloatLabelLayout sometimes clear hint. -->
 <!--suppress ContentDescription -->
 <merge
     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"
             android:layout_height="wrap_content"
             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"
             android:layout_height="wrap_content"
             android:imeOptions="flagNoExtractUi"
             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"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/pref_autofill_field_horizontal_padding"
         android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
         android:focusable="true"
         android:textAppearance="@style/PreferenceFloatLabelTextAppearance"
         android:text="@string/autofill_credit_card_editor_expiration_date" />
 
     <LinearLayout
         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
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
             android:layout_marginEnd="@dimen/payments_section_large_spacing">
 
             <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" />
 
         </LinearLayout>
 
        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical">
               <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>
 
     <include layout="@layout/autofill_billing_address_dropdown" />
 </merge>