ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Default to TOOL_TYPE_STYLUS for external stylus events."

This commit is contained in:
Michael Wright 2015-04-21 21:46:31 +00:00 committed by Android (Google) Code Review
parent 5e17a5de88 45ccacf937
commit e893dddb3f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/inputflinger/InputReader.cpp
View File

@ -6511,6 +6511,11 @@ void ExternalStylusInputMapper::sync(nsecs_t when) {
mStylusState.when = when;
mStylusState.toolType = mTouchButtonAccumulator.getToolType();
if (mStylusState.toolType == AMOTION_EVENT_TOOL_TYPE_UNKNOWN) {
mStylusState.toolType = AMOTION_EVENT_TOOL_TYPE_STYLUS;
}
int32_t pressure = mSingleTouchMotionAccumulator.getAbsolutePressure();
if (mRawPressureAxis.valid) {
mStylusState.pressure = float(pressure) / mRawPressureAxis.maxValue;
@ -6521,7 +6526,6 @@ void ExternalStylusInputMapper::sync(nsecs_t when) {
}
mStylusState.buttons = mTouchButtonAccumulator.getButtonState();
mStylusState.toolType = mTouchButtonAccumulator.getToolType();
mContext->dispatchExternalStylusState(mStylusState);
}