diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-28 00:46:01 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-28 00:46:01 -0700 |
| commit | b49dba68186cd7f4689c82fb601ac4dba1996c1c (patch) | |
| tree | 9450e5b5ec62f7550ab607e4884f992d3250382b /java/res | |
| parent | 472d038a5ec0ad5841d9f444493a0db81647bc48 (diff) | |
| parent | c0f81463cb9e60df0289ac8012cbe632dcdfc487 (diff) | |
| download | latinime-b49dba68186cd7f4689c82fb601ac4dba1996c1c.tar.gz latinime-b49dba68186cd7f4689c82fb601ac4dba1996c1c.tar.xz latinime-b49dba68186cd7f4689c82fb601ac4dba1996c1c.zip | |
am c0f81463: Merge "Add dummy Emoji subtype"
* commit 'c0f81463cb9e60df0289ac8012cbe632dcdfc487':
Add dummy Emoji subtype
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 390f72bfa..828ad6d53 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -457,6 +457,8 @@ language among those that use the Latin alphabet. This keyboard is laid out in t disposition that offers additional keys, but smaller keys compared to other common dispositions for mobile devices. [CHAR LIMIT=25] --> <string name="subtype_no_language_pcqwerty">Alphabet (PC)</string> + <!-- Description for Emoji keyboard subtype [CHAR LIMIT=25] --> + <string name="subtype_emoji">Emoji</string> <!-- Title of the preference settings for custom input styles (language and keyboard layout pairs) [CHAR LIMIT=35]--> <string name="custom_input_styles_title">Custom input styles</string> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 2c3ac57ed..689b270a8 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -80,6 +80,7 @@ vi: Vietnamese/qwerty zu: Zulu/qwerty zz: QWERTY/qwerty + (zz: Emoji/emoji) --> <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> <!-- Note: SupportTouchPositionCorrection extra value is obsolete and maintained for backward @@ -510,4 +511,15 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable" /> + <!-- Emoji subtype has to be an addtional subtype added at boot time because ICS doesn't + support Emoji. --> + <!-- + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_emoji" + android:subtypeId="0xc14d88b2" + android:imeSubtypeLocale="zz" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=emoji" + /> + --> </input-method> |