diff options
author | Michael Wright <michaelwr@google.com> | 2015-06-12 15:25:08 +0100 |
---|---|---|
committer | Michael Wright <michaelwr@google.com> | 2015-06-12 15:25:08 +0100 |
commit | 2f78b68cf15c3d96eccbb242316d174ed739dc69 (patch) | |
tree | 89e0d1cd8cce9aea44ef2427b2093199b06ece1f /services/inputflinger | |
parent | 8a4222a647bd17c991959eca17a50ba911c3ab6b (diff) | |
download | frameworks_native-2f78b68cf15c3d96eccbb242316d174ed739dc69.zip frameworks_native-2f78b68cf15c3d96eccbb242316d174ed739dc69.tar.gz frameworks_native-2f78b68cf15c3d96eccbb242316d174ed739dc69.tar.bz2 |
Add new AINPUT_SOURCE_BLUETOOTH_STYLUS
Bug: 21531826
Change-Id: I3792860ad3f6579ceb50ccaa212f8fbd471a9b6b
Diffstat (limited to 'services/inputflinger')
-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 b54503e..f3cb0e6 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; |