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

Rename cancelCommit to revertCommit 

This wording is easier to understand, and it matches the other
revert* functions.

Change-Id: Ibc2ec79fb5a0f9bf508e5cdeb75e54abd9241d0c
main
Jean Chalard 2012-02-22 01:09:23 -08:00
parent 4fef31510d
commit 5935950d44
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/latin/LastComposedWord.java
View File

@ -72,7 +72,7 @@ public class LastComposedWord {
mActive = false; mActive = false;
} }
public boolean canCancelCommit() { public boolean canRevertCommit() {
return mActive && !TextUtils.isEmpty(mCommittedWord); return mActive && !TextUtils.isEmpty(mCommittedWord);
} }

10
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1431,9 +1431,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
ic.deleteSurroundingText(1, 0); ic.deleteSurroundingText(1, 0);
} }
} else { } else {
if (mLastComposedWord.canCancelCommit()) { if (mLastComposedWord.canRevertCommit()) {
Utils.Stats.onAutoCorrectionCancellation(); Utils.Stats.onAutoCorrectionCancellation();
cancelCommit(ic); revertCommit(ic);
return; return;
} }
if (SPACE_STATE_DOUBLE == spaceState) { if (SPACE_STATE_DOUBLE == spaceState) {
@ -2155,7 +2155,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
// "ic" must not be null // "ic" must not be null
private void cancelCommit(final InputConnection ic) { private void revertCommit(final InputConnection ic) {
final String originallyTypedWord = mLastComposedWord.mTypedWord; final String originallyTypedWord = mLastComposedWord.mTypedWord;
final CharSequence committedWord = mLastComposedWord.mCommittedWord; final CharSequence committedWord = mLastComposedWord.mCommittedWord;
final int cancelLength = committedWord.length(); final int cancelLength = committedWord.length();
@ -2164,13 +2164,13 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
// TODO: should we check our saved separator against the actual contents of the text view? // TODO: should we check our saved separator against the actual contents of the text view?
if (DEBUG) { if (DEBUG) {
if (mWordComposer.isComposingWord()) { if (mWordComposer.isComposingWord()) {
throw new RuntimeException("cancelCommit, but we are composing a word"); throw new RuntimeException("revertCommit, but we are composing a word");
} }
final String wordBeforeCursor = final String wordBeforeCursor =
ic.getTextBeforeCursor(cancelLength + separatorLength, 0) ic.getTextBeforeCursor(cancelLength + separatorLength, 0)
.subSequence(0, cancelLength).toString(); .subSequence(0, cancelLength).toString();
if (!TextUtils.equals(committedWord, wordBeforeCursor)) { if (!TextUtils.equals(committedWord, wordBeforeCursor)) {
throw new RuntimeException("cancelCommit check failed: we thought we were " throw new RuntimeException("revertCommit check failed: we thought we were "
+ "reverting \"" + committedWord + "reverting \"" + committedWord
+ "\", but before the cursor we found \"" + wordBeforeCursor + "\""); + "\", but before the cursor we found \"" + wordBeforeCursor + "\"");
} }