Update settings to use latest IDs for zones

Various zones in timezones.xml were being identified by old
IDs. The settings picker and setup wizard uses the exact
ID when pre-selecting the user's current zone. Since the
autodetection uses the new IDs in places like Buenos
Aires users would not have the correct zone pre-selected
during setup.

Thanks to Marcio Ikeda of LG for the report.

Other legacy IDs found with:

for TZ in `grep 'id=' timezones.xml \
    | awk -F\" '{ print $2 }'`; do \
grep ${TZ} ~/Downloads/tzdata2016g/zone.tab > /dev/null; \
if (( $? != 0 )); then echo Bad: ${TZ}; fi; \
done

New IDs found using tzdata NEWS and "backward" file.

Test: Manual testing: selection of the zone in the settings
Bug: 36469833
(cherry picked from commit b4d003da66beb414e8e7fcec94a82a53027dbbfa)
Merged-In: I8c20494a48870cdc600854756061e86db730e14a
Change-Id: I829a70921eb13b763b5446820c87672615f2524d

diff --git a/packages/SettingsLib/res/xml/timezones.xml b/packages/SettingsLib/res/xml/timezones.xml
index 4426495..12d31cf 100644 (file)
--- a/packages/SettingsLib/res/xml/timezones.xml
+++ b/packages/SettingsLib/res/xml/timezones.xml
@@ -21,7 +21,7 @@
     <timezone id="America/St_Johns"></timezone>
     <timezone id="America/Recife"></timezone>
     <timezone id="America/Sao_Paulo"></timezone>
-    <timezone id="America/Buenos_Aires"></timezone>
+    <timezone id="America/Argentina/Buenos_Aires"></timezone>
     <timezone id="America/Godthab"></timezone>
     <timezone id="America/Montevideo"></timezone>
     <timezone id="Atlantic/South_Georgia"></timezone>
@@ -58,11 +58,11 @@
     <timezone id="Asia/Karachi"></timezone>
     <timezone id="Asia/Oral"></timezone>
     <timezone id="Asia/Yekaterinburg"></timezone>
-    <timezone id="Asia/Calcutta"></timezone>
+    <timezone id="Asia/Kolkata"></timezone>
     <timezone id="Asia/Colombo"></timezone>
-    <timezone id="Asia/Katmandu"></timezone>
+    <timezone id="Asia/Kathmandu"></timezone>
     <timezone id="Asia/Almaty"></timezone>
-    <timezone id="Asia/Rangoon"></timezone>
+    <timezone id="Asia/Yangon"></timezone>
     <timezone id="Asia/Krasnoyarsk"></timezone>
     <timezone id="Asia/Bangkok"></timezone>
     <timezone id="Asia/Jakarta"></timezone>