diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values-xlarge/donottranslate.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/java/res/values-xlarge/donottranslate.xml b/java/res/values-xlarge/donottranslate.xml index 6f4e9b1f0..672dea589 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> diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 25ef847cd..42af8a8d6 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -174,12 +174,6 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha 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 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha 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)); } |