commit adebf1fe72471aba5a4c0e07eabe240a45551d7f
author Eric Fischer <enf@google.com> Wed Nov 02 14:10:20 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 02 14:10:20 2011 -0700
tree 9840c9ad9eeceb191ef6b56c82841ebf1a5b2e5b
parent 3181251021d2352dfd5077c74a930a04aebbaed2
parent 7a181fdf0693ac9aa469088b17aea86fde635242

Merge "Import revised translations."

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 5b7428e..fd83315 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1582,7 +1582,11 @@
         }
 
         final boolean swapMagicSpace;
-        if (SPACE_STATE_MAGIC == spaceState) {
+        if (Keyboard.CODE_ENTER == primaryCode && (SPACE_STATE_MAGIC == spaceState
+                || SPACE_STATE_SWAP_PUNCTUATION == spaceState)) {
+            removeTrailingSpaceWhileInBatchEdit(ic);
+            swapMagicSpace = false;
+        } else if (SPACE_STATE_MAGIC == spaceState) {
             if (mSettingsValues.isMagicSpaceSwapper(primaryCode)) {
                 swapMagicSpace = true;
             } else {