nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Shortcut key is enabled on the no language keyoard"

main
Tadashi G. Takaoka 2012-10-17 17:39:50 -07:00 committed by Android (Google) Code Review
parent 5f9e008d60 723d32ad6e
commit aeae68479d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
View File

@ -194,12 +194,11 @@ public final class KeyboardLayoutSet {
final Params params = mParams; final Params params = mParams;
final boolean isSymbols = (keyboardLayoutSetElementId == KeyboardId.ELEMENT_SYMBOLS final boolean isSymbols = (keyboardLayoutSetElementId == KeyboardId.ELEMENT_SYMBOLS
|| keyboardLayoutSetElementId == KeyboardId.ELEMENT_SYMBOLS_SHIFTED); || keyboardLayoutSetElementId == KeyboardId.ELEMENT_SYMBOLS_SHIFTED);
final boolean noLanguage = SubtypeLocale.isNoLanguage(params.mSubtype); final boolean hasShortcutKey = params.mVoiceKeyEnabled
final boolean voiceKeyEnabled = params.mVoiceKeyEnabled && !noLanguage; && (isSymbols != params.mVoiceKeyOnMain);
final boolean hasShortcutKey = voiceKeyEnabled && (isSymbols != params.mVoiceKeyOnMain);
return new KeyboardId(keyboardLayoutSetElementId, params.mSubtype, params.mDeviceFormFactor, return new KeyboardId(keyboardLayoutSetElementId, params.mSubtype, params.mDeviceFormFactor,
params.mOrientation, params.mWidth, params.mMode, params.mEditorInfo, params.mOrientation, params.mWidth, params.mMode, params.mEditorInfo,
params.mNoSettingsKey, voiceKeyEnabled, hasShortcutKey, params.mNoSettingsKey, params.mVoiceKeyEnabled, hasShortcutKey,
params.mLanguageSwitchKeyEnabled); params.mLanguageSwitchKeyEnabled);
} }