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

Commit 5e0545d6 authored by Jean Chalard's avatar Jean Chalard
Browse files

Remove a duplicate processing (A5) 

This filtering is already done in native code. It's useless (and
costly) to do it again here.

Change-Id: Ide6794d7a8682a881f097f33e222f10d30f297bd
parent fac8a16c

java/src/com/android/inputmethod/latin/Suggest.java

+4 −25
Original line number Diff line number Diff line
@@ -273,33 +273,12 @@ public class Suggest implements Dictionary.WordCallback { 


            if (!TextUtils.isEmpty(prevWordForBigram)) {

                getAllBigrams(prevWordForBigram, wordComposer);

                if (TextUtils.isEmpty(consideredWord)) {

                // Nothing entered: return all bigrams for the previous word

                int insertCount = Math.min(mBigramSuggestions.size(), MAX_SUGGESTIONS);

                for (int i = 0; i < insertCount; ++i) {

                    addBigramToSuggestions(mBigramSuggestions.get(i));

                }

                } else {

                    // Word entered: return only bigrams that match the first char of the typed word

                    final char currentChar = consideredWord.charAt(0);

                    // TODO: Must pay attention to locale when changing case.

                    // TODO: Use codepoint instead of char

                    final char currentCharUpper = Character.toUpperCase(currentChar);

                    int count = 0;

                    final int bigramSuggestionSize = mBigramSuggestions.size();

                    for (int i = 0; i < bigramSuggestionSize; i++) {

                        final SuggestedWordInfo bigramSuggestion = mBigramSuggestions.get(i);

                        final char bigramSuggestionFirstChar =

                                (char)bigramSuggestion.codePointAt(0);

                        if (bigramSuggestionFirstChar == currentChar

                                || bigramSuggestionFirstChar == currentCharUpper) {

                            addBigramToSuggestions(bigramSuggestion);

                            if (++count > MAX_SUGGESTIONS) break;

                        }

            }

                }

            }



        } else if (wordComposer.size() > 1) {

            final WordComposer wordComposerForLookup;

            if (mTrailingSingleQuotesCount > 0) {