summaryrefslogtreecommitdiffstats
path: root/services/input/InputReader.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-03-03 03:39:29 -0800
committerJeff Brown <jeffbrown@google.com>2011-03-09 18:30:28 -0800
commit9e8e40cb5f8aeb0702002eee60d1ce394bf699ee (patch)
tree7fe006882f5f36333fd9f9dcbae69801d6d41d5b /services/input/InputReader.cpp
parent18955491ee52aad9bfe6f06e46da77aed6ee092a (diff)
downloadframeworks_base-9e8e40cb5f8aeb0702002eee60d1ce394bf699ee.zip
frameworks_base-9e8e40cb5f8aeb0702002eee60d1ce394bf699ee.tar.gz
frameworks_base-9e8e40cb5f8aeb0702002eee60d1ce394bf699ee.tar.bz2
Recognize 3D joysticks. (DO NOT MERGE)
Change-Id: Idf7799ea90fa07677850d40ee1aec39220ded372
Diffstat (limited to 'services/input/InputReader.cpp')
-rw-r--r--services/input/InputReader.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp
index c620c44..3688bfc 100644
--- a/services/input/InputReader.cpp
+++ b/services/input/InputReader.cpp
@@ -945,6 +945,7 @@ void KeyboardInputMapper::process(const RawEvent* rawEvent) {
bool KeyboardInputMapper::isKeyboardOrGamepadKey(int32_t scanCode) {
return scanCode < BTN_MOUSE
|| scanCode >= KEY_OK
+ || (scanCode >= BTN_MISC && scanCode < BTN_MOUSE)
|| (scanCode >= BTN_JOYSTICK && scanCode < BTN_DIGI);
}