Add billing address to masked server credit cards.

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
deleted file mode 100644
index 19fd877105542e0a90f935d0ee3bde334cf0793b..0000000000000000000000000000000000000000
--- a/chrome/android/java/res/layout/autofill_credit_card_editor.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2014 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" >
-
-    <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/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.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/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.FloatLabelLayout>
-
-    <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_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:paddingTop="8dp"
-        android:baselineAligned="false"
-        android:layout_marginStart="@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.support.v7.widget.AppCompatSpinner
-                android:id="@+id/autofill_credit_card_editor_month_spinner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <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"  />
-        </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" />
-
-</merge>