author | Michael Wu <mwu@mozilla.com> |
Fri, 06 Apr 2012 03:01:07 -0700 | |
changeset 91156 | ff3f6dc5547240c685c391294934ab315fd1cf2f |
parent 91155 | 182a625801b4901848d61714ab00e4f0fa593091 |
child 91157 | c8e611f3872a94662571d8dc6e3db0eb0620244f |
push id | 8052 |
push user | mwu@mozilla.com |
push date | Fri, 06 Apr 2012 10:01:43 +0000 |
treeherder | mozilla-inbound@ff3f6dc55472 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | cjones |
bugs | 741038 |
milestone | 14.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/widget/gonk/libui/EventHub.cpp +++ b/widget/gonk/libui/EventHub.cpp @@ -965,19 +965,20 @@ status_t EventHub::openDeviceLocked(cons // See if this is a touch pad. // Is this a new modern multi-touch driver? if (test_bit(ABS_MT_POSITION_X, device->absBitmask) && test_bit(ABS_MT_POSITION_Y, device->absBitmask)) { // Some joysticks such as the PS3 controller report axes that conflict // with the ABS_MT range. Try to confirm that the device really is // a touch screen. - if (test_bit(BTN_TOUCH, device->keyBitmask) || !haveGamepadButtons) { + // Mozilla Bug 741038 - support GB touchscreen drivers + //if (test_bit(BTN_TOUCH, device->keyBitmask) || !haveGamepadButtons) { device->classes |= INPUT_DEVICE_CLASS_TOUCH | INPUT_DEVICE_CLASS_TOUCH_MT; - } + //} // Is this an old style single-touch driver? } else if (test_bit(BTN_TOUCH, device->keyBitmask) && test_bit(ABS_X, device->absBitmask) && test_bit(ABS_Y, device->absBitmask)) { device->classes |= INPUT_DEVICE_CLASS_TOUCH; } // See if this device is a joystick.