Chromium Code Reviews| 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..d01d6a06acf58dc2303586147f9bfec26e4e9598 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,33 @@ 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 (int i = 0; i < keys.length; ++i) { |
| + // TODO (@crbug.com/691643): show names, save keys. |
| + adminAreas.add( |
| + new DropdownKeyValue(keys[i], keys[i])); |
| + } |
| + |
| + 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) { |
| + // Sorted according to the admin area values, such as Quebec, |
| + // rather than the admin area keys, such as QC. |
| + int result = collator.compare(lhs.getValue(), rhs.getValue()); |
|
please use gerrit instead
2017/03/31 16:06:20
No need for temporary variable "result". Save a li
Parastoo
2017/04/03 16:18:23
Done.
|
| + 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<>(); |