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

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

Enhance behavior consistency (A84) 

Use the word the same way for suggestion and prediction. It makes
little logical sense that the trailing single quotes be removed
for suggestion lookup but not for prediction lookup.

Change-Id: I0de4b5f7c5b4c1b4ba1817ff9653d7c03967146d
parent 1c6693a2

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

+12 −11
Original line number Diff line number Diff line
@@ -174,15 +174,6 @@ public class Suggest { 
                : typedWord;

        LatinImeLogger.onAddSuggestedWord(typedWord, Dictionary.TYPE_USER_TYPED);



        if (wordComposer.size() <= 1) {

            // At first character typed, search only the bigrams

            if (!TextUtils.isEmpty(prevWordForBigram)) {

                for (final String key : mDictionaries.keySet()) {

                    final Dictionary dictionary = mDictionaries.get(key);

                    suggestionsSet.addAll(dictionary.getBigrams(wordComposer, prevWordForBigram));

                }

            }

        } else {

        final WordComposer wordComposerForLookup;

        if (trailingSingleQuotesCount > 0) {

            wordComposerForLookup = new WordComposer(wordComposer);
@@ -192,6 +183,16 @@ public class Suggest { 
        } else {

            wordComposerForLookup = wordComposer;

        }

        if (wordComposerForLookup.size() <= 1) {

            // At first character typed, search only the bigrams

            if (!TextUtils.isEmpty(prevWordForBigram)) {

                for (final String key : mDictionaries.keySet()) {

                    final Dictionary dictionary = mDictionaries.get(key);

                    suggestionsSet.addAll(dictionary.getBigrams(wordComposerForLookup,

                            prevWordForBigram));

                }

            }

        } else {

            // At second character typed, search the unigrams (scores being affected by bigrams)

            for (final String key : mDictionaries.keySet()) {

                final Dictionary dictionary = mDictionaries.get(key);