From cd95a365586b2b5f9a3639b72a2befdac7ada8a4 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Mon, 3 Oct 2011 15:50:11 +0900
Subject: [PATCH] Fix a bug where moving the cursor would not reset selection

This change updates suggestions when the cursor is moved.
It is now reasonable to remove the explicit test for
TextEntryState.isAcceptedDefault because it is now shielded
by mExpectingUpdateSelection : actually, this probably fixes
a long-standing bug.

Bug: 5337309
Change-Id: Iee4046420c6a88d1a07d428230f93c3ebef25c39
---
 .../com/android/inputmethod/latin/LatinIME.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 83b79f74c..224618ecc 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -895,20 +895,16 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
                 }
                 mComposingStringBuilder.setLength(0);
                 mHasUncommittedTypedChars = false;
-                if (isCursorTouchingWord()) {
-                    mHandler.cancelUpdateBigramPredictions();
-                    mHandler.postUpdateSuggestions();
-                } else {
-                    setPunctuationSuggestions();
-                }
                 TextEntryState.reset();
+                updateSuggestions();
                 final InputConnection ic = getCurrentInputConnection();
                 if (ic != null) {
                     ic.finishComposingText();
                 }
                 mVoiceProxy.setVoiceInputHighlighted(false);
-            } else if (!mHasUncommittedTypedChars && TextEntryState.isAcceptedDefault()) {
+            } else if (!mHasUncommittedTypedChars) {
                 TextEntryState.reset();
+                updateSuggestions();
             }
             mJustAddedMagicSpace = false; // The user moved the cursor.
             mJustReplacedDoubleSpace = false;
@@ -1654,6 +1650,10 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
             return;
         }
 
+        mHandler.cancelUpdateSuggestions();
+        mHandler.cancelUpdateOldSuggestions();
+        mHandler.cancelUpdateBigramPredictions();
+
         if (!mHasUncommittedTypedChars) {
             setPunctuationSuggestions();
             return;