commit 0b20a8d2bb35a07c0b91b09ce91f7a36fc1d6df2
author Dmitry Torokhov <dtor@google.com> Fri Oct 16 22:02:22 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 16 22:02:22 2015 +0000
tree f69f42875a516126ea37d5f8ad7f4e437a9e4806
parent 51fc864e692406b2e196866999ebce1690f1d4f8
parent b1cd4006027af90db427839b3c477930ab6aee31

am b1cd4006: am 28e65858: Do not start in recents tab if we do not have recent emojis

* commit 'b1cd4006027af90db427839b3c477930ab6aee31':
  Do not start in recents tab if we do not have recent emojis

java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java

diff --git a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
index a9711ae..f2f52f8 100644
--- a/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
+++ b/java/src/com/android/inputmethod/keyboard/emoji/EmojiCategory.java
@@ -120,22 +120,29 @@
             mCategoryTabIconId[i] = emojiPaletteViewAttr.getResourceId(
                     sCategoryTabIconAttr[i], 0);
         }
+
+        int defaultCategoryId = EmojiCategory.ID_SYMBOLS;
         addShownCategoryId(EmojiCategory.ID_RECENTS);
         if (BuildCompatUtils.EFFECTIVE_SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            defaultCategoryId = EmojiCategory.ID_PEOPLE;
             addShownCategoryId(EmojiCategory.ID_PEOPLE);
             addShownCategoryId(EmojiCategory.ID_OBJECTS);
             addShownCategoryId(EmojiCategory.ID_NATURE);
             addShownCategoryId(EmojiCategory.ID_PLACES);
-            mCurrentCategoryId =
-                    Settings.readLastShownEmojiCategoryId(mPrefs, EmojiCategory.ID_PEOPLE);
-        } else {
-            mCurrentCategoryId =
-                    Settings.readLastShownEmojiCategoryId(mPrefs, EmojiCategory.ID_SYMBOLS);
         }
         addShownCategoryId(EmojiCategory.ID_SYMBOLS);
         addShownCategoryId(EmojiCategory.ID_EMOTICONS);
-        getKeyboard(EmojiCategory.ID_RECENTS, 0 /* cagetoryPageId */)
-                .loadRecentKeys(mCategoryKeyboardMap.values());
+
+        DynamicGridKeyboard recentsKbd =
+                getKeyboard(EmojiCategory.ID_RECENTS, 0 /* cagetoryPageId */);
+        recentsKbd.loadRecentKeys(mCategoryKeyboardMap.values());
+
+        mCurrentCategoryId = Settings.readLastShownEmojiCategoryId(mPrefs, defaultCategoryId);
+        if (mCurrentCategoryId == EmojiCategory.ID_RECENTS &&
+                recentsKbd.getSortedKeys().isEmpty()) {
+            Log.i(TAG, "No recent emojis found, starting in category " + mCurrentCategoryId);
+            mCurrentCategoryId = defaultCategoryId;
+        }
     }
 
     private void addShownCategoryId(final int categoryId) {