| commit | beb5b28d5ec7b3adea6bc20206a219aae63f4626 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue Feb 27 10:32:55 2018 +0000 |
| committer | Neil Fuller <nfuller@google.com> | Tue Feb 27 12:37:21 2018 +0000 |
| tree | 9af5143d0398fe17aa8ade49902dcc597b63fb56 | |
| parent | dbeeaefea8035cd3fd0eec96c967b1d7fc0c1c22 [diff] |
Add metadata to Europe/Simferopol This commit adds metadata to the country mapping for Europe/Simferopol saying that it should be hidden in a user facing picker. This commit updates the data files after running update-tzdata.py. Bug: 73922616 Test: Manual inspection Test: Build / boot image Change-Id: I1fcfbde809204a67f93c98f8d3c0095715dbca13
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt index 218f182..cd2f5b0 100644 --- a/input_data/android/countryzones.txt +++ b/input_data/android/countryzones.txt
@@ -2436,6 +2436,8 @@ timeZoneMappings:< utcOffset:"3:00" id:"Europe/Simferopol" + # http://b/73922616 + shownInPicker:false > timeZoneMappings:<
diff --git a/output_data/android/tzlookup.xml b/output_data/android/tzlookup.xml index fb205d8..6dc2b68 100644 --- a/output_data/android/tzlookup.xml +++ b/output_data/android/tzlookup.xml
@@ -713,7 +713,7 @@ <id>Europe/Moscow</id> <id>Europe/Volgograd</id> <id>Europe/Kirov</id> - <id>Europe/Simferopol</id> + <id picker="n">Europe/Simferopol</id> <id>Europe/Kaliningrad</id> </country> <country code="rw" default="Africa/Kigali" everutc="n">
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip index b935679..3312545 100644 --- a/output_data/distro/distro.zip +++ b/output_data/distro/distro.zip Binary files differ
diff --git a/testing/data/test1/output_data/android/tzlookup.xml b/testing/data/test1/output_data/android/tzlookup.xml index 107740e..4723f86 100644 --- a/testing/data/test1/output_data/android/tzlookup.xml +++ b/testing/data/test1/output_data/android/tzlookup.xml
@@ -713,7 +713,7 @@ <id>Europe/Moscow</id> <id>Europe/Volgograd</id> <id>Europe/Kirov</id> - <id>Europe/Simferopol</id> + <id picker="n">Europe/Simferopol</id> <id>Europe/Kaliningrad</id> </country> <country code="rw" default="Africa/Kigali" everutc="n">
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip index bd04d84..1df4ed0 100644 --- a/testing/data/test1/output_data/distro/distro.zip +++ b/testing/data/test1/output_data/distro/distro.zip Binary files differ
diff --git a/testing/data/test2/output_data/android/tzlookup.xml b/testing/data/test2/output_data/android/tzlookup.xml index f6591c7..cb16d63 100644 --- a/testing/data/test2/output_data/android/tzlookup.xml +++ b/testing/data/test2/output_data/android/tzlookup.xml
@@ -713,7 +713,7 @@ <id>Europe/Moscow</id> <id>Europe/Volgograd</id> <id>Europe/Kirov</id> - <id>Europe/Simferopol</id> + <id picker="n">Europe/Simferopol</id> <id>Europe/Kaliningrad</id> </country> <country code="rw" default="Africa/Kigali" everutc="n">
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip index bfe2fa8..89a9fd4 100644 --- a/testing/data/test2/output_data/distro/distro.zip +++ b/testing/data/test2/output_data/distro/distro.zip Binary files differ