commit b9a21448e3609599731907fab9ac8e37423e982d
author Tadashi G. Takaoka <takaoka@google.com> Wed Jul 06 19:02:24 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 06 19:02:24 2011 -0700
tree 26694ca05d3dfbfb4c0cd4c3aa3fff241c7ca3cf
parent 16add4c8867dc46a05582150d547eb2c3b1d356f
parent 88110d1799146943c627916ffaa94bbc4dd6f2ae

Merge "Clear CandidateView in onStartInputView"

java/src/com/android/inputmethod/latin/CandidateView.java

diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index 7ec18b3..e859f3a 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -701,9 +701,9 @@
         mShowingAddToDictionary = false;
         mShowingAutoCorrectionInverted = false;
         mTouchToSave.setVisibility(GONE);
-        mCandidatesStrip.setVisibility(VISIBLE);
         mCandidatesStrip.removeAllViews();
         mCandidatesPane.removeAllViews();
+        closeCandidatesPane();
     }
 
     private void hidePreview() {

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 e4eb0e7..12dad53 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -580,6 +580,8 @@
             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();