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

am 7308c36a: Merge "Add emoji keyboard element ids" 

* commit '7308c36a55b6fe2b10dc3979d068775920a40890':
  Add emoji keyboard element ids
main
Tadashi G. Takaoka 2013-08-25 22:44:42 -07:00 committed by Android Git Automerger
parent 95565899ab 7308c36a55
commit 9c2fef79ed
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/res/values/attrs.xml
View File

@ -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. -->

14
java/src/com/android/inputmethod/keyboard/KeyboardId.java
View File

@ -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;
}
}