commit c810b0d63a6f7248d9385ee35ac37dca8f029137
author Tadashi G. Takaoka <takaoka@google.com> Wed Jul 06 19:12:39 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 06 19:12:39 2011 -0700
tree 6a1aff8816337fe5e431084889469d5f881a98af
parent b9a21448e3609599731907fab9ac8e37423e982d
parent 7c57e3bda1ab1d8c5d5df7acb8aec8c089f9240b

Merge "Make sure that each view has its own dedicated background drawable"

java/res/drawable-xhdpi/sym_keyboard_space_led_holo.9.png

diff --git a/java/res/drawable-xhdpi/sym_keyboard_space_led_holo.9.png b/java/res/drawable-xhdpi/sym_keyboard_space_led_holo.9.png
index e192aaf..ba4e9ec 100644
--- a/java/res/drawable-xhdpi/sym_keyboard_space_led_holo.9.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_space_led_holo.9.png
Binary files differ

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 8d60117..df557fb 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -703,9 +703,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();