Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1866b90f authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am 7635ada2: Merge "Fix test in SubtypeLocaleUtilsTests"

* commit '7635ada2':
  Fix test in SubtypeLocaleUtilsTests
parents dbb3b98a 7635ada2
Loading
Loading
Loading
Loading
+21 −21
Original line number Diff line number Diff line
@@ -158,47 +158,47 @@

    <!-- Compatibility map from subtypeLocale:subtypeExtraValue to keyboardLayoutSet -->
    <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>en_GB:TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection</item>
        <item>en_GB:TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwerty</item>
        <item>ar:SupportTouchPositionCorrection</item>
        <item>ar:SupportTouchPositionCorrection,EmojiCapable</item>
        <item>arabic</item>
        <item>cs:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>cs:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwertz</item>
        <item>da:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>da:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>nordic</item>
        <item>de:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>de:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwertz</item>
        <item>es:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>es:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>spanish</item>
        <item>fi:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>fi:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>nordic</item>
        <item>fr:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>fr:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>azerty</item>
        <item>fr_CA:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>fr_CA:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwerty</item>
        <item>hr:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>hr:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwertz</item>
        <item>hu:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>hu:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwertz</item>
        <item>it:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>it:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwerty</item>
        <item>iw:SupportTouchPositionCorrection</item>
        <item>iw:SupportTouchPositionCorrection,EmojiCapable</item>
        <item>hebrew</item>
        <item>nb:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>nb:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>nordic</item>
        <item>nl:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>nl:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwerty</item>
        <item>pl:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>pl:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwerty</item>
        <item>ru:SupportTouchPositionCorrection</item>
        <item>ru:SupportTouchPositionCorrection,EmojiCapable</item>
        <item>east_slavic</item>
        <item>sr:SupportTouchPositionCorrection</item>
        <item>sr:SupportTouchPositionCorrection,EmojiCapable</item>
        <item>south_slavic</item>
        <item>sv:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>sv:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>nordic</item>
        <item>tr:AsciiCapable,SupportTouchPositionCorrection</item>
        <item>tr:AsciiCapable,SupportTouchPositionCorrection,EmojiCapable</item>
        <item>qwerty</item>
    </string-array>