summaryrefslogtreecommitdiff
path: root/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-07-22 02:41:31 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-22 02:41:31 -0700
commitf3e76883612173f94a8f50b415b8ec89c79766ba (patch)
tree5fdc6a31363642e2e1ad24b33cd40576605a5213 /java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
parenta1778b9c84dd8085d9019485a0e70dc103595bce (diff)
parent255486a5d067469e074f3649b3d2747e7a08aaa2 (diff)
Merge "Disable VoiceInputLogger inside LatinIME"
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 37c501468..52ecfe236 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -148,11 +148,11 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
}
}
- public void loadKeyboard(EditorInfo attribute, boolean voiceKeyEnabled,
- boolean voiceButtonOnPrimary) {
+ public void loadKeyboard(EditorInfo attribute, Settings.Values settings) {
mSwitchState = SWITCH_STATE_ALPHA;
try {
- loadKeyboardInternal(attribute, voiceKeyEnabled, voiceButtonOnPrimary, false);
+ loadKeyboardInternal(attribute, settings.isVoiceButtonEnabled(attribute),
+ settings.isVoiceButtonOnPrimary(), false);
} catch (RuntimeException e) {
// Get KeyboardId to record which keyboard has been failed to load.
final KeyboardId id = getKeyboardId(attribute, false);