From 88110d1799146943c627916ffaa94bbc4dd6f2ae Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 6 Jul 2011 17:57:24 -0700
Subject: Clear CandidateView in onStartInputView

Before starting input on new TextView, we must clear the CandidateView
because it may hold the suggestion of previous TextView or even worse
the suggestions pane has been expanded and keyboard has been hidden.

Bug: 4995414
Change-Id: If848320c1a510e7018d36ed8ac61291be2fc6ce5
---
 java/src/com/android/inputmethod/latin/CandidateView.java | 2 +-
 java/src/com/android/inputmethod/latin/LatinIME.java      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'java/src')

diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index 7ec18b38a..e859f3acf 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -701,9 +701,9 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
         mShowingAddToDictionary = false;
         mShowingAutoCorrectionInverted = false;
         mTouchToSave.setVisibility(GONE);
-        mCandidatesStrip.setVisibility(VISIBLE);
         mCandidatesStrip.removeAllViews();
         mCandidatesPane.removeAllViews();
+        closeCandidatesPane();
     }
 
     private void hidePreview() {
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e4eb0e7bf..12dad534f 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -580,6 +580,8 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
             switcher.updateShiftState();
         }
 
+        if (mCandidateView != null)
+            mCandidateView.clear();
         setSuggestionStripShownInternal(isCandidateStripVisible(), /* needsInputViewShown */ false);
         // Delay updating suggestions because keyboard input view may not be shown at this point.
         mHandler.postUpdateSuggestions();
-- 
cgit v1.2.3-83-g751a