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

Commit 7d34763e authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am fac619a3: Merge "Don\'t restrict reset composing state to non-identical... 

am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev

* commit 'fac619a3':
  Don't restrict reset composing state to non-identical setText
parents a13a8a58 fac619a3

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

+10 −14
Original line number Diff line number Diff line
@@ -704,11 +704,8 @@ public final class LatinIME extends InputMethodService implements KeyboardAction 
        updateFullscreenMode();

        mApplicationSpecifiedCompletions = null;



        if (isDifferentTextField || selectionChanged) {

            // If the selection changed, we reset the input state. Essentially, we come here with

            // restarting == true when the app called setText() or similar. We should reset the

            // state if the app set the text to something else, but keep it if it set a suggestion

            // or something.

        // The app calling setText() has the effect of clearing the composing

        // span, so we should reset our state unconditionally, even if restarting is true.

        mEnteredText = null;

        resetComposingState(true /* alsoResetLastComposedWord */);

        mDeleteCount = 0;
@@ -719,7 +716,6 @@ public final class LatinIME extends InputMethodService implements KeyboardAction 
            // otherwise it will clear the suggestion strip.

            setPunctuationSuggestions();

        }

        }



        mConnection.resetCachesUponCursorMove(editorInfo.initialSelStart);