am a042150a: Merge "Just ignore settings/shortcut key while typing on tablet"
* commit 'a042150a697715ca0b65fcc1a03fcc3491c488a2': Just ignore settings/shortcut key while typing on tabletmain
commit
be6d5a041c
|
@ -23,6 +23,7 @@
|
|||
<integer name="key_tab">9</integer>
|
||||
<integer name="key_return">10</integer>
|
||||
<integer name="key_space">32</integer>
|
||||
<integer name="key_dummy">0</integer>
|
||||
<integer name="key_shift">-1</integer>
|
||||
<integer name="key_switch_alpha_symbol">-2</integer>
|
||||
<integer name="key_delete">-5</integer>
|
||||
|
|
|
@ -78,14 +78,14 @@
|
|||
latin:code="@integer/key_shortcut"
|
||||
latin:keyIcon="iconShortcutKey"
|
||||
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
|
||||
latin:altCode="@integer/key_space"
|
||||
latin:altCode="@integer/key_dummy"
|
||||
latin:parentStyle="f2PopupStyle" />
|
||||
<key-style
|
||||
latin:styleName="settingsKeyStyle"
|
||||
latin:code="@integer/key_settings"
|
||||
latin:keyIcon="iconSettingsKey"
|
||||
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
|
||||
latin:altCode="@integer/key_space"
|
||||
latin:altCode="@integer/key_dummy"
|
||||
latin:backgroundType="functional" />
|
||||
<key-style
|
||||
latin:styleName="tabKeyStyle"
|
||||
|
|
|
@ -60,14 +60,14 @@
|
|||
latin:code="@integer/key_shortcut"
|
||||
latin:keyIcon="iconShortcutKey"
|
||||
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
|
||||
latin:altCode="@integer/key_space"
|
||||
latin:altCode="@integer/key_dummy"
|
||||
latin:backgroundType="functional" />
|
||||
<key-style
|
||||
latin:styleName="settingsKeyStyle"
|
||||
latin:code="@integer/key_settings"
|
||||
latin:keyIcon="iconSettingsKey"
|
||||
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
|
||||
latin:altCode="@integer/key_space"
|
||||
latin:altCode="@integer/key_dummy"
|
||||
latin:backgroundType="functional" />
|
||||
<key-style
|
||||
latin:styleName="tabKeyStyle"
|
||||
|
|
|
@ -151,6 +151,9 @@ public class Keyboard {
|
|||
}
|
||||
|
||||
public Key getKey(int code) {
|
||||
if (code == CODE_DUMMY) {
|
||||
return null;
|
||||
}
|
||||
final Integer keyCode = code;
|
||||
if (mKeyCache.containsKey(keyCode)) {
|
||||
return mKeyCache.get(keyCode);
|
||||
|
|
Loading…
Reference in New Issue