Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev

Browse Source
This commit is contained in:
Satoshi Kataoka
2013-07-09 17:20:37 +00:00
committed by Android (Google) Code Review
parent ea4193efaa 02a44f7d47
commit b7925f2219
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/input/EventHub.cpp
View File

@@ -1188,6 +1188,11 @@ status_t EventHub::openDeviceLocked(const char *devicePath) {
mBuiltInKeyboardId = device->id; 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. // See if this device has a DPAD.
if (hasKeycodeLocked(device, AKEYCODE_DPAD_UP) && if (hasKeycodeLocked(device, AKEYCODE_DPAD_UP) &&
hasKeycodeLocked(device, AKEYCODE_DPAD_DOWN) && hasKeycodeLocked(device, AKEYCODE_DPAD_DOWN) &&
@@ -1205,14 +1210,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 // Disable kernel key repeat since we handle it ourselves
unsigned int repeatRate[] = {0,0}; unsigned int repeatRate[] = {0,0};
if (ioctl(fd, EVIOCSREP, repeatRate)) { if (ioctl(fd, EVIOCSREP, repeatRate)) {