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

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

Merge "Cleanup, part 3 (C3)"

parents b821b72a 5475e92b

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

+1 −1
Original line number Diff line number Diff line
@@ -1928,7 +1928,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        }



        final SuggestedWords suggestedWords;

        if (mCurrentSettings.mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) {

        if (mCurrentSettings.isCorrectionOn()) {

            final CharSequence prevWord = mConnection.getThisWord(mCurrentSettings.mWordSeparators);

            if (!TextUtils.isEmpty(prevWord)) {

                suggestedWords = mSuggest.getBigramPredictions(prevWord);

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

+1 −3
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ public class SettingsValues { 
    private int createCorrectionMode() {

        final boolean shouldAutoCorrect = mAutoCorrectEnabled

                && !mInputAttributes.mInputTypeNoAutoCorrect;

        if (shouldAutoCorrect) return Suggest.CORRECTION_FULL_BIGRAM;

        return shouldAutoCorrect ? Suggest.CORRECTION_FULL : Suggest.CORRECTION_NONE;

    }
@@ -244,8 +243,7 @@ public class SettingsValues { 
    }



    public boolean isCorrectionOn() {

        return mCorrectionMode == Suggest.CORRECTION_FULL

                || mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM;

        return mCorrectionMode == Suggest.CORRECTION_FULL;

    }



    public boolean isSuggestionStripVisibleInOrientation(final int orientation) {

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

+5 −4
Original line number Diff line number Diff line
@@ -39,9 +39,10 @@ public class Suggest implements Dictionary.WordCallback { 


    public static final int APPROX_MAX_WORD_LENGTH = 32;



    // TODO: rename this to CORRECTION_OFF

    public static final int CORRECTION_NONE = 0;

    // TODO: rename this to CORRECTION_ON

    public static final int CORRECTION_FULL = 1;

    public static final int CORRECTION_FULL_BIGRAM = 2;



    // It seems the following values are only used for logging.

    public static final int DIC_USER_TYPED = 0;
@@ -266,7 +267,7 @@ public class Suggest implements Dictionary.WordCallback { 
        LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED, Dictionary.UNIGRAM);

        mConsideredWord = consideredWord;



        if (wordComposer.size() <= 1 && (correctionMode == CORRECTION_FULL_BIGRAM)) {

        if (wordComposer.size() <= 1 && (correctionMode == CORRECTION_FULL)) {

            // At first character typed, search only the bigrams

            mBigramSuggestions = new ArrayList<SuggestedWordInfo>(PREF_MAX_BIGRAMS);
@@ -323,7 +324,7 @@ public class Suggest implements Dictionary.WordCallback { 
                mIsFirstCharCapitalized, mWhiteListDictionary.getWhitelistedWord(consideredWord));



        final boolean hasAutoCorrection;

        if (CORRECTION_FULL == correctionMode || CORRECTION_FULL_BIGRAM == correctionMode) {

        if (CORRECTION_FULL == correctionMode) {

            final CharSequence autoCorrection =

                    AutoCorrection.computeAutoCorrectionWord(mUnigramDictionaries, wordComposer,

                            mSuggestions, consideredWord, mAutoCorrectionThreshold,
@@ -373,7 +374,7 @@ public class Suggest implements Dictionary.WordCallback { 
                && hasMainDictionary();



        boolean autoCorrectionAvailable = hasAutoCorrection;

        if (correctionMode == CORRECTION_FULL || correctionMode == CORRECTION_FULL_BIGRAM) {

        if (correctionMode == CORRECTION_FULL) {

            autoCorrectionAvailable |= !allowsToBeAutoCorrected;

        }

        // Don't auto-correct words with multiple capital letter