summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib/res/xml
diff options
context:
space:
mode:
authorLuis Vidal <lvidal@cyngn.com>2016-05-16 16:00:49 -0700
committerRoman Birg <roman@cyngn.com>2016-05-17 14:30:17 -0700
commitf59a969ae6385cd376c07f2bfadd9373c7a4e7fc (patch)
treedba72334f5a39d665507ad29ec6c8716b1105de4 /packages/SettingsLib/res/xml
parent22a2eff7aaea5e00f8c93add3b2dc8a99ddc6604 (diff)
downloadframeworks_base-f59a969ae6385cd376c07f2bfadd9373c7a4e7fc.zip
frameworks_base-f59a969ae6385cd376c07f2bfadd9373c7a4e7fc.tar.gz
frameworks_base-f59a969ae6385cd376c07f2bfadd9373c7a4e7fc.tar.bz2
Port "Settings: add a way to not localize zone selections" to cm-13
In specific cases we may not want to display the localized time zone name in the time zone picker. For instance, when the system language is set to English (US), going into the time zone picker, we can find "London." After we set the system language to English (United Kingdom), London becomes localized to "British Summer Time." To avoid this behavior and to always display the unlocalized version of the time zone name, we can now set localizeInPicker="false" on the time zone entry desired to not be localized. Note that if a translation is available for the selected time zone, it will still be applied. In this patch we add this attribute to the Kiev time zone. In English this patch has no effect. However if the system language is changed to Ukranian and we select Kiev from the time zone picker: Without this patch: in the time zone picker it would use local time zone translations, e.g. "за схдноевропейським літнім часом" (Eastern European Summer Time). With this patch: it displays "Київ" in the time zone picker. But still displays the localized time zone in the Date & Time settings. Ref: CYNGNOS-453 (ported from commit c5aecaab60d353fcedd4579b9d94808be9838de2) Change-Id: I6302e5beb981786500f73629baa0751ac9e43e73
Diffstat (limited to 'packages/SettingsLib/res/xml')
-rw-r--r--packages/SettingsLib/res/xml/timezones.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/res/xml/timezones.xml b/packages/SettingsLib/res/xml/timezones.xml
index 47e84c8..147f263 100644
--- a/packages/SettingsLib/res/xml/timezones.xml
+++ b/packages/SettingsLib/res/xml/timezones.xml
@@ -47,7 +47,7 @@
<timezone id="Africa/Harare"></timezone>
<timezone id="Asia/Baghdad"></timezone>
<timezone id="Europe/Moscow"></timezone>
- <timezone id="Europe/Kiev"></timezone>
+ <timezone id="Europe/Kiev" localizeInPicker="false"></timezone>
<timezone id="Asia/Kuwait"></timezone>
<timezone id="Africa/Nairobi"></timezone>
<timezone id="Asia/Tehran"></timezone>