diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-08-26 12:27:38 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2013-08-26 12:48:07 +0900 |
| commit | 68b990e7ce2b87a6f83cc4fedec7b1cc26ced60c (patch) | |
| tree | 83831078fba85136bbc3502cd7a8ac75af25c6ec /java | |
| parent | 73c2948113e27cf3945033049f098a1f5b060338 (diff) | |
| download | latinime-68b990e7ce2b87a6f83cc4fedec7b1cc26ced60c.tar.gz latinime-68b990e7ce2b87a6f83cc4fedec7b1cc26ced60c.tar.xz latinime-68b990e7ce2b87a6f83cc4fedec7b1cc26ced60c.zip | |
Add emoji keyboard element ids
Bug: 6370846
Change-Id: I0ac55bc06e1527bafad395f4a2b5059e1fed4b5d
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/attrs.xml | 14 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardId.java | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 3512686d0..4c5097654 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -373,6 +373,13 @@ <enum name="phone" value="7" /> <enum name="phoneSymbols" value="8" /> <enum name="number" value="9" /> + <enum name="emojiRecents" value="10" /> + <enum name="emojiCategory1" value="11" /> + <enum name="emojiCategory2" value="12" /> + <enum name="emojiCategory3" value="13" /> + <enum name="emojiCategory4" value="14" /> + <enum name="emojiCategory5" value="15" /> + <enum name="emojiCategory6" value="16" /> </attr> <!-- This should be aligned with KeyboardId.MODE_* --> <attr name="mode" format="enum|string"> @@ -427,6 +434,13 @@ <enum name="phone" value="7" /> <enum name="phoneSymbols" value="8" /> <enum name="number" value="9" /> + <enum name="emojiRecents" value="10" /> + <enum name="emojiCategory1" value="11" /> + <enum name="emojiCategory2" value="12" /> + <enum name="emojiCategory3" value="13" /> + <enum name="emojiCategory4" value="14" /> + <enum name="emojiCategory5" value="15" /> + <enum name="emojiCategory6" value="16" /> </attr> <attr name="elementKeyboard" format="reference"/> <!-- Enable proximity characters correction. Disabled by default. --> diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardId.java b/java/src/com/android/inputmethod/keyboard/KeyboardId.java index 08ce064e0..53748bb58 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardId.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardId.java @@ -53,6 +53,13 @@ public final class KeyboardId { public static final int ELEMENT_PHONE = 7; public static final int ELEMENT_PHONE_SYMBOLS = 8; public static final int ELEMENT_NUMBER = 9; + public static final int ELEMENT_EMOJI_RECENTS = 10; + public static final int ELEMENT_EMOJI_CATEGORY1 = 11; + public static final int ELEMENT_EMOJI_CATEGORY2 = 12; + public static final int ELEMENT_EMOJI_CATEGORY3 = 13; + public static final int ELEMENT_EMOJI_CATEGORY4 = 14; + public static final int ELEMENT_EMOJI_CATEGORY5 = 15; + public static final int ELEMENT_EMOJI_CATEGORY6 = 16; public final InputMethodSubtype mSubtype; public final Locale mLocale; @@ -215,6 +222,13 @@ public final class KeyboardId { case ELEMENT_PHONE: return "phone"; case ELEMENT_PHONE_SYMBOLS: return "phoneSymbols"; case ELEMENT_NUMBER: return "number"; + case ELEMENT_EMOJI_RECENTS: return "emojiRecents"; + case ELEMENT_EMOJI_CATEGORY1: return "emojiCategory1"; + case ELEMENT_EMOJI_CATEGORY2: return "emojiCategory2"; + case ELEMENT_EMOJI_CATEGORY3: return "emojiCategory3"; + case ELEMENT_EMOJI_CATEGORY4: return "emojiCategory4"; + case ELEMENT_EMOJI_CATEGORY5: return "emojiCategory5"; + case ELEMENT_EMOJI_CATEGORY6: return "emojiCategory6"; default: return null; } } |