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

am a042150a: Merge "Just ignore settings/shortcut key while typing on tablet" 

* commit 'a042150a697715ca0b65fcc1a03fcc3491c488a2':
  Just ignore settings/shortcut key while typing on tablet
main
Tadashi G. Takaoka 2011-12-15 10:08:29 -08:00 committed by Android Git Automerger
parent e3297a79ff a042150a69
commit be6d5a041c
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values/keycodes.xml
View File

@ -23,6 +23,7 @@
<integer name="key_tab">9</integer> <integer name="key_tab">9</integer>
<integer name="key_return">10</integer> <integer name="key_return">10</integer>
<integer name="key_space">32</integer> <integer name="key_space">32</integer>
<integer name="key_dummy">0</integer>
<integer name="key_shift">-1</integer> <integer name="key_shift">-1</integer>
<integer name="key_switch_alpha_symbol">-2</integer> <integer name="key_switch_alpha_symbol">-2</integer>
<integer name="key_delete">-5</integer> <integer name="key_delete">-5</integer>

4
java/res/xml-sw600dp/kbd_key_styles.xml
View File

@ -78,14 +78,14 @@
latin:code="@integer/key_shortcut" latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey" latin:keyIcon="iconShortcutKey"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="@integer/key_space" latin:altCode="@integer/key_dummy"
latin:parentStyle="f2PopupStyle" /> latin:parentStyle="f2PopupStyle" />
<key-style <key-style
latin:styleName="settingsKeyStyle" latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings" latin:code="@integer/key_settings"
latin:keyIcon="iconSettingsKey" latin:keyIcon="iconSettingsKey"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="@integer/key_space" latin:altCode="@integer/key_dummy"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<key-style <key-style
latin:styleName="tabKeyStyle" latin:styleName="tabKeyStyle"

4
java/res/xml-sw768dp/kbd_key_styles.xml
View File

@ -60,14 +60,14 @@
latin:code="@integer/key_shortcut" latin:code="@integer/key_shortcut"
latin:keyIcon="iconShortcutKey" latin:keyIcon="iconShortcutKey"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="@integer/key_space" latin:altCode="@integer/key_dummy"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<key-style <key-style
latin:styleName="settingsKeyStyle" latin:styleName="settingsKeyStyle"
latin:code="@integer/key_settings" latin:code="@integer/key_settings"
latin:keyIcon="iconSettingsKey" latin:keyIcon="iconSettingsKey"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping" latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
latin:altCode="@integer/key_space" latin:altCode="@integer/key_dummy"
latin:backgroundType="functional" /> latin:backgroundType="functional" />
<key-style <key-style
latin:styleName="tabKeyStyle" latin:styleName="tabKeyStyle"

3
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -151,6 +151,9 @@ public class Keyboard {
} }
public Key getKey(int code) { public Key getKey(int code) {
if (code == CODE_DUMMY) {
return null;
}
final Integer keyCode = code; final Integer keyCode = code;
if (mKeyCache.containsKey(keyCode)) { if (mKeyCache.containsKey(keyCode)) {
return mKeyCache.get(keyCode); return mKeyCache.get(keyCode);