commit 99008f317d1c4b3462170594fb25ed443544e54d
author Prashant Malani <pmalani@google.com> Wed Jan 13 18:53:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 13 18:53:32 2016 +0000
tree 93dec7e26544e16a0470dda52eeb145eacfc9286
parent 522628219e5860eecc469ae6b396fe28e8577e09
parent 63da2d70828a817e2afd79d0a0f27a64723984c0

Revert "inputflinger: Add support for scaling and true value reporting" am: 2c09b78656 am: cd7ddc7cac am: 918263dac8
am: 63da2d7082

* commit '63da2d70828a817e2afd79d0a0f27a64723984c0':
  Revert "inputflinger: Add support for scaling and true value reporting"

services/inputflinger/InputReader.cpp

diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index 8556c23..e9914ec 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -2753,18 +2753,7 @@
     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);
     }
 }
 
@@ -2820,7 +2809,7 @@
     // 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,

services/inputflinger/InputReader.h

diff --git a/services/inputflinger/InputReader.h b/services/inputflinger/InputReader.h
index e554e57..1de9d19 100644
--- a/services/inputflinger/InputReader.h
+++ b/services/inputflinger/InputReader.h
@@ -1247,7 +1247,6 @@
     CursorScrollAccumulator mRotaryEncoderScrollAccumulator;
 
     int32_t mSource;
-    float mScalingFactor;
 
     void sync(nsecs_t when);
 };