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

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

Merge "Fix a bug with backspace happening after a manual pick."

parents 8ae770f3 3b2112e7
Loading
Loading
Loading
Loading
+11 −6
Original line number Diff line number Diff line
@@ -2154,6 +2154,16 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar

    // "ic" must not be null
    private void restartSuggestionsOnManuallyPickedTypedWord(final InputConnection ic) {
        // Note: this relies on the last word still being held in the WordComposer, in
        // the field for suggestion resuming.
        // Note: in the interest of code simplicity, we may want to just call
        // restartSuggestionsOnWordBeforeCursorIfAtEndOfWord instead, but retrieving
        // the old WordComposer allows to reuse the actual typed coordinates.
        mWordComposer.resumeSuggestionOnKeptWord();
        // We resume suggestion, and then we want to set the composing text to the content
        // of the word composer again. But since we just manually picked a word, there is
        // no composing text at the moment, so we have to delete the word before we set a
        // new composing text.
        final int restartLength = mWordComposer.size();
        if (DEBUG) {
            final String wordBeforeCursor =
@@ -2167,13 +2177,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                        + wordBeforeCursor + "\"");
            }
        }
        // Warning: this +1 takes into account the extra space added by the manual pick process.
        ic.deleteSurroundingText(restartLength + 1, 0);

        // Note: this relies on the last word still being held in the WordComposer
        // Note: in the interest of code simplicity, we may want to just call
        // restartSuggestionsOnWordBeforeCursorIfAtEndOfWord instead, but retrieving
        // the old WordComposer allows to reuse the actual typed coordinates.
        mWordComposer.resumeSuggestionOnKeptWord();
        ic.setComposingText(mWordComposer.getTypedWord(), 1);
        mHandler.cancelUpdateBigramPredictions();
        mHandler.postUpdateSuggestions();