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

Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0

Browse Source
This commit is contained in:
Adam Powell
2011-10-13 13:10:14 -07:00
committed by Android (Google) Code Review
parent 534b7af027 2c5b8cc71b
commit aa79a5d5a3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/AbsSeekBar.java
View File

@@ -335,7 +335,9 @@ public abstract class AbsSeekBar extends ProgressBar {
mTouchDownX = event.getX();
} else {
setPressed(true);
invalidate(mThumb.getBounds()); // This may be within the padding region
if (mThumb != null) {
invalidate(mThumb.getBounds()); // This may be within the padding region
}
onStartTrackingTouch();
trackTouchEvent(event);
attemptClaimDrag();
@@ -349,7 +351,9 @@ public abstract class AbsSeekBar extends ProgressBar {
final float x = event.getX();
if (Math.abs(x - mTouchDownX) > mScaledTouchSlop) {
setPressed(true);
invalidate(mThumb.getBounds()); // This may be within the padding region
if (mThumb != null) {
invalidate(mThumb.getBounds()); // This may be within the padding region
}
onStartTrackingTouch();
trackTouchEvent(event);
attemptClaimDrag();