am b112a135: Merge "Fix a race condition with backspaces"
* commit 'b112a13518fd7479da4113d8e4f4f327ad8b9bbb': Fix a race condition with backspacesmain
commit
c5432a2db7
|
@ -1717,6 +1717,11 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
|
|||
// If there is a selection, remove it.
|
||||
final int lengthToDelete = mLastSelectionEnd - mLastSelectionStart;
|
||||
mConnection.setSelection(mLastSelectionEnd, mLastSelectionEnd);
|
||||
// Reset mLastSelectionEnd to mLastSelectionStart. This is what is supposed to
|
||||
// happen, and if it's wrong, the next call to onUpdateSelection will correct it,
|
||||
// but we want to set it right away to avoid it being used with the wrong values
|
||||
// later (typically, in a subsequent press on backspace).
|
||||
mLastSelectionEnd = mLastSelectionStart;
|
||||
mConnection.deleteSurroundingText(lengthToDelete, 0);
|
||||
} else {
|
||||
// There is no selection, just delete one character.
|
||||
|
|
|
@ -102,6 +102,27 @@ public class InputLogicTests extends InputTestsBase {
|
|||
assertEquals("delete selection", EXPECTED_RESULT, mTextView.getText().toString());
|
||||
}
|
||||
|
||||
public void testDeleteSelectionTwice() {
|
||||
final String STRING_TO_TYPE = "some text delete me some text";
|
||||
final int typedLength = STRING_TO_TYPE.length();
|
||||
final int SELECTION_START = 10;
|
||||
final int SELECTION_END = 19;
|
||||
final String EXPECTED_RESULT = "some text some text";
|
||||
type(STRING_TO_TYPE);
|
||||
// There is no IMF to call onUpdateSelection for us so we must do it by hand.
|
||||
// Send once to simulate the cursor actually responding to the move caused by typing.
|
||||
// This is necessary because LatinIME is bookkeeping to avoid confusing a real cursor
|
||||
// move with a move triggered by LatinIME inputting stuff.
|
||||
mLatinIME.onUpdateSelection(0, 0, typedLength, typedLength, -1, -1);
|
||||
mInputConnection.setSelection(SELECTION_START, SELECTION_END);
|
||||
// And now we simulate the user actually selecting some text.
|
||||
mLatinIME.onUpdateSelection(typedLength, typedLength,
|
||||
SELECTION_START, SELECTION_END, -1, -1);
|
||||
type(Constants.CODE_DELETE);
|
||||
type(Constants.CODE_DELETE);
|
||||
assertEquals("delete selection twice", EXPECTED_RESULT, mTextView.getText().toString());
|
||||
}
|
||||
|
||||
public void testAutoCorrect() {
|
||||
final String STRING_TO_TYPE = "tgis ";
|
||||
final String EXPECTED_RESULT = "this ";
|
||||
|
|
Loading…
Reference in New Issue