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

Commit 453711ab authored by Jean Chalard's avatar Jean Chalard
Browse files

Use RichInputConnection to get the previous word. 

We don't need the optimization of storing the old words now
that the RichInputConnection can supply it without IPC.

Bug: 13703802
Change-Id: I37ccb8d5fba879fb04b4f23d33571849736d897c
parent a2a4ee27

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

+6 −25
Original line number Diff line number Diff line
@@ -1374,34 +1374,15 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            callback.onGetSuggestedWords(SuggestedWords.EMPTY);

            return;

        }

        // Get the word on which we should search the bigrams. If we are composing a word, it's

        // whatever is *before* the half-committed word in the buffer, hence 2; if we aren't, we

        // should just skip whitespace if any, so 1.

        final SettingsValues currentSettings = mSettings.getCurrent();

        final int[] additionalFeaturesOptions = currentSettings.mAdditionalFeaturesSettingValues;



        if (DEBUG) {

            if (mInputLogic.mWordComposer.isComposingWord()

                    || mInputLogic.mWordComposer.isBatchMode()) {

                final PrevWordsInfo prevWordsInfo

                        = mInputLogic.mWordComposer.getPrevWordsInfoForSuggestion();

                // TODO: this is for checking consistency with older versions. Remove this when

                // we are confident this is stable.

                // We're checking the previous word in the text field against the memorized previous

                // word. If we are composing a word we should have the second word before the cursor

                // memorized, otherwise we should have the first.

                final PrevWordsInfo rereadPrevWordsInfo =

        mInputLogic.mSuggest.getSuggestedWords(mInputLogic.mWordComposer,

                mInputLogic.getPrevWordsInfoFromNthPreviousWordForSuggestion(

                        currentSettings.mSpacingAndPunctuations,

                                mInputLogic.mWordComposer.isComposingWord() ? 2 : 1);

                if (!TextUtils.equals(prevWordsInfo.mPrevWord, rereadPrevWordsInfo.mPrevWord)) {

                    throw new RuntimeException("Unexpected previous word: "

                            + prevWordsInfo.mPrevWord + " <> " + rereadPrevWordsInfo.mPrevWord);

                }

            }

        }

        mInputLogic.mSuggest.getSuggestedWords(mInputLogic.mWordComposer,

                mInputLogic.mWordComposer.getPrevWordsInfoForSuggestion(),

                        // Get the word on which we should search the bigrams. If we are composing

                        // a word, it's whatever is *before* the half-committed word in the buffer,

                        // hence 2; if we aren't, we should just skip whitespace if any, so 1.

                        mInputLogic.mWordComposer.isComposingWord() ? 2 : 1),

                keyboard.getProximityInfo(), currentSettings.mBlockPotentiallyOffensive,

                currentSettings.mAutoCorrectionEnabled, additionalFeaturesOptions, sessionId,

                sequenceNumber, callback);