Merge remote-tracking branch 'goog/master' into mergescriptpackage
Ken Wakasa
commit
63531e1433
|
|
@ -87,161 +87,161 @@
|
|||
android:isDefault="@bool/im_is_default">
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_en_US"
|
||||
android:subtypeId="-921088104"
|
||||
android:subtypeId="0xc9194f98"
|
||||
android:imeSubtypeLocale="en_US"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_en_GB"
|
||||
android:subtypeId="-1337596075"
|
||||
android:subtypeId="0xb045e755"
|
||||
android:imeSubtypeLocale="en_GB"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1872175968"
|
||||
android:subtypeId="0x6f972360"
|
||||
android:imeSubtypeLocale="af"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1494081088"
|
||||
android:subtypeId="0x590dde40"
|
||||
android:imeSubtypeLocale="ar"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="499361881"
|
||||
android:subtypeId="0x1dc3a859"
|
||||
android:imeSubtypeLocale="be"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="195674344"
|
||||
android:subtypeId="0x0ba9c0e8"
|
||||
android:imeSubtypeLocale="bg"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_bulgarian_bds"
|
||||
android:subtypeId="1599191706"
|
||||
android:subtypeId="0x5f51ba9a"
|
||||
android:imeSubtypeLocale="bg"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-756735787"
|
||||
android:subtypeId="0xd2e520d5"
|
||||
android:imeSubtypeLocale="ca"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="758984400"
|
||||
android:subtypeId="0x2d3d2ed0"
|
||||
android:imeSubtypeLocale="cs"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="770990173"
|
||||
android:subtypeId="0x2df4605d"
|
||||
android:imeSubtypeLocale="da"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="774684257"
|
||||
android:subtypeId="0x2e2cbe61"
|
||||
android:imeSubtypeLocale="de"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="242746067"
|
||||
android:subtypeId="0x0e7802d3"
|
||||
android:imeSubtypeLocale="el"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=greek"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1083200842"
|
||||
android:subtypeId="0x4090554a"
|
||||
android:imeSubtypeLocale="eo"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="816242702"
|
||||
android:subtypeId="0x30a6e00e"
|
||||
android:imeSubtypeLocale="es"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1648333446"
|
||||
android:subtypeId="0x623f9286"
|
||||
android:imeSubtypeLocale="es_419"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-332580523"
|
||||
android:subtypeId="0xec2d3955"
|
||||
android:imeSubtypeLocale="et"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-1100561836"
|
||||
android:subtypeId="0xbe66c254"
|
||||
android:imeSubtypeLocale="fa"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=farsi"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="835636643"
|
||||
android:subtypeId="0x31cecda3"
|
||||
android:imeSubtypeLocale="fi"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="843948332"
|
||||
android:subtypeId="0x324da12c"
|
||||
android:imeSubtypeLocale="fr"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-354699631"
|
||||
android:subtypeId="0xeadbb691"
|
||||
android:imeSubtypeLocale="fr_CA"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="963984255"
|
||||
android:subtypeId="0x39753b7f"
|
||||
android:imeSubtypeLocale="hi"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="901206634"
|
||||
android:subtypeId="0x35b7526a"
|
||||
android:imeSubtypeLocale="hr"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="903977197"
|
||||
android:subtypeId="0x35e198ed"
|
||||
android:imeSubtypeLocale="hu"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
|
|
@ -249,21 +249,21 @@
|
|||
<!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. -->
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="2108597344"
|
||||
android:subtypeId="0x7daea460"
|
||||
android:imeSubtypeLocale="in"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="2113214949"
|
||||
android:subtypeId="0x7df519e5"
|
||||
android:imeSubtypeLocale="is"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="931682827"
|
||||
android:subtypeId="0x37885a0b"
|
||||
android:imeSubtypeLocale="it"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
|
|
@ -271,126 +271,126 @@
|
|||
<!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. -->
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1727731901"
|
||||
android:subtypeId="0x66fb18bd"
|
||||
android:imeSubtypeLocale="iw"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1846648426"
|
||||
android:subtypeId="0x6e119e6a"
|
||||
android:imeSubtypeLocale="ka"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="775494660"
|
||||
android:subtypeId="0x2e391c04"
|
||||
android:imeSubtypeLocale="ky"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-2094941373"
|
||||
android:subtypeId="0x8321bb43"
|
||||
android:imeSubtypeLocale="lt"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-2093094331"
|
||||
android:subtypeId="0x833dea45"
|
||||
android:imeSubtypeLocale="lv"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-1353667716"
|
||||
android:subtypeId="0xaf50ab7c"
|
||||
android:imeSubtypeLocale="mk"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-2067235743"
|
||||
android:subtypeId="0x84c87c61"
|
||||
android:imeSubtypeLocale="ms"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1058205204"
|
||||
android:subtypeId="0x3f12ee14"
|
||||
android:imeSubtypeLocale="nb"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1067440414"
|
||||
android:subtypeId="0x3f9fd91e"
|
||||
android:imeSubtypeLocale="nl"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1343007020"
|
||||
android:subtypeId="0x500ca92c"
|
||||
android:imeSubtypeLocale="nl_BE"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=azerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1124698716"
|
||||
android:subtypeId="0x43098a5c"
|
||||
android:imeSubtypeLocale="pl"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-889195354"
|
||||
android:subtypeId="0xcafff4a6"
|
||||
android:imeSubtypeLocale="pt_BR"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-486540198"
|
||||
android:subtypeId="0xe2fffc5a"
|
||||
android:imeSubtypeLocale="pt_PT"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-1927784072"
|
||||
android:subtypeId="0x8d185978"
|
||||
android:imeSubtypeLocale="ro"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1983547218"
|
||||
android:subtypeId="0x763a8752"
|
||||
android:imeSubtypeLocale="ru"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-1902849005"
|
||||
android:subtypeId="0x8e94d413"
|
||||
android:imeSubtypeLocale="sk"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-1901925484"
|
||||
android:subtypeId="0x8ea2eb94"
|
||||
android:imeSubtypeLocale="sl"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="2009405806"
|
||||
android:subtypeId="0x77c5196e"
|
||||
android:imeSubtypeLocale="sr"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
|
||||
|
|
@ -398,14 +398,14 @@
|
|||
<!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_serbian_cyrillic"
|
||||
android:subtypeId="XXXXXX"
|
||||
android:subtypeId="0xXXXXXXXX"
|
||||
android:imeSubtypeLocale="sr"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_serbian_latin"
|
||||
android:subtypeId="XXXXXX"
|
||||
android:subtypeId="0xXXXXXXXX"
|
||||
android:imeSubtypeLocale="sr-Latn"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
|
|
@ -413,63 +413,63 @@
|
|||
-->
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1219821379"
|
||||
android:subtypeId="0x48b4ff43"
|
||||
android:imeSubtypeLocale="sv"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-1891766753"
|
||||
android:subtypeId="0x8f3dee1f"
|
||||
android:imeSubtypeLocale="sw"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="529847764"
|
||||
android:subtypeId="0x1f94d5d4"
|
||||
android:imeSubtypeLocale="th"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=thai"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-259881489"
|
||||
android:subtypeId="0xf08285ef"
|
||||
android:imeSubtypeLocale="tl"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1244756446"
|
||||
android:subtypeId="0x4a3179de"
|
||||
android:imeSubtypeLocale="tr"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="1048856876"
|
||||
android:subtypeId="0x3e84492c"
|
||||
android:imeSubtypeLocale="uk"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-1818808594"
|
||||
android:subtypeId="0x93972eee"
|
||||
android:imeSubtypeLocale="vi"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_generic"
|
||||
android:subtypeId="-1693209738"
|
||||
android:subtypeId="0x9b13ab76"
|
||||
android:imeSubtypeLocale="zu"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"
|
||||
/>
|
||||
<subtype android:icon="@drawable/ic_subtype_keyboard"
|
||||
android:label="@string/subtype_no_language_qwerty"
|
||||
android:subtypeId="-1573262419"
|
||||
android:subtypeId="0xa239ebad"
|
||||
android:imeSubtypeLocale="zz"
|
||||
android:imeSubtypeMode="keyboard"
|
||||
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable"
|
||||
|
|
|
|||
|
|
@ -710,21 +710,17 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
updateFullscreenMode();
|
||||
mApplicationSpecifiedCompletions = null;
|
||||
|
||||
if (isDifferentTextField || selectionChanged) {
|
||||
// If the selection changed, we reset the input state. Essentially, we come here with
|
||||
// restarting == true when the app called setText() or similar. We should reset the
|
||||
// state if the app set the text to something else, but keep it if it set a suggestion
|
||||
// or something.
|
||||
mEnteredText = null;
|
||||
resetComposingState(true /* alsoResetLastComposedWord */);
|
||||
mDeleteCount = 0;
|
||||
mSpaceState = SPACE_STATE_NONE;
|
||||
// The app calling setText() has the effect of clearing the composing
|
||||
// span, so we should reset our state unconditionally, even if restarting is true.
|
||||
mEnteredText = null;
|
||||
resetComposingState(true /* alsoResetLastComposedWord */);
|
||||
mDeleteCount = 0;
|
||||
mSpaceState = SPACE_STATE_NONE;
|
||||
|
||||
if (mSuggestionStripView != null) {
|
||||
// This will set the punctuation suggestions if next word suggestion is off;
|
||||
// otherwise it will clear the suggestion strip.
|
||||
setPunctuationSuggestions();
|
||||
}
|
||||
if (mSuggestionStripView != null) {
|
||||
// This will set the punctuation suggestions if next word suggestion is off;
|
||||
// otherwise it will clear the suggestion strip.
|
||||
setPunctuationSuggestions();
|
||||
}
|
||||
|
||||
mConnection.resetCachesUponCursorMove(editorInfo.initialSelStart);
|
||||
|
|
@ -1411,7 +1407,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
mHandler.postUpdateSuggestionStrip();
|
||||
final String text = specificTldProcessingOnTextInput(rawText);
|
||||
if (SPACE_STATE_PHANTOM == mSpaceState) {
|
||||
sendKeyCodePoint(Constants.CODE_SPACE);
|
||||
promotePhantomSpace();
|
||||
}
|
||||
mConnection.commitText(text, 1);
|
||||
mConnection.endBatchEdit();
|
||||
|
|
@ -1574,7 +1570,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
mWordComposer.setBatchInputWord(batchInputText);
|
||||
mConnection.beginBatchEdit();
|
||||
if (SPACE_STATE_PHANTOM == mSpaceState) {
|
||||
sendKeyCodePoint(Constants.CODE_SPACE);
|
||||
promotePhantomSpace();
|
||||
}
|
||||
mConnection.setComposingText(batchInputText, 1);
|
||||
mExpectingUpdateSelection = true;
|
||||
|
|
@ -1729,7 +1725,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
// Sanity check
|
||||
throw new RuntimeException("Should not be composing here");
|
||||
}
|
||||
sendKeyCodePoint(Constants.CODE_SPACE);
|
||||
promotePhantomSpace();
|
||||
}
|
||||
|
||||
// NOTE: isCursorTouchingWord() is a blocking IPC call, so it often takes several
|
||||
|
|
@ -1806,7 +1802,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
|
||||
if (SPACE_STATE_PHANTOM == spaceState &&
|
||||
mCurrentSettings.isPhantomSpacePromotingSymbol(primaryCode)) {
|
||||
sendKeyCodePoint(Constants.CODE_SPACE);
|
||||
promotePhantomSpace();
|
||||
}
|
||||
sendKeyCodePoint(primaryCode);
|
||||
|
||||
|
|
@ -2070,7 +2066,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
int firstChar = Character.codePointAt(suggestion, 0);
|
||||
if ((!mCurrentSettings.isWeakSpaceStripper(firstChar))
|
||||
&& (!mCurrentSettings.isWeakSpaceSwapper(firstChar))) {
|
||||
sendKeyCodePoint(Constants.CODE_SPACE);
|
||||
promotePhantomSpace();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2247,6 +2243,11 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
mHandler.postUpdateSuggestionStrip();
|
||||
}
|
||||
|
||||
// This essentially inserts a space, and that's it.
|
||||
public void promotePhantomSpace() {
|
||||
sendKeyCodePoint(Constants.CODE_SPACE);
|
||||
}
|
||||
|
||||
// Used by the RingCharBuffer
|
||||
public boolean isWordSeparator(final int code) {
|
||||
return mCurrentSettings.isWordSeparator(code);
|
||||
|
|
|
|||
Loading…
Reference in New Issue