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

Resolve conflicts for merge of 3a9ba17f to master"

Browse source 
Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49
This commit is contained in:
Jean Chalard 2012-11-13 16:34:23 +09:00
commit 1b909c2846
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1411,7 +1411,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
mHandler.postUpdateSuggestionStrip(); mHandler.postUpdateSuggestionStrip();
final String text = specificTldProcessingOnTextInput(rawText); final String text = specificTldProcessingOnTextInput(rawText);
if (SPACE_STATE_PHANTOM == mSpaceState) { if (SPACE_STATE_PHANTOM == mSpaceState) {
sendKeyCodePoint(Constants.CODE_SPACE); promotePhantomSpace();
} }
mConnection.commitText(text, 1); mConnection.commitText(text, 1);
mConnection.endBatchEdit(); mConnection.endBatchEdit();
@ -1574,7 +1574,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
mWordComposer.setBatchInputWord(batchInputText); mWordComposer.setBatchInputWord(batchInputText);
mConnection.beginBatchEdit(); mConnection.beginBatchEdit();
if (SPACE_STATE_PHANTOM == mSpaceState) { if (SPACE_STATE_PHANTOM == mSpaceState) {
sendKeyCodePoint(Constants.CODE_SPACE); promotePhantomSpace();
} }
mConnection.setComposingText(batchInputText, 1); mConnection.setComposingText(batchInputText, 1);
mExpectingUpdateSelection = true; mExpectingUpdateSelection = true;
@ -1729,7 +1729,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
// Sanity check // Sanity check
throw new RuntimeException("Should not be composing here"); throw new RuntimeException("Should not be composing here");
} }
sendKeyCodePoint(Constants.CODE_SPACE); promotePhantomSpace();
} }
// NOTE: isCursorTouchingWord() is a blocking IPC call, so it often takes several // NOTE: isCursorTouchingWord() is a blocking IPC call, so it often takes several
@ -1806,7 +1806,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
if (SPACE_STATE_PHANTOM == spaceState && if (SPACE_STATE_PHANTOM == spaceState &&
mCurrentSettings.isPhantomSpacePromotingSymbol(primaryCode)) { mCurrentSettings.isPhantomSpacePromotingSymbol(primaryCode)) {
sendKeyCodePoint(Constants.CODE_SPACE); promotePhantomSpace();
} }
sendKeyCodePoint(primaryCode); sendKeyCodePoint(primaryCode);
@ -2070,7 +2070,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
int firstChar = Character.codePointAt(suggestion, 0); int firstChar = Character.codePointAt(suggestion, 0);
if ((!mCurrentSettings.isWeakSpaceStripper(firstChar)) if ((!mCurrentSettings.isWeakSpaceStripper(firstChar))
&& (!mCurrentSettings.isWeakSpaceSwapper(firstChar))) { && (!mCurrentSettings.isWeakSpaceSwapper(firstChar))) {
sendKeyCodePoint(Constants.CODE_SPACE); promotePhantomSpace();
} }
} }
@ -2247,6 +2247,11 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
mHandler.postUpdateSuggestionStrip(); mHandler.postUpdateSuggestionStrip();
} }
// This essentially inserts a space, and that's it.
public void promotePhantomSpace() {
sendKeyCodePoint(Constants.CODE_SPACE);
}
// Used by the RingCharBuffer // Used by the RingCharBuffer
public boolean isWordSeparator(final int code) { public boolean isWordSeparator(final int code) {
return mCurrentSettings.isWordSeparator(code); return mCurrentSettings.isWordSeparator(code);