nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolve merge conflict 

Change-Id: I96c87f7a4e4d34357d3d4c772eb3782c171bb4c0
main
Satoshi Kataoka 2012-11-06 13:52:52 +09:00
parent 9c739939a3
commit 6962a566f4
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
java/src/com/android/inputmethod/latin/RichInputConnection.java
View File

@ -163,11 +163,7 @@ public final class RichInputConnection {
} }
public void finishComposingText() { public void finishComposingText() {
<<<<<<< HEAD
checkBatchEdit();
=======
if (DEBUG_BATCH_NESTING) checkBatchEdit(); if (DEBUG_BATCH_NESTING) checkBatchEdit();
>>>>>>> goog/master
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
mCommittedTextBeforeComposingText.append(mComposingText); mCommittedTextBeforeComposingText.append(mComposingText);
mCurrentCursorPosition += mComposingText.length(); mCurrentCursorPosition += mComposingText.length();
@ -181,11 +177,7 @@ public final class RichInputConnection {
} }
public void commitText(final CharSequence text, final int i) { public void commitText(final CharSequence text, final int i) {
<<<<<<< HEAD
checkBatchEdit();
=======
if (DEBUG_BATCH_NESTING) checkBatchEdit(); if (DEBUG_BATCH_NESTING) checkBatchEdit();
>>>>>>> goog/master
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
mCommittedTextBeforeComposingText.append(text); mCommittedTextBeforeComposingText.append(text);
mCurrentCursorPosition += text.length() - mComposingText.length(); mCurrentCursorPosition += text.length() - mComposingText.length();
@ -262,11 +254,7 @@ public final class RichInputConnection {
} }
public void deleteSurroundingText(final int i, final int j) { public void deleteSurroundingText(final int i, final int j) {
<<<<<<< HEAD
checkBatchEdit();
=======
if (DEBUG_BATCH_NESTING) checkBatchEdit(); if (DEBUG_BATCH_NESTING) checkBatchEdit();
>>>>>>> goog/master
final int remainingChars = mComposingText.length() - i; final int remainingChars = mComposingText.length() - i;
if (remainingChars >= 0) { if (remainingChars >= 0) {
mComposingText.setLength(remainingChars); mComposingText.setLength(remainingChars);
@ -302,11 +290,7 @@ public final class RichInputConnection {
} }
public void sendKeyEvent(final KeyEvent keyEvent) { public void sendKeyEvent(final KeyEvent keyEvent) {
<<<<<<< HEAD
checkBatchEdit();
=======
if (DEBUG_BATCH_NESTING) checkBatchEdit(); if (DEBUG_BATCH_NESTING) checkBatchEdit();
>>>>>>> goog/master
if (keyEvent.getAction() == KeyEvent.ACTION_DOWN) { if (keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
// This method is only called for enter or backspace when speaking to old // This method is only called for enter or backspace when speaking to old
@ -354,11 +338,7 @@ public final class RichInputConnection {
} }
public void setComposingText(final CharSequence text, final int i) { public void setComposingText(final CharSequence text, final int i) {
<<<<<<< HEAD
checkBatchEdit();
=======
if (DEBUG_BATCH_NESTING) checkBatchEdit(); if (DEBUG_BATCH_NESTING) checkBatchEdit();
>>>>>>> goog/master
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
mCurrentCursorPosition += text.length() - mComposingText.length(); mCurrentCursorPosition += text.length() - mComposingText.length();
mComposingText.setLength(0); mComposingText.setLength(0);
@ -374,11 +354,7 @@ public final class RichInputConnection {
} }
public void setSelection(final int from, final int to) { public void setSelection(final int from, final int to) {
<<<<<<< HEAD
checkBatchEdit();
=======
if (DEBUG_BATCH_NESTING) checkBatchEdit(); if (DEBUG_BATCH_NESTING) checkBatchEdit();
>>>>>>> goog/master
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
if (null != mIC) { if (null != mIC) {
mIC.setSelection(from, to); mIC.setSelection(from, to);
@ -392,11 +368,7 @@ public final class RichInputConnection {
} }
public void commitCorrection(final CorrectionInfo correctionInfo) { public void commitCorrection(final CorrectionInfo correctionInfo) {
<<<<<<< HEAD
checkBatchEdit();
=======
if (DEBUG_BATCH_NESTING) checkBatchEdit(); if (DEBUG_BATCH_NESTING) checkBatchEdit();
>>>>>>> goog/master
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
// This has no effect on the text field and does not change its content. It only makes // 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. // TextView flash the text for a second based on indices contained in the argument.
@ -410,11 +382,7 @@ public final class RichInputConnection {
} }
public void commitCompletion(final CompletionInfo completionInfo) { public void commitCompletion(final CompletionInfo completionInfo) {
<<<<<<< HEAD
checkBatchEdit();
=======
if (DEBUG_BATCH_NESTING) checkBatchEdit(); if (DEBUG_BATCH_NESTING) checkBatchEdit();
>>>>>>> goog/master
if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug(); if (DEBUG_PREVIOUS_TEXT) checkConsistencyForDebug();
final CharSequence text = completionInfo.getText(); final CharSequence text = completionInfo.getText();
mCommittedTextBeforeComposingText.append(text); mCommittedTextBeforeComposingText.append(text);