diff options
author | stumped <sandeep@cyngn.com> | 2014-12-01 19:18:16 -0800 |
---|---|---|
committer | Casey Kelso <ckelso@cyngn.com> | 2014-12-02 22:40:46 +0000 |
commit | 7a89e47dbc670f84490423f621bef6e96b18e63c (patch) | |
tree | 9f7e9342425255fd7bd0e52d43fa64b3f1a65526 | |
parent | fae9909ccd96dc85af5b55ebbffd837d4ba9e96e (diff) | |
download | android_packages_apps_DeskClock-7a89e47dbc670f84490423f621bef6e96b18e63c.tar.gz android_packages_apps_DeskClock-7a89e47dbc670f84490423f621bef6e96b18e63c.tar.bz2 android_packages_apps_DeskClock-7a89e47dbc670f84490423f621bef6e96b18e63c.zip |
World Clock cities names and times incorrect.
This change adds cities to India arrays.xml and removes sorting of the
list after reading from the XML
modified: ../../../../res/values-en-rIN/array.xml
modified: ../../../../res/values/array.xml
modified: Utils.java
Change-Id: I91a5396ce80aea547fbbb6f88a0a5369fc7a8243
(cherry picked from commit 6a7b23c7ad83299b9fe9bc0a4cef7e983315b078)
-rw-r--r-- | res/values-en-rIN/array.xml | 34 | ||||
-rw-r--r-- | res/values/array.xml | 2 | ||||
-rw-r--r-- | src/com/android/deskclock/Utils.java | 7 |
3 files changed, 34 insertions, 9 deletions
diff --git a/res/values-en-rIN/array.xml b/res/values-en-rIN/array.xml index a6c94cd55..1e63447fe 100644 --- a/res/values-en-rIN/array.xml +++ b/res/values-en-rIN/array.xml @@ -108,7 +108,7 @@ <item msgid="3956700126827381905">"São Paulo"</item> <item msgid="3851056559336304908">"St. Johns"</item> <item msgid="7620601490016157459">"St. Kitts"</item> - <item msgid="256494147725561888">"St Lucia"</item> + <item msgid="256494147725561888">"St. Lucia"</item> <item msgid="9065982618380084594">"St. Thomas"</item> <item msgid="7424657189317481507">"Tijuana"</item> <item msgid="7378768724772963031">"Toronto"</item> @@ -316,5 +316,37 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item>Marshall Islands</item> + <item>Midway Island</item> + <item>Regina</item> + <item>Manaus</item> + <item>Araguaina</item> + <item>Godthab</item> + <item>South Georgia</item> + <item>Azores</item> + <item>Windhoek</item> + <item>Tbilisi</item> + <item>Yerevan</item> + <item>Oral</item> + <item>Yekaterinburg</item> + <item>Krasnoyarsk</item> + <item>Irkutsk</item> + <item>Yakutsk</item> + <item>Hobart</item> + <item>Magadan</item> + <item>Tongatapu</item> + <item>Aklavik</item> + <item>Montgomery</item> + <item>Geneva</item> + <item>Odesa</item> + <item>Aden</item> + <item>Abu Dhabi</item> + <item>Tashkent</item> + <item>New Delhi</item> + <item>Suva</item> + <item>Wellington</item> + <item>Chatham</item> + <item>Vladivostok</item> + <item>Kamchatka</item> </string-array> </resources> diff --git a/res/values/array.xml b/res/values/array.xml index 70aa3990e..589825336 100644 --- a/res/values/array.xml +++ b/res/values/array.xml @@ -940,7 +940,7 @@ <item>C254</item> <item>C255</item> <item>C256</item> - <item>C257</item> + <item>C0</item> <item>C258</item> <item>C259</item> <item>C260</item> diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java index 393c7affb..fa8ee882c 100644 --- a/src/com/android/deskclock/Utils.java +++ b/src/com/android/deskclock/Utils.java @@ -573,13 +573,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()]); } |