summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/ScrollBarDrawable.java10
-rw-r--r--core/res/res/drawable/fastscroll_track_material.xml2
2 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/widget/ScrollBarDrawable.java b/core/java/android/widget/ScrollBarDrawable.java
index 937457c43bc5..10e9ff4c4c31 100644
--- a/core/java/android/widget/ScrollBarDrawable.java
+++ b/core/java/android/widget/ScrollBarDrawable.java
@@ -29,6 +29,8 @@ import android.graphics.drawable.Drawable;
* {@hide}
*/
public class ScrollBarDrawable extends Drawable {
+ private static final int[] STATE_ENABLED = new int[] { android.R.attr.state_enabled };
+
private Drawable mVerticalTrack;
private Drawable mHorizontalTrack;
private Drawable mVerticalThumb;
@@ -189,21 +191,29 @@ public class ScrollBarDrawable extends Drawable {
public void setVerticalThumbDrawable(Drawable thumb) {
if (thumb != null) {
+ thumb.setState(STATE_ENABLED);
mVerticalThumb = thumb;
}
}
public void setVerticalTrackDrawable(Drawable track) {
+ if (track != null) {
+ track.setState(STATE_ENABLED);
+ }
mVerticalTrack = track;
}
public void setHorizontalThumbDrawable(Drawable thumb) {
if (thumb != null) {
+ thumb.setState(STATE_ENABLED);
mHorizontalThumb = thumb;
}
}
public void setHorizontalTrackDrawable(Drawable track) {
+ if (track != null) {
+ track.setState(STATE_ENABLED);
+ }
mHorizontalTrack = track;
}
diff --git a/core/res/res/drawable/fastscroll_track_material.xml b/core/res/res/drawable/fastscroll_track_material.xml
index 7882b0542ee8..1e3e31aff610 100644
--- a/core/res/res/drawable/fastscroll_track_material.xml
+++ b/core/res/res/drawable/fastscroll_track_material.xml
@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="?attr/colorControlNormal"
android:shape="rectangle">
- <solid android:color="#21ffffff" />
+ <solid android:color="#39ffffff" />
<size android:width="8dp" />
</shape>