diff options
| author | 2018-02-16 13:18:30 -0800 | |
|---|---|---|
| committer | 2018-02-16 13:18:30 -0800 | |
| commit | 96fccbe20a25def71229a714d6be54ca43644ec3 (patch) | |
| tree | 35f645b7defefecbe7bb080b504a86ac030a5a3f | |
| parent | 0f888de06b3dcbb73a410578d48539ca970f4f3b (diff) | |
Yet more alpha tweaks for Ripples
Change-Id: If714a90d847882e04863723e1849e12a8f987fac
Fixes: 72173993
Test: API demos controls tests, clicked stuff, mouse & kbd used.
| -rw-r--r-- | core/res/res/values/colors_material.xml | 6 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleBackground.java | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml index e80f16c466b3..6e8134b079b2 100644 --- a/core/res/res/values/colors_material.xml +++ b/core/res/res/values/colors_material.xml @@ -78,9 +78,9 @@ <item name="secondary_content_alpha_material_dark" format="float" type="dimen">.7</item> <item name="secondary_content_alpha_material_light" format="float" type="dimen">0.54</item> - <item name="highlight_alpha_material_light" format="float" type="dimen">0.16</item> - <item name="highlight_alpha_material_dark" format="float" type="dimen">0.16</item> - <item name="highlight_alpha_material_colored" format="float" type="dimen">0.16</item> + <item name="highlight_alpha_material_light" format="float" type="dimen">0.10</item> + <item name="highlight_alpha_material_dark" format="float" type="dimen">0.10</item> + <item name="highlight_alpha_material_colored" format="float" type="dimen">0.10</item> <!-- Primary & accent colors --> <eat-comment /> diff --git a/graphics/java/android/graphics/drawable/RippleBackground.java b/graphics/java/android/graphics/drawable/RippleBackground.java index 41d36986dfe2..2812abe067f7 100644 --- a/graphics/java/android/graphics/drawable/RippleBackground.java +++ b/graphics/java/android/graphics/drawable/RippleBackground.java @@ -78,9 +78,10 @@ class RippleBackground extends RippleComponent { } private void onStateChanged() { - float newOpacity = 0.0f; - if (mHovered) newOpacity += .25f; - if (mFocused) newOpacity += .75f; + // Hover = .2 * alpha + // Focus = .6 * alpha + // Focused + Hovered = .6 * alpha + float newOpacity = mFocused ? .6f : mHovered ? .2f : 0f; if (mAnimator != null) { mAnimator.cancel(); mAnimator = null; |