diff options
| author | Alan Viverette <alanv@google.com> | 2014-09-25 20:14:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-25 20:14:34 +0000 |
| commit | 33ae07ab814df0242625bb1e1961f464b630a7fe (patch) | |
| tree | df6ef00c1e32f40403ff36126d6475d3aba91c72 /graphics/java | |
| parent | 314dc4c553d7ab712151003c0d569982301a44e3 (diff) | |
| parent | 8bdb44270323ec8b665d26322fe67cd307719904 (diff) | |
| download | frameworks_base-33ae07ab814df0242625bb1e1961f464b630a7fe.zip frameworks_base-33ae07ab814df0242625bb1e1961f464b630a7fe.tar.gz frameworks_base-33ae07ab814df0242625bb1e1961f464b630a7fe.tar.bz2 | |
Merge "Cut ripple background alpha in half" into lmp-dev
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; |