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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorFieldModel.java

Issue 2462473002: [Payments] Don't show select when clicking in billing address drop. (Closed)
Patch Set: Addressed comments Created 4 years, 1 month 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/payments/ui/EditorFieldModel.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorFieldModel.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorFieldModel.java
index 19d4bbfb22c23041ea86b8642f03c004bac2f9d3..7979a72e8852de9ef7d41f5d5de5b546d7fc4e1e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorFieldModel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorFieldModel.java
@@ -105,6 +105,7 @@ public class EditorFieldModel {
@Nullable private CharSequence mMidLabel;
@Nullable private CharSequence mBottomLabel;
@Nullable private CharSequence mValue;
+ @Nullable private CharSequence mHint;
@Nullable private Callback<Pair<String, Runnable>> mDropdownCallback;
@Nullable private Runnable mIconAction;
private int mLabelIconResourceId;
@@ -181,13 +182,16 @@ public class EditorFieldModel {
* @param label The human-readable label for user to understand the type of data
* that should be entered into this field.
* @param dropdownKeyValues The keyed values to display in the dropdown.
+ * @param hint The optional hint to be displayed when no value is selected.
*/
public static EditorFieldModel createDropdown(
- @Nullable CharSequence label, List<DropdownKeyValue> dropdownKeyValues) {
+ @Nullable CharSequence label, List<DropdownKeyValue> dropdownKeyValues,
+ @Nullable CharSequence hint) {
assert dropdownKeyValues != null;
EditorFieldModel result = new EditorFieldModel(INPUT_TYPE_HINT_DROPDOWN);
result.mLabel = label;
result.mDropdownKeyValues = dropdownKeyValues;
+ result.mHint = hint;
result.mDropdownKeys = new HashSet<>();
for (int i = 0; i < result.mDropdownKeyValues.size(); i++) {
result.mDropdownKeys.add(result.mDropdownKeyValues.get(i).getKey());
@@ -207,12 +211,11 @@ public class EditorFieldModel {
*/
public static EditorFieldModel createDropdown(
@Nullable CharSequence label, List<DropdownKeyValue> dropdownKeyValues,
- EditorFieldValidator validator,
- CharSequence invalidErrorMessage) {
+ EditorFieldValidator validator, CharSequence invalidErrorMessage) {
assert dropdownKeyValues != null;
assert validator != null;
assert invalidErrorMessage != null;
- EditorFieldModel result = createDropdown(label, dropdownKeyValues);
+ EditorFieldModel result = createDropdown(label, dropdownKeyValues, null /* hint */);
result.mValidator = validator;
result.mInvalidErrorMessage = invalidErrorMessage;
return result;
@@ -363,6 +366,12 @@ public class EditorFieldModel {
return mLabel;
}
+ /** @return The human-readable hint for this dropdown field. */
+ public CharSequence getHint() {
+ assert mInputTypeHint == INPUT_TYPE_HINT_DROPDOWN;
+ return mHint;
+ }
+
/** @return The human-readable mid-level label for this field. */
public CharSequence getMidLabel() {
assert mInputTypeHint == INPUT_TYPE_HINT_LABEL;

Powered by Google App Engine
This is Rietveld 408576698