am 7635ada2: Merge "Fix test in SubtypeLocaleUtilsTests"

* commit '7635ada2463730ab9e356922bb21cf5cf2a2716e':
  Fix test in SubtypeLocaleUtilsTests
main
Satoshi Kataoka 2013-09-18 19:57:29 -07:00 committed by Android Git Automerger
commit 1866b90f0f
1 changed files with 21 additions and 21 deletions

View File

@ -158,47 +158,47 @@
<!-- Compatibility map from subtypeLocale:subtypeExtraValue to keyboardLayoutSet --> <!-- Compatibility map from subtypeLocale:subtypeExtraValue to keyboardLayoutSet -->
<string-array name="locale_and_extra_value_to_keyboard_layout_set_map"> <string-array name="locale_and_extra_value_to_keyboard_layout_set_map">
<item>en_US:TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection</item> <item>en_US:TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwerty</item> <item>qwerty</item>
<item>en_GB:TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection</item> <item>en_GB:TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwerty</item> <item>qwerty</item>
<item>ar:SupportTouchPositionCorrection</item> <item>ar:SupportTouchPositionCorrection,EmojiCapable</item>
<item>arabic</item> <item>arabic</item>
<item>cs:AsciiCapable,SupportTouchPositionCorrection</item> <item>cs:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwertz</item> <item>qwertz</item>
<item>da:AsciiCapable,SupportTouchPositionCorrection</item> <item>da:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>nordic</item> <item>nordic</item>
<item>de:AsciiCapable,SupportTouchPositionCorrection</item> <item>de:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwertz</item> <item>qwertz</item>
<item>es:AsciiCapable,SupportTouchPositionCorrection</item> <item>es:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>spanish</item> <item>spanish</item>
<item>fi:AsciiCapable,SupportTouchPositionCorrection</item> <item>fi:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>nordic</item> <item>nordic</item>
<item>fr:AsciiCapable,SupportTouchPositionCorrection</item> <item>fr:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>azerty</item> <item>azerty</item>
<item>fr_CA:AsciiCapable,SupportTouchPositionCorrection</item> <item>fr_CA:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwerty</item> <item>qwerty</item>
<item>hr:AsciiCapable,SupportTouchPositionCorrection</item> <item>hr:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwertz</item> <item>qwertz</item>
<item>hu:AsciiCapable,SupportTouchPositionCorrection</item> <item>hu:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwertz</item> <item>qwertz</item>
<item>it:AsciiCapable,SupportTouchPositionCorrection</item> <item>it:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwerty</item> <item>qwerty</item>
<item>iw:SupportTouchPositionCorrection</item> <item>iw:SupportTouchPositionCorrection,EmojiCapable</item>
<item>hebrew</item> <item>hebrew</item>
<item>nb:AsciiCapable,SupportTouchPositionCorrection</item> <item>nb:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>nordic</item> <item>nordic</item>
<item>nl:AsciiCapable,SupportTouchPositionCorrection</item> <item>nl:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwerty</item> <item>qwerty</item>
<item>pl:AsciiCapable,SupportTouchPositionCorrection</item> <item>pl:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwerty</item> <item>qwerty</item>
<item>ru:SupportTouchPositionCorrection</item> <item>ru:SupportTouchPositionCorrection,EmojiCapable</item>
<item>east_slavic</item> <item>east_slavic</item>
<item>sr:SupportTouchPositionCorrection</item> <item>sr:SupportTouchPositionCorrection,EmojiCapable</item>
<item>south_slavic</item> <item>south_slavic</item>
<item>sv:AsciiCapable,SupportTouchPositionCorrection</item> <item>sv:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>nordic</item> <item>nordic</item>
<item>tr:AsciiCapable,SupportTouchPositionCorrection</item> <item>tr:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
<item>qwerty</item> <item>qwerty</item>
</string-array> </string-array>