Merge "Embedded country names in the app for ones not in framework" into jb-mr2-dev

1 files changed, 33 insertions, 2 deletions

diff --git a/src/com/android/timezonepicker/TimeZoneData.java b/src/com/android/timezonepicker/TimeZoneData.java
index c8e9355..c6eeeaa 100644
--- a/src/com/android/timezonepicker/TimeZoneData.java
+++ b/src/com/android/timezonepicker/TimeZoneData.java
@@ -394,8 +394,7 @@ public class TimeZoneData {
                     // name
                     String country = mCountryCodeToNameMap.get(countryCode);
                     if (country == null) {
-                        country = new Locale(lang, countryCode)
-                                .getDisplayCountry(Locale.getDefault());
+                        country = getCountryNames(lang, countryCode);
                         mCountryCodeToNameMap.put(countryCode, country);
                     }
 
@@ -465,6 +464,38 @@ public class TimeZoneData {
         return processedTimeZones;
     }
 
+    @SuppressWarnings("unused")
+    private static Locale mBackupCountryLocale;
+    private static String[] mBackupCountryCodes;
+    private static String[] mBackupCountryNames;
+
+    private String getCountryNames(String lang, String countryCode) {
+        final Locale defaultLocale = Locale.getDefault();
+        String countryDisplayName = new Locale(lang, countryCode).getDisplayCountry(defaultLocale);
+
+        if (!countryCode.equals(countryDisplayName)) {
+            return countryDisplayName;
+        }
+
+        if (mBackupCountryCodes == null || !defaultLocale.equals(mBackupCountryLocale)) {
+            mBackupCountryLocale = defaultLocale;
+            mBackupCountryCodes = mContext.getResources().getStringArray(
+                    R.array.backup_country_codes);
+            mBackupCountryNames = mContext.getResources().getStringArray(
+                    R.array.backup_country_names);
+        }
+
+        int length = Math.min(mBackupCountryCodes.length, mBackupCountryNames.length);
+
+        for (int i = 0; i < length; i++) {
+            if (mBackupCountryCodes[i].equals(countryCode)) {
+                return mBackupCountryNames[i];
+            }
+        }
+
+        return countryCode;
+    }
+
     private int getIdenticalTimeZoneInTheCountry(TimeZoneInfo timeZoneInfo) {
         int idx = 0;
         for (TimeZoneInfo tzi : mTimeZones) {