diff options
| author | 2015-06-23 12:49:28 +0000 | |
|---|---|---|
| committer | 2015-06-23 12:49:30 +0000 | |
| commit | 71997c1a921b8d55cff4581fe29743553654912b (patch) | |
| tree | ce6288af486e86187e598562a3a3686144271cbb /services/inputflinger/InputReader.cpp | |
| parent | 18c773307ad7ec017b1bdaed0be9323faad9986f (diff) | |
| parent | 2f78b68cf15c3d96eccbb242316d174ed739dc69 (diff) | |
Merge "Add new AINPUT_SOURCE_BLUETOOTH_STYLUS" into mnc-dev
Diffstat (limited to 'services/inputflinger/InputReader.cpp')
| -rw-r--r-- | services/inputflinger/InputReader.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp index b54503eaac..f3cb0e6e23 100644 --- a/services/inputflinger/InputReader.cpp +++ b/services/inputflinger/InputReader.cpp @@ -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; |