commit 55fd8c23ae49ec719f53de474ea928ae95e76fb6
author Satoshi Kataoka <satok@google.com> Tue Sep 17 00:47:33 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 17 00:47:33 2013 -0700
tree 21198f1f4bdd4d5cc0f48f2b2144d11a74f63809
parent 8f7471d986fb52ab73b52b8c8c112e09852cf3a1
parent d2cafb03050dfd6239e56f5e4a844931aa0faa79

am d2cafb03: Merge "Temporary disable saving keys of emoticons to recents"

* commit 'd2cafb03050dfd6239e56f5e4a844931aa0faa79':
  Temporary disable saving keys of emoticons to recents

java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
index 546fa81..702ed20 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
@@ -505,7 +505,10 @@
 
     @Override
     public void onKeyClick(final Key key) {
-        mEmojiKeyboardAdapter.addRecentKey(key);
+        // TODO: Save emoticons to recents
+        if (mEmojiCategory.getCurrentCategoryId() != CATEGORY_ID_EMOTICONS) {
+            mEmojiKeyboardAdapter.addRecentKey(key);
+        }
         mEmojiCategory.saveLastTypedCategoryPage();
         final int code = key.getCode();
         if (code == Constants.CODE_OUTPUT_TEXT) {