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

Commit 2df6374f authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Fix: too many calls to getSuggestedWordsForTypingInput"

parents 93c1efb3 7aa895e2

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

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.inputmethod.latin; 


import android.text.TextUtils;



import com.android.inputmethod.event.Event;

import com.android.inputmethod.keyboard.ProximityInfo;

import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo;

import com.android.inputmethod.latin.define.ProductionFlag;

java/src/com/android/inputmethod/latin/inputlogic/InputLogic.java

+6 −3
Original line number Diff line number Diff line
@@ -805,10 +805,11 @@ public final class InputLogic { 
        final int codePoint = inputTransaction.mEvent.mCodePoint;

        final SettingsValues settingsValues = inputTransaction.mSettingsValues;

        boolean didAutoCorrect = false;

        final boolean wasComposingWord = mWordComposer.isComposingWord();

        // We avoid sending spaces in languages without spaces if we were composing.

        final boolean shouldAvoidSendingCode = Constants.CODE_SPACE == codePoint

                && !settingsValues.mSpacingAndPunctuations.mCurrentLanguageHasSpaces

                && mWordComposer.isComposingWord();

                && wasComposingWord;

        if (mWordComposer.isCursorFrontOrMiddleOfComposingWord()) {

            // If we are in the middle of a recorrection, we need to commit the recorrection

            // first so that we can insert the separator at the current cursor position.
@@ -852,7 +853,7 @@ public final class InputLogic { 
            promotePhantomSpace(settingsValues);

        }

        if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {

            ResearchLogger.latinIME_handleSeparator(codePoint, mWordComposer.isComposingWord());

            ResearchLogger.latinIME_handleSeparator(codePoint, wasComposingWord);

        }



        if (!shouldAvoidSendingCode) {
@@ -868,7 +869,9 @@ public final class InputLogic { 
            }



            startDoubleSpacePeriodCountdown(inputTransaction);

            if (wasComposingWord) {

                inputTransaction.setRequiresUpdateSuggestions();

            }

        } else {

            if (swapWeakSpace) {

                swapSwapperAndSpace(inputTransaction);