aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-02-07 19:45:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-07 19:45:31 -0800
commitd437bab53b3498b2248653448fd99fd34b4a11f7 (patch)
tree425782615173b30e6c356efa9aece32b06864c8c /java
parentb2b1100df3c12337f52af9cbf4aa81a3836026f8 (diff)
parent8174373a0ed11aaaf6d5cdfc9065e6b8641b19a6 (diff)
downloadlatinime-d437bab53b3498b2248653448fd99fd34b4a11f7.tar.gz
latinime-d437bab53b3498b2248653448fd99fd34b4a11f7.tar.xz
latinime-d437bab53b3498b2248653448fd99fd34b4a11f7.zip
am 8174373a: Merge "Remove a nested edition occurence"
* commit '8174373a0ed11aaaf6d5cdfc9065e6b8641b19a6': Remove a nested edition occurence
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index c6278c250..1066c08d5 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1400,7 +1400,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
}
if (SPACE_STATE_DOUBLE == spaceState) {
- if (revertDoubleSpace(ic)) {
+ if (revertDoubleSpaceWhileInBatchEdit(ic)) {
// No need to reset mSpaceState, it has already be done (that's why we
// receive it as a parameter)
return;
@@ -2205,7 +2205,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
}
// "ic" must not be null
- private boolean revertDoubleSpace(final InputConnection ic) {
+ private boolean revertDoubleSpaceWhileInBatchEdit(final InputConnection ic) {
mHandler.cancelDoubleSpacesTimer();
// Here we test whether we indeed have a period and a space before us. This should not
// be needed, but it's there just in case something went wrong.
@@ -2218,10 +2218,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
+ "\". \" just before the cursor.");
return false;
}
- ic.beginBatchEdit();
ic.deleteSurroundingText(2, 0);
ic.commitText(" ", 1);
- ic.endBatchEdit();
return true;
}