am bf075b21: Merge "Don\'t trim newer inputpointers with old data"

* commit 'bf075b21a1b85c9aa382276e95d3986d3d6d5b1d':
  Don't trim newer inputpointers with old data
This commit is contained in:
Jean Chalard 2014-02-21 03:21:29 -08:00 committed by Android Git Automerger
commit e48e95566d

View file

@ -490,6 +490,7 @@ public final class InputLogic {
handler.showGesturePreviewAndSuggestionStrip( handler.showGesturePreviewAndSuggestionStrip(
SuggestedWords.EMPTY, false /* dismissGestureFloatingPreviewText */); SuggestedWords.EMPTY, false /* dismissGestureFloatingPreviewText */);
handler.cancelUpdateSuggestionStrip(); handler.cancelUpdateSuggestionStrip();
++mAutoCommitSequenceNumber;
mConnection.beginBatchEdit(); mConnection.beginBatchEdit();
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
if (settingsValues.mIsInternal) { if (settingsValues.mIsInternal) {
@ -587,6 +588,7 @@ public final class InputLogic {
public void onEndBatchInput(final SettingsValues settingValues, public void onEndBatchInput(final SettingsValues settingValues,
final InputPointers batchPointers) { final InputPointers batchPointers) {
mInputLogicHandler.onEndBatchInput(batchPointers, mAutoCommitSequenceNumber); mInputLogicHandler.onEndBatchInput(batchPointers, mAutoCommitSequenceNumber);
++mAutoCommitSequenceNumber;
} }
// TODO: remove this argument // TODO: remove this argument