From 57bc2fb4c415a7b84cbd8736681cfbec4cc2b442 Mon Sep 17 00:00:00 2001 From: erfanian Date: Fri, 22 Dec 2017 13:41:55 -0800 Subject: Use ICU Localization for country names in settings. Bug: 69798116 Test: existing unit tests PiperOrigin-RevId: 179959039 Change-Id: Iee6959b30345c044e85c2048954ce06555984926 --- .../ui/AssistedDialingSettingFragment.java | 15 +- .../assisteddialing/ui/res/values/strings.xml | 488 ++++++++++----------- 2 files changed, 258 insertions(+), 245 deletions(-) diff --git a/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java b/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java index d4fb3f64b..932cc6d6c 100644 --- a/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java +++ b/java/com/android/dialer/assisteddialing/ui/AssistedDialingSettingFragment.java @@ -16,6 +16,8 @@ package com.android.dialer.assisteddialing.ui; import android.annotation.TargetApi; +import android.icu.util.ULocale; +import android.icu.util.ULocale.Builder; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.preference.ListPreference; @@ -150,8 +152,19 @@ public class AssistedDialingSettingFragment extends PreferenceFragment { } List displayNamesandCountryCodes = new ArrayList<>(); + // getCountry() is actually getRegion() and conforms to the iso standards of input for the + // builder. + ULocale userLocale = + new ULocale.Builder() + .setRegion(getResources().getConfiguration().getLocales().get(0).getCountry()) + .setLanguage(getResources().getConfiguration().getLocales().get(0).getLanguage()) + .build(); for (int i = 0; i < keys.length; i++) { - displayNamesandCountryCodes.add(DisplayNameAndCountryCodeTuple.create(keys[i], values[i])); + ULocale settingRowDisplayCountry = new Builder().setRegion(values[i].toString()).build(); + String localizedDisplayCountry = settingRowDisplayCountry.getDisplayCountry(userLocale); + String settingDisplayName = localizedDisplayCountry + " " + keys[i]; + displayNamesandCountryCodes.add( + DisplayNameAndCountryCodeTuple.create(settingDisplayName, values[i])); } return displayNamesandCountryCodes; diff --git a/java/com/android/dialer/assisteddialing/ui/res/values/strings.xml b/java/com/android/dialer/assisteddialing/ui/res/values/strings.xml index 35aa2f147..417191e50 100644 --- a/java/com/android/dialer/assisteddialing/ui/res/values/strings.xml +++ b/java/com/android/dialer/assisteddialing/ui/res/values/strings.xml @@ -37,251 +37,251 @@ - - + + @string/assisted_dialing_setting_cc_default_summary_fallback - Afghanistan (+93) - Åland Islands (+358) - Albania (+355) - Algeria (+213) - American Samoa (+1) - Andorra (+376) - Angola (+244) - Anguilla (+1) - Antigua and Barbuda (+1) - Argentina (+54) - Armenia (+374) - Aruba (+297) - Australia (+61) - Austria (+43) - Azerbaijan (+994) - Bahamas (+1) - Bahrain (+973) - Bangladesh (+880) - Barbados (+1) - Belarus (+375) - Belgium (+32) - Belize (+501) - Benin (+229) - Bermuda (+1) - Bhutan (+975) - Bolivia (+591) - Caribbean Netherlands (+599) - Bosnia and Herzegovina (+387) - Botswana (+267) - Brazil (+55) - British Indian Ocean Territory (+246) - Brunei (+673) - Bulgaria (+359) - Burkina Faso (+226) - Burundi (+257) - Cabo Verde (+238) - Cambodia (+855) - Cameroon (+237) - Canada (+1) - Cayman Islands (+1) - Central African Republic (+236) - Chad (+235) - Chile (+56) - China (+86) - Christmas Island (+61) - Cocos (Keeling) Islands (+61) - Colombia (+57) - Comoros (+269) - Democratic Republic of the Congo (+243) - Congo (+242) - Cook Islands (+682) - Costa Rica (+506) - Côte d\'Ivoire (+225) - Croatia (+385) - Cuba (+53) - Curaçao (+599) - Cyprus (+357) - Czechia (+420) - Denmark (+45) - Djibouti (+253) - Dominica (+1) - Dominican Republic (+1) - Ecuador (+593) - Egypt (+20) - El Salvador (+503) - Equatorial Guinea (+240) - Eritrea (+291) - Estonia (+372) - Ethiopia (+251) - Falkland Islands (Islas Malvinas) (+500) - Faroe Islands (+298) - Fiji (+679) - Finland (+358) - France (+33) - French Guiana (+594) - French Polynesia (+689) - Gabon (+241) - Gambia (+220) - Georgia (+995) - Germany (+49) - Ghana (+233) - Gibraltar (+350) - Greece (+30) - Greenland (+299) - Grenada (+1) - Guadeloupe (+590) - Guam (+1) - Guatemala (+502) - Guernsey (+44) - Guinea (+224) - Guinea-Bissau (+245) - Guyana (+592) - Haiti (+509) - Holy See (+39) - Honduras (+504) - Hong Kong (+852) - Hungary (+36) - Iceland (+354) - India (+91) - Indonesia (+62) - Iran (+98) - Iraq (+964) - Ireland (+353) - Isle of Man (+44) - Israel (+972) - Italy (+39) - Jamaica (+1) - Japan (+81) - Jersey (+44) - Jordan (+962) - Kazakhstan (+7) - Kenya (+254) - Kiribati (+686) - North Korea (+850) - South Korea (+82) - Kuwait (+965) - Kyrgyzstan (+996) - Laos (+856) - Latvia (+371) - Lebanon (+961) - Lesotho (+266) - Liberia (+231) - Libya (+218) - Liechtenstein (+423) - Lithuania (+370) - Luxembourg (+352) - Macao (+853) - Macedonia (FYROM) (+389) - Madagascar (+261) - Malawi (+265) - Malaysia (+60) - Maldives (+960) - Mali (+223) - Malta (+356) - Marshall Islands (+692) - Martinique (+596) - Mauritania (+222) - Mauritius (+230) - Mayotte (+262) - Mexico (+52) - Micronesia (+691) - Moldova (+373) - Monaco (+377) - Mongolia (+976) - Montenegro (+382) - Montserrat (+1) - Morocco (+212) - Mozambique (+258) - Myanmar (+95) - Namibia (+264) - Nauru (+674) - Nepal (+977) - Netherlands (+31) - New Caledonia (+687) - New Zealand (+64) - Nicaragua (+505) - Niger (+227) - Nigeria (+234) - Niue (+683) - Norfolk Island (+672) - Northern Mariana Islands (+1) - Norway (+47) - Oman (+968) - Pakistan (+92) - Palau (+680) - Palestine (+970) - Panama (+507) - Papua New Guinea (+675) - Paraguay (+595) - Peru (+51) - Philippines (+63) - Poland (+48) - Portugal (+351) - Puerto Rico (+1) - Qatar (+974) - Réunion (+262) - Romania (+40) - Russian (+7) - Rwanda (+250) - St. Barthélemy (+590) - St. Helena (+290) - St. Kitts and Nevis (+1) - St. Lucia (+1) - St. Martin (+590) - St. Pierre and Miquelon (+508) - St. Vincent and the Grenadines (+1) - Samoa (+685) - San Marino (+378) - Sao Tome and Principe (+239) - Saudi Arabia (+966) - Senegal (+221) - Serbia (+381) - Seychelles (+248) - Sierra Leone (+232) - Singapore (+65) - Sint Maarten (+1) - Slovakia (+421) - Slovenia (+386) - Solomon Islands (+677) - Somalia (+252) - South Africa (+27) - South Sudan (+211) - Spain (+34) - Sri Lanka (+94) - Sudan (+249) - Suriname (+597) - Svalbard and Jan Mayen (+47) - Swaziland (+268) - Sweden (+46) - Switzerland (+41) - Syria (+963) - Taiwan (+886) - Tajikistan (+992) - Tanzania (+255) - Thailand (+66) - Timor-Leste (+670) - Togo (+228) - Tokelau (+690) - Tonga (+676) - Trinidad and Tobago (+1) - Tunisia (+216) - Turkey (+90) - Turkmenistan (+993) - Turks and Caicos Islands (+1) - Tuvalu (+688) - Uganda (+256) - Ukraine (+380) - United Arab Emirates (+971) - United Kingdom (+44) - United States (+1) - Uruguay (+598) - Uzbekistan (+998) - Vanuatu (+678) - Venezuela (+58) - Viet Nam (+84) - Virgin Islands (British) (+1) - Virgin Islands (U.S.) (+1) - Wallis and Futuna (+681) - Western Sahara (+212) - Yemen (+967) - Zambia (+260) - Zimbabwe (+263) + (+93) + (+358) + (+355) + (+213) + (+1) + (+376) + (+244) + (+1) + (+1) + (+54) + (+374) + (+297) + (+61) + (+43) + (+994) + (+1) + (+973) + (+880) + (+1) + (+375) + (+32) + (+501) + (+229) + (+1) + (+975) + (+591) + (+599) + (+387) + (+267) + (+55) + (+246) + (+673) + (+359) + (+226) + (+257) + (+238) + (+855) + (+237) + (+1) + (+1) + (+236) + (+235) + (+56) + (+86) + (+61) + (+61) + (+57) + (+269) + (+243) + (+242) + (+682) + (+506) + (+225) + (+385) + (+53) + (+599) + (+357) + (+420) + (+45) + (+253) + (+1) + (+1) + (+593) + (+20) + (+503) + (+240) + (+291) + (+372) + (+251) + (+500) + (+298) + (+679) + (+358) + (+33) + (+594) + (+689) + (+241) + (+220) + (+995) + (+49) + (+233) + (+350) + (+30) + (+299) + (+1) + (+590) + (+1) + (+502) + (+44) + (+224) + (+245) + (+592) + (+509) + (+39) + (+504) + (+852) + (+36) + (+354) + (+91) + (+62) + (+98) + (+964) + (+353) + (+44) + (+972) + (+39) + (+1) + (+81) + (+44) + (+962) + (+7) + (+254) + (+686) + (+850) + (+82) + (+965) + (+996) + (+856) + (+371) + (+961) + (+266) + (+231) + (+218) + (+423) + (+370) + (+352) + (+853) + (+389) + (+261) + (+265) + (+60) + (+960) + (+223) + (+356) + (+692) + (+596) + (+222) + (+230) + (+262) + (+52) + (+691) + (+373) + (+377) + (+976) + (+382) + (+1) + (+212) + (+258) + (+95) + (+264) + (+674) + (+977) + (+31) + (+687) + (+64) + (+505) + (+227) + (+234) + (+683) + (+672) + (+1) + (+47) + (+968) + (+92) + (+680) + (+970) + (+507) + (+675) + (+595) + (+51) + (+63) + (+48) + (+351) + (+1) + (+974) + (+262) + (+40) + (+7) + (+250) + (+590) + (+290) + (+1) + (+1) + (+590) + (+508) + (+1) + (+685) + (+378) + (+239) + (+966) + (+221) + (+381) + (+248) + (+232) + (+65) + (+1) + (+421) + (+386) + (+677) + (+252) + (+27) + (+211) + (+34) + (+94) + (+249) + (+597) + (+47) + (+268) + (+46) + (+41) + (+963) + (+886) + (+992) + (+255) + (+66) + (+670) + (+228) + (+690) + (+676) + (+1) + (+216) + (+90) + (+993) + (+1) + (+688) + (+256) + (+380) + (+971) + (+44) + (+1) + (+598) + (+998) + (+678) + (+58) + (+84) + (+1) + (+1) + (+681) + (+212) + (+967) + (+260) + (+263) -- cgit v1.2.3