Merge "Accept whitelisted entries from any source." into jb-mr1-dev

                    wordComposerForLookup, prevWordForBigram, proximityInfo));

        }

        final CharSequence whitelistedWord =

        final CharSequence whitelistedWordFromWhitelistDictionary =

                mWhiteListDictionary.getWhitelistedWord(consideredWord);

        if (whitelistedWord != null) {

        if (whitelistedWordFromWhitelistDictionary != null) {

            // MAX_SCORE ensures this will be considered strong enough to be auto-corrected

            suggestionsSet.add(new SuggestedWordInfo(whitelistedWord,

            suggestionsSet.add(new SuggestedWordInfo(whitelistedWordFromWhitelistDictionary,

                    SuggestedWordInfo.MAX_SCORE, SuggestedWordInfo.KIND_WHITELIST,

                    Dictionary.TYPE_WHITELIST));

        }

        final CharSequence whitelistedWord;

        if (suggestionsSet.isEmpty()) {

            whitelistedWord = null;

        } else if (SuggestedWordInfo.KIND_WHITELIST != suggestionsSet.first().mKind) {

            whitelistedWord = null;

        } else {

            whitelistedWord = suggestionsSet.first().mWord;

        }

        // TODO: Change this scheme - a boolean is not enough. A whitelisted word may be "valid"

        // but still autocorrected from - in the case the whitelist only capitalizes the word.

        // The whitelist should be case-insensitive, so it's not possible to be consistent with