diff options
author | Dianne Hackborn <hackbod@android.com> | 2012-04-24 16:08:22 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-24 16:08:22 -0700 |
commit | c3742a18a6106f9c61eba16b00d15efa88f6f51a (patch) | |
tree | 48f5d283e0dd7fb6e793746427954b201fcc47fa /services | |
parent | 0430ce908510f501276e7f588ba5c34d33a9d27a (diff) | |
parent | 7086cd5c75073b75cd4a7d61aaa9f0529450e4e5 (diff) | |
download | frameworks_base-c3742a18a6106f9c61eba16b00d15efa88f6f51a.zip frameworks_base-c3742a18a6106f9c61eba16b00d15efa88f6f51a.tar.gz frameworks_base-c3742a18a6106f9c61eba16b00d15efa88f6f51a.tar.bz2 |
am 7086cd5c: am 5600deb7: am d26a8b73: am cda8329e: Merge "Distance max set incorrectly"
* commit '7086cd5c75073b75cd4a7d61aaa9f0529450e4e5':
Distance max set incorrectly
Diffstat (limited to 'services')
-rw-r--r-- | services/input/InputReader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index 6022f10..c6b701f 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -3143,7 +3143,7 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { mOrientedRanges.distance.min = mRawPointerAxes.distance.minValue * mDistanceScale; mOrientedRanges.distance.max = - mRawPointerAxes.distance.minValue * mDistanceScale; + mRawPointerAxes.distance.maxValue * mDistanceScale; mOrientedRanges.distance.flat = 0; mOrientedRanges.distance.fuzz = mRawPointerAxes.distance.fuzz * mDistanceScale; |