diff options
Diffstat (limited to 'java/src/com')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/RichInputConnection.java | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java index d1c96d42a..53aabd9e8 100644 --- a/java/src/com/android/inputmethod/latin/RichInputConnection.java +++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java @@ -163,7 +163,11 @@ public final class RichInputConnection { } public void finishComposingText() { +<<<<<<< HEAD + checkBatchEdit(); +======= if (DEBUG_BATCH_NESTING) checkBatchEdit(); +>>>>>>> goog/master if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); mCommittedTextBeforeComposingText.append(mComposingText); mCurrentCursorPosition += mComposingText.length(); @@ -177,7 +181,11 @@ public final class RichInputConnection { } public void commitText(final CharSequence text, final int i) { +<<<<<<< HEAD + checkBatchEdit(); +======= if (DEBUG_BATCH_NESTING) checkBatchEdit(); +>>>>>>> goog/master if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); mCommittedTextBeforeComposingText.append(text); mCurrentCursorPosition += text.length() - mComposingText.length(); @@ -254,7 +262,11 @@ public final class RichInputConnection { } public void deleteSurroundingText(final int i, final int j) { +<<<<<<< HEAD + checkBatchEdit(); +======= if (DEBUG_BATCH_NESTING) checkBatchEdit(); +>>>>>>> goog/master final int remainingChars = mComposingText.length() - i; if (remainingChars >= 0) { mComposingText.setLength(remainingChars); @@ -290,7 +302,11 @@ public final class RichInputConnection { } public void sendKeyEvent(final KeyEvent keyEvent) { +<<<<<<< HEAD + checkBatchEdit(); +======= if (DEBUG_BATCH_NESTING) checkBatchEdit(); +>>>>>>> goog/master if (keyEvent.getAction() == KeyEvent.ACTION_DOWN) { if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); // This method is only called for enter or backspace when speaking to old @@ -338,7 +354,11 @@ public final class RichInputConnection { } public void setComposingText(final CharSequence text, final int i) { +<<<<<<< HEAD + checkBatchEdit(); +======= if (DEBUG_BATCH_NESTING) checkBatchEdit(); +>>>>>>> goog/master if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); mCurrentCursorPosition += text.length() - mComposingText.length(); mComposingText.setLength(0); @@ -354,7 +374,11 @@ public final class RichInputConnection { } public void setSelection(final int from, final int to) { +<<<<<<< HEAD + checkBatchEdit(); +======= if (DEBUG_BATCH_NESTING) checkBatchEdit(); +>>>>>>> goog/master if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); if (null != mIC) { mIC.setSelection(from, to); @@ -368,7 +392,11 @@ public final class RichInputConnection { } public void commitCorrection(final CorrectionInfo correctionInfo) { +<<<<<<< HEAD + checkBatchEdit(); +======= if (DEBUG_BATCH_NESTING) checkBatchEdit(); +>>>>>>> goog/master if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); // This has no effect on the text field and does not change its content. It only makes // TextView flash the text for a second based on indices contained in the argument. @@ -382,7 +410,11 @@ public final class RichInputConnection { } public void commitCompletion(final CompletionInfo completionInfo) { +<<<<<<< HEAD + checkBatchEdit(); +======= if (DEBUG_BATCH_NESTING) checkBatchEdit(); +>>>>>>> goog/master if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); final CharSequence text = completionInfo.getText(); mCommittedTextBeforeComposingText.append(text); |