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

Revert "inputflinger: Add support for scaling and true value reporting" 

am: 2c09b78656

* commit '2c09b78656dd97727f94fada81845b133cf142f3':
  Revert "inputflinger: Add support for scaling and true value reporting"
This commit is contained in:
Prashant Malani 2016-01-13 18:44:02 +00:00 committed by android-build-merger
parent a777e8b70f 2c09b78656
commit cd7ddc7cac
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
services/inputflinger/InputReader.cpp
View File

@ -2751,18 +2751,7 @@ void RotaryEncoderInputMapper::populateDeviceInfo(InputDeviceInfo* info) {
InputMapper::populateDeviceInfo(info); InputMapper::populateDeviceInfo(info);
if (mRotaryEncoderScrollAccumulator.haveRelativeVWheel()) { if (mRotaryEncoderScrollAccumulator.haveRelativeVWheel()) {
float res = 0.0f; info->addMotionRange(AMOTION_EVENT_AXIS_SCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
if (!mDevice->getConfiguration().tryGetProperty(String8("device.res"), res)) {
ALOGW("Rotary Encoder device configuration file didn't specify resolution!\n");
}
if (!mDevice->getConfiguration().tryGetProperty(String8("device.scalingFactor"),
mScalingFactor)) {
ALOGW("Rotary Encoder device configuration file didn't specify scaling factor,"
"default to 1.0!\n");
mScalingFactor = 1.0f;
}
info->addMotionRange(AMOTION_EVENT_AXIS_SCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f,
res * mScalingFactor);
} }
} }
@ -2818,7 +2807,7 @@ void RotaryEncoderInputMapper::sync(nsecs_t when) {
// Send motion event. // Send motion event.
if (scrolled) { if (scrolled) {
int32_t metaState = mContext->getGlobalMetaState(); int32_t metaState = mContext->getGlobalMetaState();
pointerCoords.setAxisValue(AMOTION_EVENT_AXIS_SCROLL, scroll * mScalingFactor); pointerCoords.setAxisValue(AMOTION_EVENT_AXIS_SCROLL, scroll);
NotifyMotionArgs scrollArgs(when, getDeviceId(), mSource, policyFlags, NotifyMotionArgs scrollArgs(when, getDeviceId(), mSource, policyFlags,
AMOTION_EVENT_ACTION_SCROLL, 0, 0, metaState, 0, AMOTION_EVENT_ACTION_SCROLL, 0, 0, metaState, 0,

1
services/inputflinger/InputReader.h
View File

@ -1247,7 +1247,6 @@ private:
CursorScrollAccumulator mRotaryEncoderScrollAccumulator; CursorScrollAccumulator mRotaryEncoderScrollAccumulator;
int32_t mSource; int32_t mSource;
float mScalingFactor;
void sync(nsecs_t when); void sync(nsecs_t when);
}; };