Rename cancelCommit to revertCommit
This wording is easier to understand, and it matches the other
revert* functions.
Change-Id: Ibc2ec79fb5a0f9bf508e5cdeb75e54abd9241d0c
diff --git a/java/src/com/android/inputmethod/latin/LastComposedWord.java b/java/src/com/android/inputmethod/latin/LastComposedWord.java
index ab624b2..bc07924 100644
--- a/java/src/com/android/inputmethod/latin/LastComposedWord.java
+++ b/java/src/com/android/inputmethod/latin/LastComposedWord.java
@@ -72,7 +72,7 @@
mActive = false;
}
- public boolean canCancelCommit() {
+ public boolean canRevertCommit() {
return mActive && !TextUtils.isEmpty(mCommittedWord);
}
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index a8ac3d5..47ec40f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1431,9 +1431,9 @@
ic.deleteSurroundingText(1, 0);
}
} else {
- if (mLastComposedWord.canCancelCommit()) {
+ if (mLastComposedWord.canRevertCommit()) {
Utils.Stats.onAutoCorrectionCancellation();
- cancelCommit(ic);
+ revertCommit(ic);
return;
}
if (SPACE_STATE_DOUBLE == spaceState) {
@@ -2155,7 +2155,7 @@
}
// "ic" must not be null
- private void cancelCommit(final InputConnection ic) {
+ private void revertCommit(final InputConnection ic) {
final String originallyTypedWord = mLastComposedWord.mTypedWord;
final CharSequence committedWord = mLastComposedWord.mCommittedWord;
final int cancelLength = committedWord.length();
@@ -2164,13 +2164,13 @@
// TODO: should we check our saved separator against the actual contents of the text view?
if (DEBUG) {
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 =
ic.getTextBeforeCursor(cancelLength + separatorLength, 0)
.subSequence(0, cancelLength).toString();
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
+ "\", but before the cursor we found \"" + wordBeforeCursor + "\"");
}