am 126ac7f9: am b10e2f1a: Merge change Iac534225 into eclair

Merge commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95' into eclair-mr2-plus-aosp

* commit '126ac7f9f957c6be35d6d43f8dee1d5ee7139f95':
  Fix issue #2186709: Can't unlock the device for a while
This commit is contained in:
Dianne Hackborn
2009-10-13 20:28:32 -07:00
committed by Android Git Automerger

View File

@@ -268,6 +268,7 @@ public class InputDevice {
while (start != end) {
int soff = poff + (start*MotionEvent.NUM_SAMPLE_DATA);
int pressure = mHistoryData[soff + MotionEvent.SAMPLE_PRESSURE];
if (pressure <= 0) pressure = 1;
x += mHistoryData[soff + MotionEvent.SAMPLE_X] * pressure;
y += mHistoryData[soff + MotionEvent.SAMPLE_Y] * pressure;
totalPressure += pressure;
@@ -276,6 +277,7 @@ public class InputDevice {
}
int eoff = poff + (end*MotionEvent.NUM_SAMPLE_DATA);
int pressure = mHistoryData[eoff + MotionEvent.SAMPLE_PRESSURE];
if (pressure <= 0) pressure = 1;
x += mHistoryData[eoff + MotionEvent.SAMPLE_X] * pressure;
y += mHistoryData[eoff + MotionEvent.SAMPLE_Y] * pressure;
totalPressure += pressure;