commit 2afc2adb01d817ecd302f9b524975a62cb103ef7
author Tadashi G. Takaoka <takaoka@google.com> Sun Jul 31 18:43:17 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jul 31 18:43:17 2011 -0700
tree 686da72b2f37643556a23f383fe9e509ac70fbd2
parent 73e716f20284f929b2c0323c9e4759efe558de9d
parent 0c6e57f2d1ced7eb01bec1194d8e77991a26ae7a

Merge "Eliminate "..." from the key that has no popup mini keyboard automatically"

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 ee9eb7b..28c91b8 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -313,7 +313,12 @@
         }
 
         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);