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

* commit 'd2cafb03050dfd6239e56f5e4a844931aa0faa79':
  Temporary disable saving keys of emoticons to recents
This commit is contained in:
Satoshi Kataoka 2013-09-17 00:47:33 -07:00 committed by Android Git Automerger
commit 55fd8c23ae

View file

@ -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) {