Redo Autofill wallet preferences on Android.

chrome/android/java/src/org/chromium/chrome/browser/preferences/TextAndButtonPreference.java

 // 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.
 
 package org.chromium.chrome.browser.preferences;
 
 import android.content.Context;
 import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.Button;
 
 import org.chromium.chrome.R;
 
 /**
- * A {@link Preference} that provides button functionality.
+ * A {@link Preference} that provides label text plus button functionality.
  *
  * Preference.getOnPreferenceClickListener().onPreferenceClick() is called when the button is
- * clicked.
+ * clicked. The button is defined by the widgetLayout attribute.
  */
-public class ButtonPreference extends Preference {
-
+public class TextAndButtonPreference extends Preference {
     /**
      * Constructor for inflating from XML
      */
-    public ButtonPreference(Context context, AttributeSet attrs) {
+    public TextAndButtonPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setLayoutResource(R.layout.preference_button);
         setSelectable(false);
     }
 
     @Override
     protected void onBindView(View view) {
         super.onBindView(view);
 
-        Button button = (Button) view.findViewById(R.id.button_preference);
-        button.setText(this.getTitle());
+        View button = view.findViewById(R.id.preference_click_target);
+        button.setClickable(true);
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (getOnPreferenceClickListener() != null) {
-                    getOnPreferenceClickListener().onPreferenceClick(ButtonPreference.this);
+                    getOnPreferenceClickListener().onPreferenceClick(TextAndButtonPreference.this);
                 }
             }
         });
     }
 }