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

am 750a3557: Merge "[CB18] Move some code around" 

* commit '750a3557a0dd08fddc78acb6c7e3d49a0ad43da9':
  [CB18] Move some code around
main
Jean Chalard 2014-04-02 09:22:31 +00:00 committed by Android Git Automerger
parent f706a77ebc 750a3557a0
commit 3661ef2143
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
java/src/com/android/inputmethod/latin/WordComposer.java
View File

@ -200,6 +200,33 @@ public final class WordComposer {
mAutoCorrection = null; mAutoCorrection = null;
} }
/**
* Delete the last composing unit as a result of hitting backspace.
*/
public void deleteLast(final Event event) {
mCombinerChain.processEvent(mEvents, event);
mEvents.add(event);
refreshTypedWordCache();
// We may have deleted the last one.
if (0 == size()) {
mIsFirstCharCapitalized = false;
}
if (mTrailingSingleQuotesCount > 0) {
--mTrailingSingleQuotesCount;
} else {
int i = mTypedWordCache.length();
while (i > 0) {
i = Character.offsetByCodePoints(mTypedWordCache, i, -1);
if (Constants.CODE_SINGLE_QUOTE != Character.codePointAt(mTypedWordCache, i)) {
break;
}
++mTrailingSingleQuotesCount;
}
}
mCursorPositionWithinWord = mCodePointSize;
mAutoCorrection = null;
}
public void setCursorPositionWithinWord(final int posWithinWord) { public void setCursorPositionWithinWord(final int posWithinWord) {
mCursorPositionWithinWord = posWithinWord; mCursorPositionWithinWord = posWithinWord;
// TODO: compute where that puts us inside the events // TODO: compute where that puts us inside the events
@ -296,33 +323,6 @@ public final class WordComposer {
mPreviousWordForSuggestion = null == previousWord ? null : previousWord.toString(); mPreviousWordForSuggestion = null == previousWord ? null : previousWord.toString();
} }
/**
* Delete the last composing unit as a result of hitting backspace.
*/
public void deleteLast(final Event event) {
mCombinerChain.processEvent(mEvents, event);
mEvents.add(event);
refreshTypedWordCache();
// We may have deleted the last one.
if (0 == size()) {
mIsFirstCharCapitalized = false;
}
if (mTrailingSingleQuotesCount > 0) {
--mTrailingSingleQuotesCount;
} else {
int i = mTypedWordCache.length();
while (i > 0) {
i = Character.offsetByCodePoints(mTypedWordCache, i, -1);
if (Constants.CODE_SINGLE_QUOTE != Character.codePointAt(mTypedWordCache, i)) {
break;
}
++mTrailingSingleQuotesCount;
}
}
mCursorPositionWithinWord = mCodePointSize;
mAutoCorrection = null;
}
/** /**
* Returns the word as it was typed, without any correction applied. * Returns the word as it was typed, without any correction applied.
* @return the word that was typed so far. Never returns null. * @return the word that was typed so far. Never returns null.