Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2012-09-25 19:35:53 -07:00
committed by Android (Google) Code Review
parent 9703880d73 d736d2069b
commit e8e2b67256
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/ScaleGestureDetector.java
View File

@@ -146,7 +146,7 @@ public class ScaleGestureDetector {
private int[] mTouchHistoryDirection;
private long[] mTouchHistoryLastAcceptedTime;
private static final long TOUCH_STABILIZE_TIME = 64; // ms
private static final long TOUCH_STABILIZE_TIME = 128; // ms
/**
* Consistency verifier for debugging purposes.
@@ -192,7 +192,8 @@ public class ScaleGestureDetector {
if (hasLastAccepted) {
final int directionSig = (int) Math.signum(avg - mTouchHistoryLastAccepted[id]);
if (directionSig != mTouchHistoryDirection[id]) {
if (directionSig != mTouchHistoryDirection[id] ||
(directionSig == 0 && mTouchHistoryDirection[id] == 0)) {
mTouchHistoryDirection[id] = directionSig;
final long time = h < historySize ? ev.getHistoricalEventTime(h)
: ev.getEventTime();