nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 957a2337: Merge "Set EmojiCapable" 

* commit '957a2337eee3a075957d6c397396996febd78982':
  Set EmojiCapable
main
Satoshi Kataoka 2013-09-18 01:52:26 -07:00 committed by Android Git Automerger
parent 85df7bcd6c 957a2337ee
commit 3d184ea47b
4 changed files with 81 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
java/res/xml/method.xml
View File

@ -99,112 +99,112 @@
android:subtypeId="0xc9194f98" android:subtypeId="0xc9194f98"
android:imeSubtypeLocale="en_US" android:imeSubtypeLocale="en_US"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_en_GB" android:label="@string/subtype_en_GB"
android:subtypeId="0xb045e755" android:subtypeId="0xb045e755"
android:imeSubtypeLocale="en_GB" android:imeSubtypeLocale="en_GB"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x6f972360" android:subtypeId="0x6f972360"
android:imeSubtypeLocale="af" android:imeSubtypeLocale="af"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x590dde40" android:subtypeId="0x590dde40"
android:imeSubtypeLocale="ar" android:imeSubtypeLocale="ar"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x70b0f974" android:subtypeId="0x70b0f974"
android:imeSubtypeLocale="az" android:imeSubtypeLocale="az"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x1dc3a859" android:subtypeId="0x1dc3a859"
android:imeSubtypeLocale="be" android:imeSubtypeLocale="be"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x0ba9c0e8" android:subtypeId="0x0ba9c0e8"
android:imeSubtypeLocale="bg" android:imeSubtypeLocale="bg"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian" android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_bulgarian_bds" android:label="@string/subtype_bulgarian_bds"
android:subtypeId="0x5f51ba9a" android:subtypeId="0x5f51ba9a"
android:imeSubtypeLocale="bg" android:imeSubtypeLocale="bg"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds" android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xd2e520d5" android:subtypeId="0xd2e520d5"
android:imeSubtypeLocale="ca" android:imeSubtypeLocale="ca"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x2d3d2ed0" android:subtypeId="0x2d3d2ed0"
android:imeSubtypeLocale="cs" android:imeSubtypeLocale="cs"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x2df4605d" android:subtypeId="0x2df4605d"
android:imeSubtypeLocale="da" android:imeSubtypeLocale="da"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x2e2cbe61" android:subtypeId="0x2e2cbe61"
android:imeSubtypeLocale="de" android:imeSubtypeLocale="de"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x0e7802d3" android:subtypeId="0x0e7802d3"
android:imeSubtypeLocale="el" android:imeSubtypeLocale="el"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=greek" android:imeSubtypeExtraValue="KeyboardLayoutSet=greek,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x4090554a" android:subtypeId="0x4090554a"
android:imeSubtypeLocale="eo" android:imeSubtypeLocale="eo"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x30a6e00e" android:subtypeId="0x30a6e00e"
android:imeSubtypeLocale="es" android:imeSubtypeLocale="es"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_es_US" android:label="@string/subtype_es_US"
android:subtypeId="0x84d2efc6" android:subtypeId="0x84d2efc6"
android:imeSubtypeLocale="es_US" android:imeSubtypeLocale="es_US"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
/> />
<!-- <!--
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
@ -212,7 +212,7 @@
android:subtypeId="0x623f9286" android:subtypeId="0x623f9286"
android:imeSubtypeLocale="es_419" android:imeSubtypeLocale="es_419"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
/> />
--> -->
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
@ -220,63 +220,63 @@
android:subtypeId="0xec2d3955" android:subtypeId="0xec2d3955"
android:imeSubtypeLocale="et" android:imeSubtypeLocale="et"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xbe66c254" android:subtypeId="0xbe66c254"
android:imeSubtypeLocale="fa" android:imeSubtypeLocale="fa"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=farsi" android:imeSubtypeExtraValue="KeyboardLayoutSet=farsi,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x31cecda3" android:subtypeId="0x31cecda3"
android:imeSubtypeLocale="fi" android:imeSubtypeLocale="fi"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x324da12c" android:subtypeId="0x324da12c"
android:imeSubtypeLocale="fr" android:imeSubtypeLocale="fr"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xeadbb691" android:subtypeId="0xeadbb691"
android:imeSubtypeLocale="fr_CA" android:imeSubtypeLocale="fr_CA"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x39753b7f" android:subtypeId="0x39753b7f"
android:imeSubtypeLocale="hi" android:imeSubtypeLocale="hi"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi" android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x35b7526a" android:subtypeId="0x35b7526a"
android:imeSubtypeLocale="hr" android:imeSubtypeLocale="hr"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x35e198ed" android:subtypeId="0x35e198ed"
android:imeSubtypeLocale="hu" android:imeSubtypeLocale="hu"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xe39ac3ca" android:subtypeId="0xe39ac3ca"
android:imeSubtypeLocale="hy" android:imeSubtypeLocale="hy"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=armenian_phonetic" android:imeSubtypeExtraValue="KeyboardLayoutSet=armenian_phonetic,EmojiCapable"
/> />
<!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. --> <!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. -->
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
@ -284,21 +284,21 @@
android:subtypeId="0x7daea460" android:subtypeId="0x7daea460"
android:imeSubtypeLocale="in" android:imeSubtypeLocale="in"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x7df519e5" android:subtypeId="0x7df519e5"
android:imeSubtypeLocale="is" android:imeSubtypeLocale="is"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x37885a0b" android:subtypeId="0x37885a0b"
android:imeSubtypeLocale="it" android:imeSubtypeLocale="it"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. --> <!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. -->
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
@ -306,14 +306,14 @@
android:subtypeId="0x66fb18bd" android:subtypeId="0x66fb18bd"
android:imeSubtypeLocale="iw" android:imeSubtypeLocale="iw"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x6e119e6a" android:subtypeId="0x6e119e6a"
android:imeSubtypeLocale="ka" android:imeSubtypeLocale="ka"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian" android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian,EmojiCapable"
/> />
<!-- <!--
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
@ -321,7 +321,7 @@
android:subtypeId="0x2d73d2f6" android:subtypeId="0x2d73d2f6"
android:imeSubtypeLocale="kk" android:imeSubtypeLocale="kk"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
/> />
--> -->
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
@ -329,140 +329,140 @@
android:subtypeId="0x2e391c04" android:subtypeId="0x2e391c04"
android:imeSubtypeLocale="ky" android:imeSubtypeLocale="ky"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x8315772c" android:subtypeId="0x8315772c"
android:imeSubtypeLocale="lo" android:imeSubtypeLocale="lo"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=lao" android:imeSubtypeExtraValue="KeyboardLayoutSet=lao,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x8321bb43" android:subtypeId="0x8321bb43"
android:imeSubtypeLocale="lt" android:imeSubtypeLocale="lt"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x833dea45" android:subtypeId="0x833dea45"
android:imeSubtypeLocale="lv" android:imeSubtypeLocale="lv"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xaf50ab7c" android:subtypeId="0xaf50ab7c"
android:imeSubtypeLocale="mk" android:imeSubtypeLocale="mk"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic" android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xcdcfc3ab" android:subtypeId="0xcdcfc3ab"
android:imeSubtypeLocale="mn" android:imeSubtypeLocale="mn"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian" android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x84c87c61" android:subtypeId="0x84c87c61"
android:imeSubtypeLocale="ms" android:imeSubtypeLocale="ms"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x3f12ee14" android:subtypeId="0x3f12ee14"
android:imeSubtypeLocale="nb" android:imeSubtypeLocale="nb"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xd80a4cee" android:subtypeId="0xd80a4cee"
android:imeSubtypeLocale="ne" android:imeSubtypeLocale="ne"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_romanized" android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_romanized,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_nepali_traditional" android:label="@string/subtype_nepali_traditional"
android:subtypeId="0x5fafea88" android:subtypeId="0x5fafea88"
android:imeSubtypeLocale="ne" android:imeSubtypeLocale="ne"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_traditional" android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_traditional,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x3f9fd91e" android:subtypeId="0x3f9fd91e"
android:imeSubtypeLocale="nl" android:imeSubtypeLocale="nl"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x500ca92c" android:subtypeId="0x500ca92c"
android:imeSubtypeLocale="nl_BE" android:imeSubtypeLocale="nl_BE"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=azerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=azerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x43098a5c" android:subtypeId="0x43098a5c"
android:imeSubtypeLocale="pl" android:imeSubtypeLocale="pl"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xcafff4a6" android:subtypeId="0xcafff4a6"
android:imeSubtypeLocale="pt_BR" android:imeSubtypeLocale="pt_BR"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xe2fffc5a" android:subtypeId="0xe2fffc5a"
android:imeSubtypeLocale="pt_PT" android:imeSubtypeLocale="pt_PT"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x8d185978" android:subtypeId="0x8d185978"
android:imeSubtypeLocale="ro" android:imeSubtypeLocale="ro"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x763a8752" android:subtypeId="0x763a8752"
android:imeSubtypeLocale="ru" android:imeSubtypeLocale="ru"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x8e94d413" android:subtypeId="0x8e94d413"
android:imeSubtypeLocale="sk" android:imeSubtypeLocale="sk"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x8ea2eb94" android:subtypeId="0x8ea2eb94"
android:imeSubtypeLocale="sl" android:imeSubtypeLocale="sl"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x77c5196e" android:subtypeId="0x77c5196e"
android:imeSubtypeLocale="sr" android:imeSubtypeLocale="sr"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
/> />
<!-- TODO: Uncomment once we can handle IETF language tag with script name specified. <!-- TODO: Uncomment once we can handle IETF language tag with script name specified.
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
@ -470,14 +470,14 @@
android:subtypeId="0xXXXXXXXX" android:subtypeId="0xXXXXXXXX"
android:imeSubtypeLocale="sr" android:imeSubtypeLocale="sr"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="SupportTouchPositionCorrection" android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_serbian_latin" android:label="@string/subtype_serbian_latin"
android:subtypeId="0xXXXXXXXX" android:subtypeId="0xXXXXXXXX"
android:imeSubtypeLocale="sr-Latn" android:imeSubtypeLocale="sr-Latn"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
--> -->
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
@ -485,63 +485,63 @@
android:subtypeId="0x48b4ff43" android:subtypeId="0x48b4ff43"
android:imeSubtypeLocale="sv" android:imeSubtypeLocale="sv"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x8f3dee1f" android:subtypeId="0x8f3dee1f"
android:imeSubtypeLocale="sw" android:imeSubtypeLocale="sw"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x1f94d5d4" android:subtypeId="0x1f94d5d4"
android:imeSubtypeLocale="th" android:imeSubtypeLocale="th"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=thai" android:imeSubtypeExtraValue="KeyboardLayoutSet=thai,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0xf08285ef" android:subtypeId="0xf08285ef"
android:imeSubtypeLocale="tl" android:imeSubtypeLocale="tl"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x4a3179de" android:subtypeId="0x4a3179de"
android:imeSubtypeLocale="tr" android:imeSubtypeLocale="tr"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x3e84492c" android:subtypeId="0x3e84492c"
android:imeSubtypeLocale="uk" android:imeSubtypeLocale="uk"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x93972eee" android:subtypeId="0x93972eee"
android:imeSubtypeLocale="vi" android:imeSubtypeLocale="vi"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_generic" android:label="@string/subtype_generic"
android:subtypeId="0x9b13ab76" android:subtypeId="0x9b13ab76"
android:imeSubtypeLocale="zu" android:imeSubtypeLocale="zu"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
/> />
<subtype android:icon="@drawable/ic_subtype_keyboard" <subtype android:icon="@drawable/ic_subtype_keyboard"
android:label="@string/subtype_no_language_qwerty" android:label="@string/subtype_no_language_qwerty"
android:subtypeId="0xa239ebad" android:subtypeId="0xa239ebad"
android:imeSubtypeLocale="zz" android:imeSubtypeLocale="zz"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable,EmojiCapable"
/> />
<!-- Emoji subtype has to be an addtional subtype added at boot time because ICS doesn't <!-- Emoji subtype has to be an addtional subtype added at boot time because ICS doesn't
support Emoji. --> support Emoji. -->
@ -551,7 +551,7 @@
android:subtypeId="0xc14d88b2" android:subtypeId="0xc14d88b2"
android:imeSubtypeLocale="zz" android:imeSubtypeLocale="zz"
android:imeSubtypeMode="keyboard" android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=emoji" android:imeSubtypeExtraValue="KeyboardLayoutSet=emoji,EmojiCapable"
/> />
--> -->
</input-method> </input-method>

