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

Commit 0e9e7e33 authored by Jean Chalard's avatar Jean Chalard
Browse files

Cleanup (A57) 

We stopped cancelling manual picks a few weeks ago. This code
is dead.

Change-Id: I4032fcc3c95e9379f1839fe860a1b8a9bd7d0bc7
parent 29eeef75

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

+2 −2
Original line number Diff line number Diff line
@@ -73,10 +73,10 @@ public class LastComposedWord { 
    }



    public boolean canRevertCommit() {

        return mActive && !TextUtils.isEmpty(mCommittedWord);

        return mActive && !TextUtils.isEmpty(mCommittedWord) && !didCommitTypedWord();

    }



    public boolean didCommitTypedWord() {

    private boolean didCommitTypedWord() {

        return TextUtils.equals(mTypedWord, mCommittedWord);

    }

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

+9 −16
Original line number Diff line number Diff line
@@ -2000,12 +2000,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            mUserHistoryDictionary.cancelAddingUserHistory(

                    previousWord.toString(), committedWord.toString());

        }

        if (0 == separatorLength || mLastComposedWord.didCommitTypedWord()) {

            // This is the case when we cancel a manual pick.

            // We should restart suggestion on the word right away.

            mWordComposer.resumeSuggestionOnLastComposedWord(mLastComposedWord);

            mConnection.setComposingText(originallyTypedWord, 1);

        } else {

        mConnection.commitText(originallyTypedWord, 1);

        // Re-insert the separator

        sendKeyCodePoint(mLastComposedWord.mSeparatorCode);
@@ -2016,7 +2010,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        }

        // Don't restart suggestion yet. We'll restart if the user deletes the

        // separator.

        }

        mLastComposedWord = LastComposedWord.NOT_A_COMPOSED_WORD;

        mHandler.postUpdateSuggestions();

    }

tests/src/com/android/inputmethod/latin/InputLogicTests.java

+20 −0
Original line number Diff line number Diff line
@@ -126,6 +126,26 @@ public class InputLogicTests extends InputTestsBase { 
                mTextView.getText().toString());

    }



    public void testAutoCorrectWithSpaceThenRevert() {

        final String STRING_TO_TYPE = "tgis ";

        final String EXPECTED_RESULT = "tgis ";

        type(STRING_TO_TYPE);

        mLatinIME.onUpdateSelection(0, 0, STRING_TO_TYPE.length(), STRING_TO_TYPE.length(), -1, -1);

        type(Keyboard.CODE_DELETE);

        assertEquals("auto-correct with space then revert", EXPECTED_RESULT,

                mTextView.getText().toString());

    }



    public void testAutoCorrectToSelfDoesNotRevert() {

        final String STRING_TO_TYPE = "this ";

        final String EXPECTED_RESULT = "this";

        type(STRING_TO_TYPE);

        mLatinIME.onUpdateSelection(0, 0, STRING_TO_TYPE.length(), STRING_TO_TYPE.length(), -1, -1);

        type(Keyboard.CODE_DELETE);

        assertEquals("auto-correct with space does not revert", EXPECTED_RESULT,

                mTextView.getText().toString());

    }



    public void testDoubleSpace() {

        final String STRING_TO_TYPE = "this  ";

        final String EXPECTED_RESULT = "this. ";