diff options
| author | Adam Powell <adamp@google.com> | 2011-01-15 17:23:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-15 17:23:39 -0800 |
| commit | 115ad16551c9cf9551f44cbea59f3edf83e4a340 (patch) | |
| tree | da544542e1b664e3f15af33b6738c43c59cdf013 /core/java/android | |
| parent | 39de45846cd9431e9fc1ee44591152bc566f9858 (diff) | |
| parent | b2e551711aa93a3d296ced6368e895743d43da80 (diff) | |
| download | frameworks_base-115ad16551c9cf9551f44cbea59f3edf83e4a340.zip frameworks_base-115ad16551c9cf9551f44cbea59f3edf83e4a340.tar.gz frameworks_base-115ad16551c9cf9551f44cbea59f3edf83e4a340.tar.bz2 | |
Merge "Fix bug 3355197 - Add attribute for fast scroll preview panel text color." into honeycomb
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/FastScroller.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java index d4ef044..dfa94c7 100644 --- a/core/java/android/widget/FastScroller.java +++ b/core/java/android/widget/FastScroller.java @@ -56,7 +56,7 @@ class FastScroller { private static final int[] DEFAULT_STATES = new int[0]; private static final int[] ATTRS = new int[] { - android.R.attr.textColorPrimary, + android.R.attr.fastScrollTextColor, android.R.attr.fastScrollThumbDrawable, android.R.attr.fastScrollTrackDrawable, android.R.attr.fastScrollPreviewBackgroundLeft, @@ -64,7 +64,7 @@ class FastScroller { android.R.attr.fastScrollOverlayPosition }; - private static final int PRIMARY_TEXT_COLOR = 0; + private static final int TEXT_COLOR = 0; private static final int THUMB_DRAWABLE = 1; private static final int TRACK_DRAWABLE = 2; private static final int PREVIEW_BACKGROUND_LEFT = 3; @@ -247,7 +247,7 @@ class FastScroller { mPaint.setTextAlign(Paint.Align.CENTER); mPaint.setTextSize(mOverlaySize / 2); - ColorStateList textColor = ta.getColorStateList(PRIMARY_TEXT_COLOR); + ColorStateList textColor = ta.getColorStateList(TEXT_COLOR); int textColorNormal = textColor.getDefaultColor(); mPaint.setColor(textColorNormal); mPaint.setStyle(Paint.Style.FILL_AND_STROKE); |