From 424f6ec2bcdfad53f571aa72f2979a0ba30d3ca2 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 2 Mar 2011 21:14:53 -0800
Subject: [PATCH] Continue swapping sentence separator and space

Bug: 3504990
Change-Id: I3de44e9d9adb0bcafa2e59685c4cdc257716b1d6
---
 java/src/com/android/inputmethod/latin/LatinIME.java       | 1 -
 java/src/com/android/inputmethod/latin/TextEntryState.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 5909b3b53..d0d0b723f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1627,7 +1627,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             return;
         }
 
-        TextEntryState.acceptedSuggestion(suggestions.getWord(0), suggestion);
         // If this is a punctuation, apply it through the normal key press
         if (suggestion.length() == 1 && (isWordSeparator(suggestion.charAt(0))
                 || isSuggestedPunctuation(suggestion.charAt(0)))) {
diff --git a/java/src/com/android/inputmethod/latin/TextEntryState.java b/java/src/com/android/inputmethod/latin/TextEntryState.java
index 7b629e3e7..a4e0b359b 100644
--- a/java/src/com/android/inputmethod/latin/TextEntryState.java
+++ b/java/src/com/android/inputmethod/latin/TextEntryState.java
@@ -107,6 +107,7 @@ public class TextEntryState {
             break;
         case ACCEPTED_DEFAULT:
         case SPACE_AFTER_PICKED:
+        case PUNCTUATION_AFTER_ACCEPTED:
             if (isSpace) {
                 setState(SPACE_AFTER_ACCEPTED);
             } else if (isSeparator) {
@@ -130,7 +131,6 @@ public class TextEntryState {
         case START:
         case UNKNOWN:
         case SPACE_AFTER_ACCEPTED:
-        case PUNCTUATION_AFTER_ACCEPTED:
         case PUNCTUATION_AFTER_WORD:
             if (!isSpace && !isSeparator) {
                 setState(IN_WORD);