summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Koh <justinkoh@google.com>2012-10-08 10:54:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-08 10:54:32 -0700
commit4e6e0ace3309d74b582e2d18e7df5e788beeb5da (patch)
tree88ce5299617f468edef23b393f7f1cc63bfd51d6
parent1c5b2da526edae2ac97872643549fb099e68333e (diff)
parent1a7cfd67c2b3f789e6be420958dff60034884491 (diff)
downloadframeworks_base-4e6e0ace3309d74b582e2d18e7df5e788beeb5da.zip
frameworks_base-4e6e0ace3309d74b582e2d18e7df5e788beeb5da.tar.gz
frameworks_base-4e6e0ace3309d74b582e2d18e7df5e788beeb5da.tar.bz2
am 1a7cfd67: Merge "Fix for the clearing of fling events" into jb-mr1-aah-dev
* commit '1a7cfd67c2b3f789e6be420958dff60034884491': Fix for the clearing of fling events
-rw-r--r--core/java/android/view/SimulatedTrackball.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/SimulatedTrackball.java b/core/java/android/view/SimulatedTrackball.java
index 88cc74f..1878e28 100644
--- a/core/java/android/view/SimulatedTrackball.java
+++ b/core/java/android/view/SimulatedTrackball.java
@@ -132,7 +132,7 @@ class SimulatedTrackball {
mLastMoveX = 0;
mLastMoveY = 0;
// Clear any flings
- mHandler.removeMessages(0);
+ mHandler.removeMessages(FLICK_MSG_ID);
break;
case MotionEvent.ACTION_HOVER_MOVE:
// Determine whether the move is slop or an intentional move