summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2009-11-23 15:58:18 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2009-11-23 15:58:18 -0800
commitcfe90ce461eacf3ae6a8556594a0f682a31cfb84 (patch)
tree2b3012e686bd2aea7b01a128801ad33ea83c2ef4
parent44e15c44ad10b36bd3649b21ea7432348e2f05f8 (diff)
parent05799981d8d930e0b929cdb99f9407e3ee18c142 (diff)
am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-mr2 * commit '05799981d8d930e0b929cdb99f9407e3ee18c142': Fix issue #2281046: Size and pressure don't change
-rw-r--r--services/java/com/android/server/InputDevice.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/java/com/android/server/InputDevice.java b/services/java/com/android/server/InputDevice.java
index 6eb6242b31bc..7c19f243adad 100644
--- a/services/java/com/android/server/InputDevice.java
+++ b/services/java/com/android/server/InputDevice.java
@@ -288,6 +288,10 @@ public class InputDevice {
+ " weight: (" + x + "," + y + ")");
mAveragedData[ioff + MotionEvent.SAMPLE_X] = x;
mAveragedData[ioff + MotionEvent.SAMPLE_Y] = y;
+ mAveragedData[ioff + MotionEvent.SAMPLE_PRESSURE] =
+ rawData[ioff + MotionEvent.SAMPLE_PRESSURE];
+ mAveragedData[ioff + MotionEvent.SAMPLE_SIZE] =
+ rawData[ioff + MotionEvent.SAMPLE_SIZE];
}
return mAveragedData;
}