diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-08-26 18:38:46 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-08-26 18:38:46 -0700 |
| commit | deffe07c225c15ce780fad4a500d082f2dbdabea (patch) | |
| tree | a7ff5ec9cf65f51258d2202b3e26902e247d9b7a /services/input | |
| parent | 9b9783ad60d31f3df5d2524e13abc1437d5b6f7d (diff) | |
| download | frameworks_base-deffe07c225c15ce780fad4a500d082f2dbdabea.zip frameworks_base-deffe07c225c15ce780fad4a500d082f2dbdabea.tar.gz frameworks_base-deffe07c225c15ce780fad4a500d082f2dbdabea.tar.bz2 | |
Prioritize INPUT_PROP_DIRECT first.
If the device tells us it's really direct, then it's direct.
Change-Id: I83875cf47e865ff6f0def149ad0c68db24d9dc4a
Diffstat (limited to 'services/input')
| -rw-r--r-- | services/input/InputReader.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index bfcf8e0..6ff05c9 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -2523,17 +2523,17 @@ void TouchInputMapper::configureParameters() { } } - if (getEventHub()->hasRelativeAxis(getDeviceId(), REL_X) + if (getEventHub()->hasInputProperty(getDeviceId(), INPUT_PROP_DIRECT)) { + // The device is a touch screen. + mParameters.deviceType = Parameters::DEVICE_TYPE_TOUCH_SCREEN; + } else if (getEventHub()->hasInputProperty(getDeviceId(), INPUT_PROP_POINTER)) { + // The device is a pointing device like a track pad. + mParameters.deviceType = Parameters::DEVICE_TYPE_POINTER; + } else if (getEventHub()->hasRelativeAxis(getDeviceId(), REL_X) || getEventHub()->hasRelativeAxis(getDeviceId(), REL_Y)) { // The device is a cursor device with a touch pad attached. // By default don't use the touch pad to move the pointer. mParameters.deviceType = Parameters::DEVICE_TYPE_TOUCH_PAD; - } else if (getEventHub()->hasInputProperty(getDeviceId(), INPUT_PROP_POINTER)) { - // The device is a pointing device like a track pad. - mParameters.deviceType = Parameters::DEVICE_TYPE_POINTER; - } else if (getEventHub()->hasInputProperty(getDeviceId(), INPUT_PROP_DIRECT)) { - // The device is a touch screen. - mParameters.deviceType = Parameters::DEVICE_TYPE_TOUCH_SCREEN; } else { // The device is a touch pad of unknown purpose. mParameters.deviceType = Parameters::DEVICE_TYPE_POINTER; |