From 2c77216e22e5f9d1d2191ce577f2707bea5b815a Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Wed, 26 Oct 2011 20:59:17 +0900
Subject: [PATCH] Remove trailing spaces when appropriate

Bug: 5509651
Change-Id: I99cfb5a6fc2873e2c11ed16967cd82a7f504a263
---
 java/src/com/android/inputmethod/latin/LatinIME.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 5b7428e33..fd833157d 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1582,7 +1582,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
         }
 
         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 {