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

Commit 2c01dd00 authored by Jean Chalard's avatar Jean Chalard
Browse files

[IL108] Remove some uses of LatinIME in input logic. 

Access the suggestion strip through the interface instead.

Bug: 8636060
Change-Id: Ia8bd705c230f943e309d677ef683b1a2cbe68036
parent ade1aa55

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

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
    private static final String SCHEME_PACKAGE = "package";



    private final Settings mSettings;

    private final InputLogic mInputLogic = new InputLogic(this);

    private final InputLogic mInputLogic = new InputLogic(this /* LatinIME */,

            this /* SuggestionStripViewAccessor */);



    private View mExtractArea;

    private View mKeyPreviewBackingView;

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

+11 −7
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.inputmethod.latin.WordComposer; 
import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.latin.settings.SettingsValues;

import com.android.inputmethod.latin.settings.SpacingAndPunctuations;

import com.android.inputmethod.latin.suggestions.SuggestionStripViewAccessor;

import com.android.inputmethod.latin.utils.AsyncResultHolder;

import com.android.inputmethod.latin.utils.CollectionUtils;

import com.android.inputmethod.latin.utils.InputTypeUtils;
@@ -65,6 +66,7 @@ public final class InputLogic { 


    // TODO : Remove this member when we can.

    private final LatinIME mLatinIME;

    private final SuggestionStripViewAccessor mSuggestionStripViewAccessor;



    // Never null.

    private InputLogicHandler mInputLogicHandler = InputLogicHandler.NULL_HANDLER;
@@ -94,8 +96,10 @@ public final class InputLogic { 
    // Find a way to remove it for readability.

    public boolean mIsAutoCorrectionIndicatorOn;



    public InputLogic(final LatinIME latinIME) {

    public InputLogic(final LatinIME latinIME,

            final SuggestionStripViewAccessor suggestionStripViewAccessor) {

        mLatinIME = latinIME;

        mSuggestionStripViewAccessor = suggestionStripViewAccessor;

        mWordComposer = new WordComposer();

        mEventInterpreter = new EventInterpreter(latinIME);

        mConnection = new RichInputConnection(latinIME);
@@ -638,7 +642,7 @@ public final class InputLogic { 
                mSpaceState = SpaceState.WEAK;

            }

            // In case the "add to dictionary" hint was still displayed.

            mLatinIME.dismissAddToDictionaryHint();

            mSuggestionStripViewAccessor.dismissAddToDictionaryHint();

        }

        handler.postUpdateSuggestionStrip();

        if (settingsValues.mIsInternal) {
@@ -714,7 +718,7 @@ public final class InputLogic { 
                if (maybeDoubleSpacePeriod(settingsValues, handler)) {

                    keyboardSwitcher.updateShiftState();

                    mSpaceState = SpaceState.DOUBLE;

                } else if (!mLatinIME.isShowingPunctuationList()) {

                } else if (!mSuggestionStripViewAccessor.isShowingPunctuationList()) {

                    mSpaceState = SpaceState.WEAK;

                }

            }
@@ -745,7 +749,7 @@ public final class InputLogic { 


            // Set punctuation right away. onUpdateSelection will fire but tests whether it is

            // already displayed or not, so it's okay.

            mLatinIME.setNeutralSuggestionStrip();

            mSuggestionStripViewAccessor.setNeutralSuggestionStrip();

        }



        keyboardSwitcher.updateShiftState();
@@ -1098,7 +1102,7 @@ public final class InputLogic { 
        }



        if (!mWordComposer.isComposingWord() && !settingsValues.mBigramPredictionEnabled) {

            mLatinIME.setNeutralSuggestionStrip();

            mSuggestionStripViewAccessor.setNeutralSuggestionStrip();

            return;

        }
@@ -1120,7 +1124,7 @@ public final class InputLogic { 
        final SuggestedWords suggestedWords = holder.get(null,

                Constants.GET_SUGGESTED_WORDS_TIMEOUT);

        if (suggestedWords != null) {

            mLatinIME.showSuggestionStrip(suggestedWords);

            mSuggestionStripViewAccessor.showSuggestionStrip(suggestedWords);

        }

    }
@@ -1482,7 +1486,7 @@ public final class InputLogic { 
            final int newSelStart, final int newSelEnd) {

        final boolean shouldFinishComposition = mWordComposer.isComposingWord();

        resetComposingState(true /* alsoResetLastComposedWord */);

        mLatinIME.setNeutralSuggestionStrip();

        mSuggestionStripViewAccessor.setNeutralSuggestionStrip();

        mConnection.resetCachesUponCursorMoveAndReturnSuccess(newSelStart, newSelEnd,

                shouldFinishComposition);

    }