commit 8c08a49895ee53b798f72190e8fc642f8686b8ef
author Jean Chalard <jchalard@google.com> Mon May 23 02:34:48 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 23 02:34:48 2011 -0700
tree c875e0f360004f41791268bf335b0e66231bd785
parent 3a38fef7a0a8f3b2864a597fee706422be1255ae
parent ed8c29568dd0fba78fe7c7a9edec60ef6347d2a6

Merge "Squash case for bigram insertion/lookup."

java/res/drawable-hdpi/btn_center_default.9.png

diff --git a/java/res/drawable-hdpi/btn_center_default.9.png b/java/res/drawable-hdpi/btn_center_default.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-hdpi/btn_center_pressed.9.png

diff --git a/java/res/drawable-hdpi/btn_center_pressed.9.png b/java/res/drawable-hdpi/btn_center_pressed.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png

diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png

diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png

diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png

diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png

diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png

diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-mdpi/btn_center_default.9.png

diff --git a/java/res/drawable-mdpi/btn_center_default.9.png b/java/res/drawable-mdpi/btn_center_default.9.png
old mode 100755
new mode 100644
Binary files differ

java/res/drawable-mdpi/btn_center_pressed.9.png

diff --git a/java/res/drawable-mdpi/btn_center_pressed.9.png b/java/res/drawable-mdpi/btn_center_pressed.9.png
old mode 100755
new mode 100644
Binary files differ

java/src/com/android/inputmethod/deprecated/VoiceProxy.java

diff --git a/java/src/com/android/inputmethod/deprecated/VoiceProxy.java b/java/src/com/android/inputmethod/deprecated/VoiceProxy.java
index 1f2f4fb..7ea4165 100644
--- a/java/src/com/android/inputmethod/deprecated/VoiceProxy.java
+++ b/java/src/com/android/inputmethod/deprecated/VoiceProxy.java
@@ -137,8 +137,8 @@
                 @Override
                 public void showHint(int viewResource) {
                     View view = LayoutInflater.from(mService).inflate(viewResource, null);
-                    mService.setCandidatesView(view);
-                    mService.setCandidatesViewShown(true);
+//                    mService.setCandidatesView(view);
+//                    mService.setCandidatesViewShown(true);
                     mIsShowingHint = true;
                 }
               });
@@ -441,7 +441,7 @@
             }
             builder.setTypedWordValid(true).setHasMinimalSuggestion(true);
             mService.setSuggestions(builder.build());
-            mService.setCandidatesViewShown(true);
+//            mService.setCandidatesViewShown(true);
             return true;
         }
         return false;
@@ -526,7 +526,7 @@
         mHandler.post(new Runnable() {
             @Override
             public void run() {
-                mService.setCandidatesViewShown(false);
+//                mService.setCandidatesViewShown(false);
                 mRecognizing = true;
                 mVoiceInput.newView();
                 View v = mVoiceInput.getView();

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 6562595..edf84e4 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1420,9 +1420,9 @@
     }
 
     public void setSuggestions(SuggestedWords words) {
-        if (mVoiceProxy.getAndResetIsShowingHint()) {
-             setCandidatesView(mCandidateViewContainer);
-        }
+//        if (mVoiceProxy.getAndResetIsShowingHint()) {
+//             setCandidatesView(mCandidateViewContainer);
+//        }
 
         if (mCandidateView != null) {
             mCandidateView.setSuggestions(words);