commit 723d32ad6eab17bce2d76f4349e2146d0bbd6933
author Tadashi G. Takaoka <takaoka@google.com> Wed Oct 17 16:27:43 2012 -0700
committer Tadashi G. Takaoka <takaoka@google.com> Wed Oct 17 16:27:43 2012 -0700
tree ace3729b638bd9d454a04b43fd3c86dedfba84c5
parent 3e37b22fa7287c05ca71ba1a5753d630bc6626b4

Shortcut key is enabled on the no language keyoard

Bug: 6617754
Change-Id: Id8336f152456367320de3151823691eebc2e02f6

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

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java b/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
index c7813ab..ee373e7 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
@@ -194,12 +194,11 @@
         final Params params = mParams;
         final boolean isSymbols = (keyboardLayoutSetElementId == KeyboardId.ELEMENT_SYMBOLS
                 || keyboardLayoutSetElementId == KeyboardId.ELEMENT_SYMBOLS_SHIFTED);
-        final boolean noLanguage = SubtypeLocale.isNoLanguage(params.mSubtype);
-        final boolean voiceKeyEnabled = params.mVoiceKeyEnabled && !noLanguage;
-        final boolean hasShortcutKey = voiceKeyEnabled && (isSymbols != params.mVoiceKeyOnMain);
+        final boolean hasShortcutKey = params.mVoiceKeyEnabled
+                && (isSymbols != params.mVoiceKeyOnMain);
         return new KeyboardId(keyboardLayoutSetElementId, params.mSubtype, params.mDeviceFormFactor,
                 params.mOrientation, params.mWidth, params.mMode, params.mEditorInfo,
-                params.mNoSettingsKey, voiceKeyEnabled, hasShortcutKey,
+                params.mNoSettingsKey, params.mVoiceKeyEnabled, hasShortcutKey,
                 params.mLanguageSwitchKeyEnabled);
     }