diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-07-31 18:20:20 -0700 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-07-31 18:20:20 -0700 |
| commit | 73e716f20284f929b2c0323c9e4759efe558de9d (patch) | |
| tree | 9c891ad30a487c0d84b197b2491cf38384d129c8 /java | |
| parent | 2ba975afb9529a6574148596db190b939fbc3b3f (diff) | |
| download | latinime-73e716f20284f929b2c0323c9e4759efe558de9d.tar.gz latinime-73e716f20284f929b2c0323c9e4759efe558de9d.tar.xz latinime-73e716f20284f929b2c0323c9e4759efe558de9d.zip | |
Be aware of "nm" and "noMicrophoneKey" private IME option
Bug: 4340933
Change-Id: I787108a73d4450963d644bc7070ae1672ebb4455
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index ee9eb7b00..28c91b848 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -313,7 +313,12 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha } final boolean settingsKeyEnabled = settingsValues.isSettingsKeyEnabled(editorInfo); - final boolean voiceKeyEnabled = settingsValues.isVoiceKeyEnabled(editorInfo); + final boolean noMicrophone = Utils.inPrivateImeOptions( + mPackageName, LatinIME.IME_OPTION_NO_MICROPHONE, editorInfo) + || Utils.inPrivateImeOptions( + null, LatinIME.IME_OPTION_NO_MICROPHONE_COMPAT, editorInfo); + final boolean voiceKeyEnabled = settingsValues.isVoiceKeyEnabled(editorInfo) + && !noMicrophone; final boolean voiceKeyOnMain = settingsValues.isVoiceKeyOnMain(); final boolean noSettingsKey = Utils.inPrivateImeOptions( mPackageName, LatinIME.IME_OPTION_NO_SETTINGS_KEY, editorInfo); |