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

Commit 1c6cf26c authored by Jean Chalard's avatar Jean Chalard
Browse files

Move some code inside a function to simplify flow 

Also rename the function to reflect better the behavior.
An upcoming change will clean up the remnants

Change-Id: I19bdf0d9e95f62ee749e1f64fe17132c4a5ef0bc
parent 46798d8f

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

+8 −12
Original line number Diff line number Diff line
@@ -1602,17 +1602,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            final boolean shouldAutoCorrect = mSettingsValues.mAutoCorrectEnabled

                    && !mInputTypeNoAutoCorrect;

            if (shouldAutoCorrect && primaryCode != Keyboard.CODE_SINGLE_QUOTE) {

                final boolean pickedDefaultSuggestion = pickDefaultSuggestion(primaryCode);

                if (pickedDefaultSuggestion) {

                    final CharSequence autoCorrection = mWordComposer.getAutoCorrectionOrNull();

                    final String typedWord = mWordComposer.getTypedWord();

                    if (!typedWord.equals(autoCorrection)) {

                        // This will make the correction flash for a short while as a visual clue

                        // to the user that auto-correction happened.

                        InputConnectionCompatUtils.commitCorrection(ic,

                                mLastSelectionEnd - typedWord.length(), typedWord, autoCorrection);

                    }

                }

                final boolean didAutoCorrect = commitCurrentAutoCorrection(primaryCode, ic);

            } else {

                commitTyped(ic);

            }
@@ -1869,7 +1859,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
        setSuggestionStripShown(isSuggestionsStripVisible());

    }



    private boolean pickDefaultSuggestion(int separatorCode) {

    private boolean commitCurrentAutoCorrection(final int separatorCode, final InputConnection ic) {

        // Complete any pending suggestions query first

        if (mHandler.hasPendingUpdateSuggestions()) {

            mHandler.cancelUpdateSuggestions();
@@ -1891,6 +1881,12 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            // Add the word to the user unigram dictionary if it's not a known word

            addToUserUnigramAndBigramDictionaries(autoCorrection,

                    UserUnigramDictionary.FREQUENCY_FOR_TYPED);

            if (!typedWord.equals(autoCorrection)) {

                // This will make the correction flash for a short while as a visual clue

                // to the user that auto-correction happened.

                InputConnectionCompatUtils.commitCorrection(ic,

                        mLastSelectionEnd - typedWord.length(), typedWord, autoCorrection);

            }

            return true;

        }

        return false;