Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java |
index 7f0f63db0c8742eaadca5814a47eae45fbf82941..5027f0a5120f9bcf72f832c8c1691ab24eabdb26 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java |
@@ -97,10 +97,31 @@ public class AutofillProfileBridge { |
return result; |
} |
}); |
- |
return countries; |
} |
+ /** @return The list of admin areas sorted by their localized display names. */ |
+ public static List<DropdownKeyValue> getAdminAreaDropdownList(String[] keys) { |
+ List<DropdownKeyValue> adminAreas = new ArrayList<>(); |
+ |
+ for (String s : keys) { |
+ adminAreas.add( |
+ new DropdownKeyValue(s, s)); // TODO (@crbug.com/691643): show names, save keys. |
+ } |
+ |
+ final Collator collator = Collator.getInstance(Locale.getDefault()); |
+ collator.setStrength(Collator.PRIMARY); |
+ Collections.sort(adminAreas, new Comparator<DropdownKeyValue>() { |
+ @Override |
+ public int compare(DropdownKeyValue lhs, DropdownKeyValue rhs) { |
+ int result = collator.compare(lhs.getValue(), rhs.getValue()); |
+ if (result == 0) result = lhs.getKey().compareTo(rhs.getKey()); |
+ return result; |
+ } |
+ }); |
+ return adminAreas; |
+ } |
+ |
/** @return The list of required fields. COUNTRY is always included. RECIPIENT often omitted. */ |
public static List<Integer> getRequiredAddressFields(String countryCode) { |
List<Integer> requiredFields = new ArrayList<>(); |
@@ -144,7 +165,7 @@ public class AutofillProfileBridge { |
* Returns the UI components for the CLDR countryCode and languageCode provided. If no language |
* code is provided, the application's default locale is used instead. Also stores the |
* currentBestLanguageCode, retrievable via getCurrentBestLanguageCode, to be used when saving |
- * an autofill profile. |
+ * an autofill profile |
sebsg
2017/02/28 16:13:59
Nit: put back the period
Parastoo
2017/03/21 14:30:44
Done.
|
* |
* @param countryCode The CLDR code used to retrieve address components. |
* @param languageCode The language code associated with the saved autofill profile that ui |