5
java/src/com/android/inputmethod/latin/Constants.java
View File

@ -75,6 +75,11 @@ public final class Constants {
*/ */
public static final String ASCII_CAPABLE = "AsciiCapable"; public static final String ASCII_CAPABLE = "AsciiCapable";
/**
* The subtype extra value used to indicate that the subtype keyboard layout is capable
* for typing EMOJI characters.
*/
public static final String EMOJI_CAPABLE = "EmojiCapable";
/** /**
* The subtype extra value used to indicate that the subtype require network connection * The subtype extra value used to indicate that the subtype require network connection
* to work. * to work.

13
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
View File

@ -59,16 +59,19 @@ public final class SubtypeSwitcher {
// Dummy no language QWERTY subtype. See {@link R.xml.method}. // Dummy no language QWERTY subtype. See {@link R.xml.method}.
private static final InputMethodSubtype DUMMY_NO_LANGUAGE_SUBTYPE = new InputMethodSubtype( private static final InputMethodSubtype DUMMY_NO_LANGUAGE_SUBTYPE = new InputMethodSubtype(
R.string.subtype_no_language_qwerty, R.drawable.ic_subtype_keyboard, R.string.subtype_no_language_qwerty, R.drawable.ic_subtype_keyboard,
SubtypeLocaleUtils.NO_LANGUAGE, "keyboard", SubtypeLocaleUtils.NO_LANGUAGE, "keyboard", "KeyboardLayoutSet="
"KeyboardLayoutSet=" + SubtypeLocaleUtils.QWERTY + SubtypeLocaleUtils.QWERTY
+ ",AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable", + "," + Constants.Subtype.ExtraValue.ASCII_CAPABLE
+ ",EnabledWhenDefaultIsNotAsciiCapable,"
+ Constants.Subtype.ExtraValue.EMOJI_CAPABLE,
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */); false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */);
// Caveat: We probably should remove this when we add an Emoji subtype in {@link R.xml.method}. // Caveat: We probably should remove this when we add an Emoji subtype in {@link R.xml.method}.
// Dummy Emoji subtype. See {@link R.xml.method}. // Dummy Emoji subtype. See {@link R.xml.method}.
private static final InputMethodSubtype DUMMY_EMOJI_SUBTYPE = new InputMethodSubtype( private static final InputMethodSubtype DUMMY_EMOJI_SUBTYPE = new InputMethodSubtype(
R.string.subtype_emoji, R.drawable.ic_subtype_keyboard, R.string.subtype_emoji, R.drawable.ic_subtype_keyboard,
SubtypeLocaleUtils.NO_LANGUAGE, "keyboard", SubtypeLocaleUtils.NO_LANGUAGE, "keyboard", "KeyboardLayoutSet="
"KeyboardLayoutSet=" + SubtypeLocaleUtils.EMOJI, + SubtypeLocaleUtils.EMOJI + ","
+ Constants.Subtype.ExtraValue.EMOJI_CAPABLE,
false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */); false /* isAuxiliary */, false /* overridesImplicitlyEnabledSubtype */);
static final class NeedsToDisplayLanguage { static final class NeedsToDisplayLanguage {

6
java/src/com/android/inputmethod/latin/utils/AdditionalSubtypeUtils.java
View File

@ -25,6 +25,7 @@ import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.InputMethodSubtype;
import com.android.inputmethod.latin.Constants;
import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.R;
import java.util.ArrayList; import java.util.ArrayList;
@ -61,8 +62,9 @@ public final class AdditionalSubtypeUtils {
IS_ADDITIONAL_SUBTYPE, layoutDisplayNameExtraValue); IS_ADDITIONAL_SUBTYPE, layoutDisplayNameExtraValue);
final int nameId = SubtypeLocaleUtils.getSubtypeNameId(localeString, keyboardLayoutSetName); final int nameId = SubtypeLocaleUtils.getSubtypeNameId(localeString, keyboardLayoutSetName);
return new InputMethodSubtype(nameId, R.drawable.ic_subtype_keyboard, return new InputMethodSubtype(nameId, R.drawable.ic_subtype_keyboard,
localeString, KEYBOARD_MODE, localeString, KEYBOARD_MODE, layoutExtraValue + "," + additionalSubtypeExtraValue
layoutExtraValue + "," + additionalSubtypeExtraValue, false, false); + "," + Constants.Subtype.ExtraValue.ASCII_CAPABLE
+ "," + Constants.Subtype.ExtraValue.EMOJI_CAPABLE, false, false);
} }
public static String getPrefSubtype(final InputMethodSubtype subtype) { public static String getPrefSubtype(final InputMethodSubtype subtype) {