commit a0ff76638ca703840556a0c7c21e3443a0b9451d
author Tadashi G. Takaoka <takaoka@google.com> Mon Jan 17 05:49:00 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 17 05:49:00 2011 -0800
tree c1ddf65feb129c17c39ba418d552b10390e37543
parent 8cc6e8e5c3d9028d33256c0add7ecbb4cd9270b3
parent 04f815eca4088ece879b1d9fb482bb7a342bfe4f

Merge "Make sure that keyboard is not displayed when voice mode" into honeycomb

java/res/values-xlarge/donottranslate.xml

diff --git a/java/res/values-xlarge/donottranslate.xml b/java/res/values-xlarge/donottranslate.xml
index 6f4e9b1..672dea5 100644
--- a/java/res/values-xlarge/donottranslate.xml
+++ b/java/res/values-xlarge/donottranslate.xml
@@ -19,5 +19,5 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!--  Default value of the visibility of the suggestion strip -->
-    <string name="prefs_suggestion_visibility_default_value" translatable="false">1</string>
+    <string name="prefs_suggestion_visibility_default_value" translatable="false">2</string>
 </resources>

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 25ef847..42af8a8 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -174,12 +174,6 @@
     private void loadKeyboardInternal(int mode, int imeOptions, boolean voiceButtonEnabled,
             boolean voiceButtonOnPrimary, boolean isSymbols) {
         if (mInputView == null) return;
-        final Keyboard oldKeyboard = mInputView.getKeyboard();
-        final KeyboardId id = getKeyboardId(mode, imeOptions, isSymbols);
-        if (oldKeyboard != null && oldKeyboard.mId.equals(id))
-            return;
-
-        mInputView.setPreviewEnabled(mInputMethodService.getPopupOn());
 
         mMode = mode;
         mImeOptions = imeOptions;
@@ -188,9 +182,15 @@
         mIsSymbols = isSymbols;
         // Update the settings key state because number of enabled IMEs could have been changed
         mHasSettingsKey = getSettingsKeyMode(mPrefs, mInputMethodService);
-        makeSymbolsKeyboardIds();
+        final KeyboardId id = getKeyboardId(mode, imeOptions, isSymbols);
 
+        final Keyboard oldKeyboard = mInputView.getKeyboard();
+        if (oldKeyboard != null && oldKeyboard.mId.equals(id))
+            return;
+
+        makeSymbolsKeyboardIds();
         mCurrentId = id;
+        mInputView.setPreviewEnabled(mInputMethodService.getPopupOn());
         mInputView.setKeyboard(getKeyboard(id));
     }