diff options
| author | Ken Wakasa <kwakasa@google.com> | 2013-07-05 04:08:36 +0000 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2013-07-05 04:08:36 +0000 |
| commit | 02a44f7d4715bf876aad6b420a0c7c1782965aa0 (patch) | |
| tree | eb5e4f663f0fc3ce1ff6fe7cdc217ace356c67bb /services | |
| parent | 74c8fb601ef75d8e12df5221489c41c125e3b846 (diff) | |
| download | frameworks_base-02a44f7d4715bf876aad6b420a0c7c1782965aa0.zip frameworks_base-02a44f7d4715bf876aad6b420a0c7c1782965aa0.tar.gz frameworks_base-02a44f7d4715bf876aad6b420a0c7c1782965aa0.tar.bz2 | |
Revert "Stop marking gamepads as keyboards"
This reverts commit 74c8fb601ef75d8e12df5221489c41c125e3b846.
Change-Id: If8ca4d09b4d52f11d48dabebf2dff2984760cdc0
bug: 8896129
Diffstat (limited to 'services')
| -rw-r--r-- | services/input/EventHub.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp index a2443e7..0773afb 100644 --- a/services/input/EventHub.cpp +++ b/services/input/EventHub.cpp @@ -1162,6 +1162,11 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { mBuiltInKeyboardId = device->id; } + // 'Q' key support = cheap test of whether this is an alpha-capable kbd + if (hasKeycodeLocked(device, AKEYCODE_Q)) { + device->classes |= INPUT_DEVICE_CLASS_ALPHAKEY; + } + // See if this device has a DPAD. if (hasKeycodeLocked(device, AKEYCODE_DPAD_UP) && hasKeycodeLocked(device, AKEYCODE_DPAD_DOWN) && @@ -1179,14 +1184,6 @@ status_t EventHub::openDeviceLocked(const char *devicePath) { } } - // 'Q' key support = cheap test of whether this is an alpha-capable kbd. Many gamepads will - // report a broader set of HID usages than they need, however, so we only want to mark this - // device as a keyboard if it is not a gamepad. - if (hasKeycodeLocked(device, AKEYCODE_Q) && - !(device->classes & INPUT_DEVICE_CLASS_GAMEPAD)) { - device->classes |= INPUT_DEVICE_CLASS_ALPHAKEY; - } - // Disable kernel key repeat since we handle it ourselves unsigned int repeatRate[] = {0,0}; if (ioctl(fd, EVIOCSREP, repeatRate)) { |