diff options
| author | Adam Powell <adamp@google.com> | 2011-10-13 11:44:38 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2011-10-13 11:44:38 -0700 |
| commit | 2c5b8cc71bc8ac1efa944568c1292929073bbc36 (patch) | |
| tree | 7f2db930baad9518783c67da8e3162216c349537 /core | |
| parent | a6708c6a462d2a30e51e7ded2559a4054cb651fc (diff) | |
| download | frameworks_base-2c5b8cc71bc8ac1efa944568c1292929073bbc36.zip frameworks_base-2c5b8cc71bc8ac1efa944568c1292929073bbc36.tar.gz frameworks_base-2c5b8cc71bc8ac1efa944568c1292929073bbc36.tar.bz2 | |
Fix bug 5455676 - seek bars without thumbs
Change-Id: I9a4257b91a89cceeca7d5acf9358a8254446c784
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/widget/AbsSeekBar.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/widget/AbsSeekBar.java b/core/java/android/widget/AbsSeekBar.java index 475b8ee..bdaf89e 100644 --- a/core/java/android/widget/AbsSeekBar.java +++ b/core/java/android/widget/AbsSeekBar.java @@ -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(); |