aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-09-17 00:47:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-17 00:47:33 -0700
commit55fd8c23ae49ec719f53de474ea928ae95e76fb6 (patch)
tree21198f1f4bdd4d5cc0f48f2b2144d11a74f63809 /java/src
parent8f7471d986fb52ab73b52b8c8c112e09852cf3a1 (diff)
parentd2cafb03050dfd6239e56f5e4a844931aa0faa79 (diff)
downloadlatinime-55fd8c23ae49ec719f53de474ea928ae95e76fb6.tar.gz
latinime-55fd8c23ae49ec719f53de474ea928ae95e76fb6.tar.xz
latinime-55fd8c23ae49ec719f53de474ea928ae95e76fb6.zip
am d2cafb03: Merge "Temporary disable saving keys of emoticons to recents"
* commit 'd2cafb03050dfd6239e56f5e4a844931aa0faa79': Temporary disable saving keys of emoticons to recents
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
index 546fa8140..702ed2075 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
@@ -505,7 +505,10 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
@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) {