Add billing address to masked server credit cards.

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_credit_card_editor.xml b/chrome/android/java/res/layout/autofill_local_card_editor.xml
similarity index 68%
rename from chrome/android/java/res/layout/autofill_credit_card_editor.xml
rename to chrome/android/java/res/layout/autofill_local_card_editor.xml
index 19fd877105542e0a90f935d0ee3bde334cf0793b..01f1220603003672887eab3c63a2d1fc24e3ec75 100644
--- a/chrome/android/java/res/layout/autofill_credit_card_editor.xml
+++ b/chrome/android/java/res/layout/autofill_local_card_editor.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+<!-- 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" >
-
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <org.chromium.chrome.browser.widget.FloatLabelLayout
         android:id="@+id/credit_card_name_label"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
         <EditText
             android:id="@+id/credit_card_name_edit"
             android:layout_width="match_parent"
@@ -26,7 +23,7 @@
     <org.chromium.chrome.browser.widget.FloatLabelLayout
         android:id="@+id/credit_card_number_label"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
         <EditText
             android:id="@+id/credit_card_number_edit"
             android:layout_width="match_parent"
@@ -38,6 +35,7 @@
     </org.chromium.chrome.browser.widget.FloatLabelLayout>
 
     <TextView
+        android:id="@+id/credit_card_expiration_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:focusable="true"
@@ -48,20 +46,21 @@
         android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" />
 
     <LinearLayout
+        android:id="@+id/credit_card_expiration_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingTop="8dp"
         android:baselineAligned="false"
         android:layout_marginStart="@dimen/pref_autofill_field_horizontal_padding"
-        android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" >
+        android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingEnd="10dp" >
+            android:paddingEnd="10dp">
             <android.support.v7.widget.AppCompatSpinner
                 android:id="@+id/autofill_credit_card_editor_month_spinner"
                 android:layout_width="match_parent"
@@ -73,35 +72,14 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:orientation="vertical" >
+            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"  />
+              <View style="@style/PreferenceSpinnerUnderlineView" />
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:focusable="true"
-        android:paddingTop="@dimen/pref_autofill_field_top_padding"
-        android:textAppearance="@style/PreferenceFloatLabelTextAppearance"
-        android:text="@string/autofill_credit_card_editor_billing_address"
-        android:paddingStart="@dimen/pref_autofill_field_horizontal_padding"
-        android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" />
-
-    <android.support.v7.widget.AppCompatSpinner
-        android:id="@+id/autofill_credit_card_editor_billing_address_spinner"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/pref_autofill_field_top_padding"
-        android:paddingStart="@dimen/pref_autofill_field_horizontal_padding"
-        android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding"
-        android:textDirection="locale" />
-    <View style="@style/PreferenceSpinnerUnderlineView"
-        android:paddingStart="@dimen/pref_autofill_field_horizontal_padding"
-        android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" />
-
+    <include layout="@layout/autofill_billing_address_dropdown" />
 </merge>