diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-10-17 17:39:50 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-10-17 17:39:50 -0700 |
| commit | aeae68479dd71c2b8f63b7ca8ea01377f4402b6d (patch) | |
| tree | 89cb498b4c0a993daf181f111e110176eb3a08e6 /java/src | |
| parent | 5f9e008d60ff88b99afafded97f65d4fde7a0592 (diff) | |
| parent | 723d32ad6eab17bce2d76f4349e2146d0bbd6933 (diff) | |
| download | latinime-aeae68479dd71c2b8f63b7ca8ea01377f4402b6d.tar.gz latinime-aeae68479dd71c2b8f63b7ca8ea01377f4402b6d.tar.xz latinime-aeae68479dd71c2b8f63b7ca8ea01377f4402b6d.zip | |
Merge "Shortcut key is enabled on the no language keyoard"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java b/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java index c7813ab02..ee373e72f 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java @@ -194,12 +194,11 @@ public final class KeyboardLayoutSet { 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); } |