diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-25 20:23:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 20:23:50 +0000 |
| commit | 4f79d73d26ccfc584ba1364e6046ab1845ad9956 (patch) | |
| tree | 99633112514992cee706fa8d85e79b33b12cc6da /graphics/java | |
| parent | 9f0b7db9241ba4cd415adbb095e8b81cfa9a6690 (diff) | |
| parent | 33ae07ab814df0242625bb1e1961f464b630a7fe (diff) | |
| download | frameworks_base-4f79d73d26ccfc584ba1364e6046ab1845ad9956.zip frameworks_base-4f79d73d26ccfc584ba1364e6046ab1845ad9956.tar.gz frameworks_base-4f79d73d26ccfc584ba1364e6046ab1845ad9956.tar.bz2 | |
am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev
* commit '21662c96fa9d107a60f4ce98f7179264c972b142':
Cut ripple background alpha in half
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleBackground.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleBackground.java b/graphics/java/android/graphics/drawable/RippleBackground.java index 4e709b5..faa89bf 100644 --- a/graphics/java/android/graphics/drawable/RippleBackground.java +++ b/graphics/java/android/graphics/drawable/RippleBackground.java @@ -106,7 +106,7 @@ class RippleBackground { public void setup(int maxRadius, int color, float density) { mColorOpaque = color | 0xFF000000; - mColorAlpha = Color.alpha(color); + mColorAlpha = Color.alpha(color) / 2; if (maxRadius != RippleDrawable.RADIUS_AUTO) { mHasMaxRadius = true; |