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

Commit ed83d4b1 authored by Jean Chalard's avatar Jean Chalard
Browse files

Stop special-casing a single suggestion (A6)

Treat it like the others

Change-Id: Ic24e40ada0e75773c3ece9470ab61c350697be5d
parent 251bb70f
Loading
Loading
Loading
Loading
+12 −13
Original line number Diff line number Diff line
@@ -221,17 +221,6 @@ public class Suggest {
            }
        }

        final ArrayList<SuggestedWordInfo> suggestionsContainer =
                new ArrayList<SuggestedWordInfo>(suggestionsSet);
        for (int i = 0; i < suggestionsContainer.size(); ++i) {
            final SuggestedWordInfo wordInfo = suggestionsContainer.get(i);
            final SuggestedWordInfo transformedWordInfo = getTransformedSuggestedWordInfo(wordInfo,
                    mLocale, isAllUpperCase, isFirstCharCapitalized, trailingSingleQuotesCount);
            suggestionsContainer.set(i, transformedWordInfo);
            LatinImeLogger.onAddSuggestedWord(transformedWordInfo.mWord.toString(),
                    transformedWordInfo.mSourceDict);
        }

        final CharSequence whitelistedWord =
                mWhiteListDictionary.getWhitelistedWord(consideredWord);

@@ -253,8 +242,18 @@ public class Suggest {
            whitelistSuggestion = new SuggestedWordInfo(whitelistedWord,
                    SuggestedWordInfo.MAX_SCORE, SuggestedWordInfo.KIND_WHITELIST,
                    Dictionary.TYPE_WHITELIST);
            suggestionsContainer.add(0, getTransformedSuggestedWordInfo(whitelistSuggestion,
                    mLocale, isAllUpperCase, isFirstCharCapitalized, trailingSingleQuotesCount));
            suggestionsSet.add(whitelistSuggestion);
        }

        final ArrayList<SuggestedWordInfo> suggestionsContainer =
                new ArrayList<SuggestedWordInfo>(suggestionsSet);
        for (int i = 0; i < suggestionsContainer.size(); ++i) {
            final SuggestedWordInfo wordInfo = suggestionsContainer.get(i);
            final SuggestedWordInfo transformedWordInfo = getTransformedSuggestedWordInfo(wordInfo,
                    mLocale, isAllUpperCase, isFirstCharCapitalized, trailingSingleQuotesCount);
            suggestionsContainer.set(i, transformedWordInfo);
            LatinImeLogger.onAddSuggestedWord(transformedWordInfo.mWord.toString(),
                    transformedWordInfo.mSourceDict);
        }

        if (!isPrediction) {