aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-09-13 05:50:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-13 05:50:47 +0000
commite3a38af5067551d8e6e1158c4bd3aa1ca3fe3436 (patch)
tree8740821518de6b090c58b64550f7984823727412 /java/src
parentebe3b3e8fd7b7a6ecbffa7088a36c60bfef8807a (diff)
parent12ff349f2906f9183691856eef627e0cb794c106 (diff)
downloadlatinime-e3a38af5067551d8e6e1158c4bd3aa1ca3fe3436.tar.gz
latinime-e3a38af5067551d8e6e1158c4bd3aa1ca3fe3436.tar.xz
latinime-e3a38af5067551d8e6e1158c4bd3aa1ca3fe3436.zip
Merge "Fix emoji tabs"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java4
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) {