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

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

Reduction, step 7 

Change-Id: I177ef2f29c8b6000c5e3d021c016c5d216fe3fc6
parent a3ee0193

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

+9 −5
Original line number Diff line number Diff line
@@ -2034,12 +2034,16 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            return;

        }



        final SuggestedWords.Builder builder;

        if (mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) {

            final CharSequence prevWord = EditingUtils.getThisWord(getCurrentInputConnection(),

                    mSettingsValues.mWordSeparators);

        SuggestedWords.Builder builder = mSuggest.getBigramPredictionWordBuilder(prevWord,

                mCorrectionMode);

            builder = mSuggest.getBigramPredictionWordBuilder(prevWord);

        } else {

            builder = null;

        }



        if (builder.size() > 0) {

        if (null == builder || builder.size() > 0) {

            // Explicitly supply an empty typed word (the no-second-arg version of

            // showSuggestions will retrieve the word near the cursor, we don't want that here)

            showSuggestions(builder.build(), "");

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

+17 −21
Original line number Diff line number Diff line
@@ -261,8 +261,7 @@ public class Suggest implements Dictionary.WordCallback { 
    }



    private static final WordComposer sEmptyWordComposer = new WordComposer();

    public SuggestedWords.Builder getBigramPredictionWordBuilder(CharSequence prevWordForBigram,

            final int correctionMode) {

    public SuggestedWords.Builder getBigramPredictionWordBuilder(CharSequence prevWordForBigram) {

        LatinImeLogger.onStartSuggestion(prevWordForBigram);

        mIsFirstCharCapitalized = false;

        mIsAllUpperCase = false;
@@ -274,13 +273,11 @@ public class Suggest implements Dictionary.WordCallback { 
        LatinImeLogger.onAddSuggestedWord("", Suggest.DIC_USER_TYPED, Dictionary.UNIGRAM);

        mConsideredWord = "";



        // Note that if correctionMode != CORRECTION_FULL_BIGRAM, we'll always return the

        // same empty SuggestedWords.Builder, which has size() == 0

        if (correctionMode == CORRECTION_FULL_BIGRAM) {

            // At first character typed, search only the bigrams

        Arrays.fill(mBigramScores, 0);

        collectGarbage(mBigramSuggestions, PREF_MAX_BIGRAMS);



        // Note that if prevWordForBigram is empty, we'll always return the same empty

        // SuggestedWords.Builder

        if (!TextUtils.isEmpty(prevWordForBigram)) {

            CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase();

            if (mMainDict != null && mMainDict.isValidWord(lowerPrevWord)) {
@@ -295,7 +292,6 @@ public class Suggest implements Dictionary.WordCallback { 
                addBigramToSuggestions(mBigramSuggestions.get(i));

            }

        }

        }



        StringUtils.removeDupes(mSuggestions);