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

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

Merge "[IL91] Call reorder"

parents c2e2b394 c6367ee6

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

+8 −9
Original line number Diff line number Diff line
@@ -1429,13 +1429,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        // TODO: refactor this

        final SuggestedWords suggestedWords =

                sourceSuggestedWords.isEmpty() ? SuggestedWords.EMPTY : sourceSuggestedWords;

        if (suggestedWords.isEmpty()) {

            // No auto-correction is available, clear the cached values.

            AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord);

            setSuggestedWords(suggestedWords);

            setAutoCorrectionIndicator(false);

            return;

        }

        final String autoCorrection;

        if (suggestedWords.mWillAutoCorrect) {

            autoCorrection = suggestedWords.getWord(SuggestedWords.INDEX_OF_AUTO_CORRECTION);
@@ -1444,12 +1437,18 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            // because it may differ from mWordComposer.mTypedWord.

            autoCorrection = typedWord;

        }

        if (suggestedWords.isEmpty()) {

            AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord);

            setSuggestedWords(suggestedWords);

            setAutoCorrectionIndicator(false);

            return;

        }

        mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);

        setSuggestedWords(suggestedWords);

        setAutoCorrectionIndicator(suggestedWords.mWillAutoCorrect);

        setSuggestionStripShown(isSuggestionsStripVisible());

        // An auto-correction is available, cache it in accessibility code so

        // we can be speak it if the user touches a key that will insert it.

        // Cache the auto-correction in accessibility code so we can speak it if the user

        // touches a key that will insert it.

        AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord);

    }