summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-04-05 09:57:03 -0700
committerMarco Nelissen <marcone@google.com>2012-04-05 09:58:35 -0700
commitd9fc04055aed9130f02627a73414ee12865a473d (patch)
treee65cc994a25550dbb22a401b0e9f160e88bc8ad1 /src/com
parent8a8da3e6b6a9e8cf364d4367231bc4912b65bb77 (diff)
downloadplatform_packages_apps_MusicFX-jb-dev.tar.gz
platform_packages_apps_MusicFX-jb-dev.tar.bz2
platform_packages_apps_MusicFX-jb-dev.zip
Change-Id: I9dfa893b0b7d4d2c235986b422c8c873babedb01
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/musicfx/seekbar/AbsSeekBar.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/musicfx/seekbar/AbsSeekBar.java b/src/com/android/musicfx/seekbar/AbsSeekBar.java
index 35e0e80..00ad580 100644
--- a/src/com/android/musicfx/seekbar/AbsSeekBar.java
+++ b/src/com/android/musicfx/seekbar/AbsSeekBar.java
@@ -53,6 +53,7 @@ public abstract class AbsSeekBar extends ProgressBar {
private int mScaledTouchSlop;
private float mTouchDownX;
+ private float mTouchDownY;
private boolean mIsDragging;
public AbsSeekBar(Context context) {
@@ -403,6 +404,7 @@ public abstract class AbsSeekBar extends ProgressBar {
case MotionEvent.ACTION_DOWN:
if (isInScrollingContainer()) {
mTouchDownX = event.getX();
+ mTouchDownY = event.getY();
} else {
setPressed(true);
if (mThumb != null) {
@@ -419,7 +421,9 @@ public abstract class AbsSeekBar extends ProgressBar {
trackTouchEvent(event);
} else {
final float x = event.getX();
- if (Math.abs(x - mTouchDownX) > mScaledTouchSlop) {
+ final float y = event.getX();
+ if (Math.abs(mIsVertical ?
+ (y - mTouchDownY) : (x - mTouchDownX)) > mScaledTouchSlop) {
setPressed(true);
if (mThumb != null) {
invalidate(mThumb.getBounds()); // This may be within the padding region