commit aeeb822b6ebf13a0490baed64280ac5b7ee349a7
author Alan Viverette <alanv@google.com> Fri Sep 26 00:25:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 00:25:36 2014 +0000
tree 6f112dfa341ff5869791a6d5b41244ceabcc1622
parent ea489ed83d68dd2e5541c8bb27dfbc5576539071
parent a9d4e46e9c8d0c13133f8acaded5082bf93b476a

am b02f1a0a: am e76f1b82: am a9517205: am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev

* commit 'b02f1a0abbf8ba92b845a4f1b2fcb4d0e4f431b2':
  Cut ripple background alpha in half

graphics/java/android/graphics/drawable/RippleBackground.java

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