diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-09-12 22:54:18 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 22:54:18 -0700 |
| commit | bebef28250d6df26e441d28890dd391a99278dd8 (patch) | |
| tree | ab37fb8c93f53052787731bf730c7076533b490d /java/src | |
| parent | 6af8936bec9e45ea52b7d0507c88a4a76d40d4a1 (diff) | |
| parent | e3a38af5067551d8e6e1158c4bd3aa1ca3fe3436 (diff) | |
| download | latinime-bebef28250d6df26e441d28890dd391a99278dd8.tar.gz latinime-bebef28250d6df26e441d28890dd391a99278dd8.tar.xz latinime-bebef28250d6df26e441d28890dd391a99278dd8.zip | |
am e3a38af5: Merge "Fix emoji tabs"
* commit 'e3a38af5067551d8e6e1158c4bd3aa1ca3fe3436':
Fix emoji tabs
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java index 437ba1812..6c6370490 100644 --- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java @@ -125,7 +125,7 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange mShownCategories.add(CATEGORY_NATURE); mShownCategories.add(CATEGORY_PLACES); // TODO: Restore last saved category - mCurrentCategory = CATEGORY_PLACES; + mCurrentCategory = CATEGORY_PEOPLE; } else { // TODO: Restore last saved category mCurrentCategory = CATEGORY_SYMBOLS; @@ -156,7 +156,7 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange public int getCurrentCategory() { // TODO: Record current category. - return CATEGORY_PEOPLE; + return mCurrentCategory; } public void setCurrentCategory(int category) { |