Add billing address to masked server credit cards.

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

 <?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" >
 
+    <!-- The section that's shown only for server cards. -->

[gone, 2016/06/29 20:09:41]

One big problem with jamming in the controls into one layout like this is that
it's not efficient: you're constructing a bunch of Views that you're never
actually going to show.  It also means that you end up having to remove them
later on after construction (while View.GONE can be used to hide the Views, they
still get looked at when a ViewGroup does a measure and layout pass).

One way around this that doesn't rock your CL too much is to use a ViewStub:
https://developer.android.com/reference/android/view/ViewStub.html

If you pull out the sections that are only shown for server or local cards into
other layout files, then use ViewStubs to inflate them as necessary, it'd be 
cleaner (conceptually) and a little more efficient (overall).

[please use gerrit instead, 2016/06/30 01:19:27]

Layouts are split-up.

+    <org.chromium.ui.widget.TextViewWithClickableSpans
+        android:id="@+id/server_card_label"
+        android:layout_width="wrap_content"

[gone, 2016/06/29 20:09:41]

match_parent

[please use gerrit instead, 2016/06/30 01:19:27]

Done.

+        android:layout_height="wrap_content"
+        style="@style/PreferenceTitle"
+        android:text="Visa 3832" />
+
+    <org.chromium.ui.widget.TextViewWithClickableSpans
+        android:id="@+id/server_card_sublabel"
+        android:layout_width="wrap_content"

[gone, 2016/06/29 20:09:42]

match_parent

[please use gerrit instead, 2016/06/30 01:19:27]

Done.

+        android:layout_height="wrap_content"
+        style="@style/PreferenceSummary"
+        android:text="08/2017" />
+
+    <LinearLayout
+        android:id="@+id/server_card_edit_link_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/pref_autofill_field_top_padding"
+        android:paddingBottom="@dimen/pref_autofill_field_top_padding"
+        android:orientation="horizontal"
+        android:baselineAligned="false" >
+
+        <org.chromium.ui.widget.TextViewWithClickableSpans
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingEnd="15dp"
+            android:layout_weight="1"
+            style="@style/PreferenceTitle"
+            android:text="@string/autofill_from_google_account_long" />
+
+        <org.chromium.ui.widget.TextViewWithClickableSpans
+            android:id="@+id/server_card_edit_link"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorLink"
+            android:textAllCaps="true"
+            android:text="@string/autofill_wallet_management_link_text" />
+
+    </LinearLayout>
+
+    <org.chromium.ui.widget.ButtonCompat

[gone, 2016/06/29 20:09:41]

This button is just kind of floating here randomly.  I guess it can hold off
until hwi@ makes some mocks.

[please use gerrit instead, 2016/06/30 01:19:27]

There was a missing label. Added it back.

+        android:id="@+id/server_card_clear_button"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:paddingTop="@dimen/pref_autofill_field_top_padding"

[gone, 2016/06/29 20:09:41]

Don't customize the padding of the button.  Are you trying to apply a margin?

[please use gerrit instead, 2016/06/30 01:19:27]

Done.

+        android:paddingBottom="@dimen/pref_autofill_field_top_padding"
+        android:minHeight="40dp"

[gone, 2016/06/29 20:09:41]

Don't set the minHeight; should be handled by the ButtonCompatOverlay style
already.

[please use gerrit instead, 2016/06/30 01:19:27]

Done.

+        android:textColor="#fff"
+        android:text="@string/autofill_clear_local_copy_button"
+        app:buttonColor="@color/pref_accent_color" />
+
+    <!-- The section that's shown only for local cards. -->
     <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:id="@+id/credit_card_expiration_label"
         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: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" >
 
         <LinearLayout
             android:layout_width="0dp"
@@ skipping 14 matching lines @@
             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>
 
+    <!-- The section that's shown for both local and server cards. -->
     <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>