diff options
| author | stumped <sandeep@cyngn.com> | 2014-12-01 19:18:16 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-01-09 05:22:09 +0200 |
| commit | b84a1bb3017f85707b4645fa69b257a39557e2e1 (patch) | |
| tree | a8e545c93fedf6f892d9f46b5d97d6a33fa834c0 | |
| parent | dfb1ea6d1fbe903d7bb9729b60a5153251d106a3 (diff) | |
| download | android_packages_apps_DeskClock-b84a1bb3017f85707b4645fa69b257a39557e2e1.tar.gz android_packages_apps_DeskClock-b84a1bb3017f85707b4645fa69b257a39557e2e1.tar.bz2 android_packages_apps_DeskClock-b84a1bb3017f85707b4645fa69b257a39557e2e1.zip | |
Fix incorrect World Clock city names and timezones
This change also adds Chennai and removes sorting
of the list after reading from the XML
Change-Id: I7697b414d43600a8c9580ff2fc8b79467ba600d3
| -rw-r--r-- | res/values/array.xml | 11 | ||||
| -rwxr-xr-x | src/com/android/deskclock/Utils.java | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/res/values/array.xml b/res/values/array.xml index a3df7a6ad..f342e138a 100644 --- a/res/values/array.xml +++ b/res/values/array.xml @@ -123,7 +123,7 @@ <item>Baku</item> <item>Bangkok</item> <item>Beirut</item> - <item>Calcutta</item> + <item>Kolkata</item> <item>Damascus</item> <item>Dhaka</item> <item>Dubai</item> @@ -347,6 +347,7 @@ <item>Chatham</item> <item>Vladivostok</item> <item>Kamchatka</item> + <item>Chennai</item> </string-array> <string-array name="cities_tz" translatable="false"> @@ -675,12 +676,13 @@ <item>Asia/Aden</item> <item>Asia/Dubai</item> <item>Asia/Tashkent</item> - <item>Asia/Calcutta</item> + <item>Asia/Kolkata</item> <item>Pacific/Fiji</item> <item>Pacific/Auckland</item> <item>Pacific/Chatham</item> <item>Asia/Vladivostok</item> <item>Asia/Kamchatka</item> + <item>Asia/Kolkata</item> </string-array> <string-array name="cities_id" translatable="false"> @@ -941,7 +943,7 @@ <item>C255</item> <item>C256</item> <item>C257</item> - <item>C258</item> + <item>C0</item> <item>C259</item> <item>C260</item> <item>C261</item> @@ -972,7 +974,7 @@ <item>C286</item> <item>C287</item> <item>C288</item> - <item>C289</item> + <item>C0</item> <item>C290</item> <item>C291</item> <item>C292</item> @@ -1015,5 +1017,6 @@ <item>C329</item> <item>C330</item> <item>C331</item> + <item>C332</item> </string-array> </resources> diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java index fb4695ef5..43f2d893b 100755 --- a/src/com/android/deskclock/Utils.java +++ b/src/com/android/deskclock/Utils.java @@ -599,13 +599,6 @@ public class Utils { tempList.add(city); } - // Sort alphabetically - Collections.sort(tempList, new Comparator<CityObj> () { - @Override - public int compare(CityObj c1, CityObj c2) { - return collator.compare(c1.mCityName, c2.mCityName); - } - }); return tempList.toArray(new CityObj[tempList.size()]); } |