diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-03 14:43:38 -0700 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-06-03 14:43:38 -0700 |
| commit | dcf7b59f845297c6e96950615e439d96ce3fb739 (patch) | |
| tree | 8b1f668536d5c2db0524e679a34d28ead17f3db1 /core/java/android/widget/EdgeEffect.java | |
| parent | 6fbe3982b035c200543454bb29b9f3e33b5e347a (diff) | |
Update theme colors, fix EditText state transition
BUG: 11218747
BUG: 15200201
Change-Id: I94368897ea9466ae971b25fc80d6ca43433aadd5
Diffstat (limited to 'core/java/android/widget/EdgeEffect.java')
| -rw-r--r-- | core/java/android/widget/EdgeEffect.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/EdgeEffect.java b/core/java/android/widget/EdgeEffect.java index c4a40b426852..b2315ffb20af 100644 --- a/core/java/android/widget/EdgeEffect.java +++ b/core/java/android/widget/EdgeEffect.java @@ -122,7 +122,7 @@ public class EdgeEffect { final TypedArray a = context.obtainStyledAttributes( com.android.internal.R.styleable.EdgeEffect); final int themeColor = a.getColor( - com.android.internal.R.styleable.EdgeEffect_colorPrimaryLight, 0xff666666); + com.android.internal.R.styleable.EdgeEffect_colorPrimary, 0xff666666); a.recycle(); mPaint.setColor((themeColor & 0xffffff) | 0x33000000); mPaint.setStyle(Paint.Style.FILL); |