Merge commit '71997c1a' into manualmerge
Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
This commit is contained in:
commit
7d3ad69530
@ -807,6 +807,8 @@ enum {
|
||||
AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
|
||||
/** stylus */
|
||||
AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
|
||||
/** bluetooth stylus */
|
||||
AINPUT_SOURCE_BLUETOOTH_STYLUS = 0x00008000 | AINPUT_SOURCE_STYLUS,
|
||||
/** trackball */
|
||||
AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
|
||||
/** touchpad */
|
||||
|
@ -3104,9 +3104,12 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) {
|
||||
&& mParameters.hasAssociatedDisplay) {
|
||||
mSource = AINPUT_SOURCE_TOUCHSCREEN;
|
||||
mDeviceMode = DEVICE_MODE_DIRECT;
|
||||
if (hasStylus() || hasExternalStylus()) {
|
||||
if (hasStylus()) {
|
||||
mSource |= AINPUT_SOURCE_STYLUS;
|
||||
}
|
||||
if (hasExternalStylus()) {
|
||||
mSource |= AINPUT_SOURCE_BLUETOOTH_STYLUS;
|
||||
}
|
||||
} else if (mParameters.deviceType == Parameters::DEVICE_TYPE_TOUCH_NAVIGATION) {
|
||||
mSource = AINPUT_SOURCE_TOUCH_NAVIGATION;
|
||||
mDeviceMode = DEVICE_MODE_NAVIGATION;
|
||||
|
Loading…
Reference in New Issue
Block a user