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

am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev

Browse Source 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
This commit is contained in:
Alan Viverette
2015-01-15 22:32:27 +00:00
committed by Android Git Automerger
parent 4772f8b841 77e1f7a27b
commit dbe5453349
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/ScrollBarDrawable.java
View File

@@ -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;
}

2
core/res/res/drawable/fastscroll_track_material.xml
View File

@@ -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>