Merge "[CB18] Move some code around"
commit
750a3557a0
|
@ -200,6 +200,33 @@ public final class WordComposer {
|
|||
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) {
|
||||
mCursorPositionWithinWord = posWithinWord;
|
||||
// TODO: compute where that puts us inside the events
|
||||
|
@ -296,33 +323,6 @@ public final class WordComposer {
|
|||
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.
|
||||
* @return the word that was typed so far. Never returns null.
|
||||
|
|
Loading…
Reference in New Issue