Apple-2-Tools/kegs-android
1
0
Fork 0
mirror of https://github.com/jamessanford/kegs.git synced 2024-06-01 07:41:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix keyboard on API 10-12 devices.

Browse Source
This commit is contained in:
James Sanford 2012-11-21 18:51:49 -08:00
parent cfd8aa1418
commit 611ed0eefc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/froop/app/kegs/KegsKeyboard.java
View File

@ -127,23 +127,23 @@ class KegsKeyboard {
// return true; // return true;
} }
if (event.getAction() == KeyEvent.ACTION_DOWN) { if (event.getAction() == KeyEvent.ACTION_DOWN) {
final int modifiers = event.getModifiers(); final int meta = event.getMetaState();
handled = keyModifiers(modifiers, false); handled = keyModifiers(meta, false);
final int keyCode = event.getKeyCode(); final int keyCode = event.getKeyCode();
if (keymap != null && keymap.isPrintingKey(keyCode)) { if (keymap != null && keymap.isPrintingKey(keyCode)) {
int meta = event.getMetaState();
// Remove meta states that we handle to get a meaningful ASCII result. // Remove meta states that we handle to get a meaningful ASCII result.
meta &= ~(KeyEvent.META_ALT_LEFT_ON | KeyEvent.META_ALT_RIGHT_ON | KeyEvent.META_ALT_ON); int reduced_meta = meta;
meta &= ~(KeyEvent.META_META_LEFT_ON | KeyEvent.META_META_RIGHT_ON | KeyEvent.META_META_ON); reduced_meta &= ~(KeyEvent.META_ALT_LEFT_ON | KeyEvent.META_ALT_RIGHT_ON | KeyEvent.META_ALT_ON);
meta &= ~(KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_CTRL_RIGHT_ON | KeyEvent.META_CTRL_ON); reduced_meta &= ~(KeyEvent.META_META_LEFT_ON | KeyEvent.META_META_RIGHT_ON | KeyEvent.META_META_ON);
int key_id = keymap.get(keyCode, meta); reduced_meta &= ~(KeyEvent.META_CTRL_LEFT_ON | KeyEvent.META_CTRL_RIGHT_ON | KeyEvent.META_CTRL_ON);
int key_id = keymap.get(keyCode, reduced_meta);
handled = handleAsciiKey(key_id) | handled; handled = handleAsciiKey(key_id) | handled;
} else { } else {
handled = handleOtherKey(keyCode) | handled; handled = handleOtherKey(keyCode) | handled;
} }
// Release any modifiers that may have been pressed. // Release any modifiers that may have been pressed.
// BUG: ACTION_UP for this is not working, so just toggle them here. // BUG: ACTION_UP for this is not working, so just toggle them here.
handled = keyModifiers(modifiers, true) | handled; handled = keyModifiers(meta, true) | handled;
} }
return handled; return handled;
} }