Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(469)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/TextAndButtonPreference.java

Issue 997713004: Redo Autofill wallet preferences on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more review Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/TextAndButtonPreference.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ButtonPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/TextAndButtonPreference.java
similarity index 70%
copy from chrome/android/java/src/org/chromium/chrome/browser/preferences/ButtonPreference.java
copy to chrome/android/java/src/org/chromium/chrome/browser/preferences/TextAndButtonPreference.java
index cac62938aabfff900bd4d43f2a089f9ec43bac8e..52be01c49d60ad1dbef2c610084224ab2d800dc4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ButtonPreference.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/TextAndButtonPreference.java
@@ -8,24 +8,21 @@ 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);
}
@@ -33,13 +30,13 @@ public class ButtonPreference extends Preference {
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);
}
}
});

Powered by Google App Engine
This is Rietveld 408576698