Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1cd4006 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Android Git Automerger
Browse files

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

* commit '28e65858':
  Do not start in recents tab if we do not have recent emojis
parents 1194ad63 28e65858

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

+14 −7
Original line number Diff line number Diff line
@@ -120,22 +120,29 @@ final class EmojiCategory { 
            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) {