diff options
| author | Adam Powell <adamp@google.com> | 2012-09-25 19:35:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-25 19:35:54 -0700 |
| commit | e8e2b672563fed2820e392de48226acf894cf06b (patch) | |
| tree | 534f01369bb6ba8025ae6022238ce7e9c8d17977 /core/java/android | |
| parent | 9703880d735b331621d599518a9b0e02c78d0a8c (diff) | |
| parent | d736d2069b94348b519089348f4a85eb482db668 (diff) | |
Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index d97e335657c7..123ce2a92d9b 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -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(); |