diff options
| author | Prashant Malani <pmalani@google.com> | 2016-01-13 18:44:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-13 18:44:02 +0000 |
| commit | cd7ddc7cac649f5630197d57bc098764c994aba6 (patch) | |
| tree | 8071c2f7e234af74883aa6d4e4fe3e2007b3f2fc | |
| parent | a777e8b70fce35e97dd8812df8b0b5eca17db550 (diff) | |
| parent | 2c09b78656dd97727f94fada81845b133cf142f3 (diff) | |
| download | frameworks_native-cd7ddc7cac649f5630197d57bc098764c994aba6.zip frameworks_native-cd7ddc7cac649f5630197d57bc098764c994aba6.tar.gz frameworks_native-cd7ddc7cac649f5630197d57bc098764c994aba6.tar.bz2 | |
Revert "inputflinger: Add support for scaling and true value reporting"
am: 2c09b78656
* commit '2c09b78656dd97727f94fada81845b133cf142f3':
Revert "inputflinger: Add support for scaling and true value reporting"
| -rw-r--r-- | services/inputflinger/InputReader.cpp | 15 | ||||
| -rw-r--r-- | services/inputflinger/InputReader.h | 1 |
2 files changed, 2 insertions, 14 deletions
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp index 8063a75..3ba38b5 100644 --- a/services/inputflinger/InputReader.cpp +++ b/services/inputflinger/InputReader.cpp @@ -2751,18 +2751,7 @@ void RotaryEncoderInputMapper::populateDeviceInfo(InputDeviceInfo* info) { InputMapper::populateDeviceInfo(info); if (mRotaryEncoderScrollAccumulator.haveRelativeVWheel()) { - float res = 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); + info->addMotionRange(AMOTION_EVENT_AXIS_SCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f, 0.0f); } } @@ -2818,7 +2807,7 @@ void RotaryEncoderInputMapper::sync(nsecs_t when) { // Send motion event. if (scrolled) { 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, AMOTION_EVENT_ACTION_SCROLL, 0, 0, metaState, 0, diff --git a/services/inputflinger/InputReader.h b/services/inputflinger/InputReader.h index 46d45d8..3e931fe 100644 --- a/services/inputflinger/InputReader.h +++ b/services/inputflinger/InputReader.h @@ -1247,7 +1247,6 @@ private: CursorScrollAccumulator mRotaryEncoderScrollAccumulator; int32_t mSource; - float mScalingFactor; void sync(nsecs_t when); }; |