commit bebef28250d6df26e441d28890dd391a99278dd8
author Satoshi Kataoka <satok@google.com> Thu Sep 12 22:54:18 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 12 22:54:18 2013 -0700
tree ab37fb8c93f53052787731bf730c7076533b490d
parent 6af8936bec9e45ea52b7d0507c88a4a76d40d4a1
parent e3a38af5067551d8e6e1158c4bd3aa1ca3fe3436

am e3a38af5: Merge "Fix emoji tabs"

* commit 'e3a38af5067551d8e6e1158c4bd3aa1ca3fe3436':
  Fix emoji tabs

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 437ba18..6c63704 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
@@ -125,7 +125,7 @@
                 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 int getCurrentCategory() {
             // TODO: Record current category.
-            return CATEGORY_PEOPLE;
+            return mCurrentCategory;
         }
 
         public void setCurrentCategory(int category) {