Underlines for preference spinners and other autofill tweaks

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

Index: chrome/android/java/res/layout/autofill_credit_card_editor.xml
diff --git a/chrome/android/java/res/layout/autofill_credit_card_editor.xml b/chrome/android/java/res/layout/autofill_credit_card_editor.xml
index 221104137170593a691e5f4f21dec7d4df74a107..4ef788d95a49ff39d40fd93e6c211c670767d510 100644
--- a/chrome/android/java/res/layout/autofill_credit_card_editor.xml
+++ b/chrome/android/java/res/layout/autofill_credit_card_editor.xml
@@ -20,28 +20,31 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:focusableInTouchMode="true" >
+            android:focusableInTouchMode="true"
+            android:paddingTop="6dp" >
 
             <org.chromium.chrome.browser.widget.FloatLabelLayout
+                android:id="@+id/credit_card_name_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
                 <EditText
-                    android:id="@+id/autofill_credit_card_editor_name_edit"
+                    android:id="@+id/credit_card_name_edit"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:imeOptions="flagNoExtractUi"
-                    android:contentDescription="@string/accessibility_autofill_cc_name_textbox"
+                    android:contentDescription="@string/autofill_credit_card_editor_name"
                     android:inputType="textCapWords"
                     android:hint="@string/autofill_credit_card_editor_name" />
             </org.chromium.chrome.browser.widget.FloatLabelLayout>
 
             <org.chromium.chrome.browser.widget.FloatLabelLayout
+                android:id="@+id/credit_card_number_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
                 <EditText
-                    android:id="@+id/autofill_credit_card_editor_number_edit"
+                    android:id="@+id/credit_card_number_edit"
                     android:layout_width="match_parent"
-                    android:contentDescription="@string/accessibility_autofill_cc_number_textbox"
+                    android:contentDescription="@string/autofill_credit_card_editor_number"
                     android:layout_height="wrap_content"
                     android:imeOptions="flagNoExtractUi"
                     android:inputType="phone"
@@ -53,28 +56,44 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:focusable="true"
-                android:paddingTop="10dp"
+                android:paddingTop="@dimen/pref_autofill_field_top_padding"
                 android:textAppearance="@style/PreferenceFloatLabelTextAppearance"
-                android:text="@string/autofill_credit_card_editor_expiration_date" />
+                android:text="@string/autofill_credit_card_editor_expiration_date"
+                android:paddingStart="@dimen/pref_autofill_field_horizontal_padding"
+                android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal" >
+                android:orientation="horizontal"
+                android:paddingTop="8dp"
+                android:layout_marginStart="@dimen/pref_autofill_field_horizontal_padding"
+                android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" >
 
-                <Spinner
-                    android:id="@+id/autofill_credit_card_editor_month_spinner"
+                <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingTop="8dp" />
+                    android:orientation="vertical"
+                    android:paddingEnd="10dp" >
+                    <Spinner
+                        android:id="@+id/autofill_credit_card_editor_month_spinner"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                    <View style="@style/PreferenceSpinnerUnderlineView" />
+                </LinearLayout>
 
-                <Spinner
-                    android:id="@+id/autofill_credit_card_editor_year_spinner"
+               <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:paddingTop="8dp" />
+                    android:orientation="vertical" >
+                      <Spinner
+                          android:id="@+id/autofill_credit_card_editor_year_spinner"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content" />
+                      <View style="@style/PreferenceSpinnerUnderlineView"  />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>