aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-08-25 22:44:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-25 22:44:42 -0700
commit9c2fef79edff5779f4c321a0e6339f8efa006201 (patch)
tree5b56770b6fcfa4c2e1c0199b7eb18acfdccd5441 /java/src
parent95565899ab0aed31c449b46cb45708cf4b25f35a (diff)
parent7308c36a55b6fe2b10dc3979d068775920a40890 (diff)
downloadlatinime-9c2fef79edff5779f4c321a0e6339f8efa006201.tar.gz
latinime-9c2fef79edff5779f4c321a0e6339f8efa006201.tar.xz
latinime-9c2fef79edff5779f4c321a0e6339f8efa006201.zip
am 7308c36a: Merge "Add emoji keyboard element ids"
* commit '7308c36a55b6fe2b10dc3979d068775920a40890': Add emoji keyboard element ids
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardId.java14
1 files changed, 14 insertions, 0 deletions
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;
}
}