Always use the LocalePicker's preferred locale names.
Without this change we have the odd situation where LocalePicker goes out of its way to avoid saying certain things but then -- as long as there's more than one locale for a given language -- Settings would happily report the name we'd been avoiding. (Either because it's too specific or because it's too sensitive.) Also remove the unused bit-rotted duplicate of the blacklist; even if we needed to access that list directly, we should use LocalePicker's copy. Bug: 17150708 Change-Id: I9bfa0bf9a82bebd29ba45f4cbeaabb4e78570779
This commit is contained in:
@@ -489,19 +489,6 @@
|
||||
<item>Proxy Auto-Config</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Locales in this list are displayed with the corresponding
|
||||
name from special_locale_names instead of using the name
|
||||
from Locale.getDisplayName(). -->
|
||||
<string-array translatable="false" name="special_locale_codes">
|
||||
<item>zh_CN</item>
|
||||
<item>zh_TW</item>
|
||||
</string-array>
|
||||
|
||||
<string-array translatable="false" name="special_locale_names">
|
||||
<item>中文 (简体)</item>
|
||||
<item>中文 (繁體)</item>
|
||||
</string-array>
|
||||
|
||||
<!-- Authentication Types used in APN editor -->
|
||||
<string-array name="apn_auth_entries">
|
||||
<item>None</item>
|
||||
|
||||
Reference in New Issue
Block a user