commit 5245401b572bd53e9fe12c7cefcce3a847fa8f3d
author Tadashi G. Takaoka <takaoka@google.com> Tue Jul 12 21:53:05 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 12 21:53:05 2011 -0700
tree 4d139a6ff60f22ef5e01cd58f13c24b82a93ca3a
parent 4f365403c557ad9977a78186ea83ab81b31cd375
parent 886246b19a60cefa60af549d6a6b70626bf63e34

Merge "Add Right-To-Left delete icon"

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index cec30ea..5304d83 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1803,19 +1803,18 @@
         final InputConnection ic = getCurrentInputConnection();
         final CharSequence punctuation = ic.getTextBeforeCursor(1, 0);
         if (deleteChar) ic.deleteSurroundingText(1, 0);
-        int toDelete = mCommittedLength;
-        final CharSequence toTheLeft = ic.getTextBeforeCursor(mCommittedLength, 0);
-        if (!TextUtils.isEmpty(toTheLeft)
-                && mSettingsValues.isWordSeparator(toTheLeft.charAt(0))) {
-            toDelete--;
-        }
-        ic.deleteSurroundingText(toDelete, 0);
+        final CharSequence textToTheLeft = ic.getTextBeforeCursor(mCommittedLength, 0);
+        final int toDeleteLength = (!TextUtils.isEmpty(textToTheLeft)
+                && mSettingsValues.isWordSeparator(textToTheLeft.charAt(0)))
+                ? mCommittedLength - 1 : mCommittedLength;
+        ic.deleteSurroundingText(toDeleteLength, 0);
+
         // Re-insert punctuation only when the deleted character was word separator and the
         // composing text wasn't equal to the auto-corrected text.
         if (deleteChar
                 && !TextUtils.isEmpty(punctuation)
                 && mSettingsValues.isWordSeparator(punctuation.charAt(0))
-                && !TextUtils.equals(mComposingStringBuilder, toTheLeft)) {
+                && !TextUtils.equals(mComposingStringBuilder, textToTheLeft)) {
             ic.commitText(mComposingStringBuilder, 1);
             TextEntryState.acceptedTyped(mComposingStringBuilder);
             ic.commitText(punctuation, 1);