Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix RippleDrawable alpha" into udc-dev am: 0814c2ddc8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23331504

Change-Id: I3e2b1b602e2b133729340d04a3a861745d4d9c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Dupin
2023-05-19 01:04:38 +00:00
committed by Automerger Merge Worker
parent 5e4a7a0e5b 0814c2ddc8
commit 10c7ddb604
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/values/colors_material.xml
View File

@@ -72,9 +72,9 @@
<item name="secondary_content_alpha_material_dark" format="float" type="dimen">.7</item> <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.60</item> <item name="secondary_content_alpha_material_light" format="float" type="dimen">0.60</item>
<item name="highlight_alpha_material_light" format="float" type="dimen">0.5</item> <item name="highlight_alpha_material_light" format="float" type="dimen">0.20</item>
<item name="highlight_alpha_material_dark" format="float" type="dimen">0.5</item> <item name="highlight_alpha_material_dark" format="float" type="dimen">0.20</item>
<item name="highlight_alpha_material_colored" format="float" type="dimen">0.10</item> <item name="highlight_alpha_material_colored" format="float" type="dimen">0.20</item>
<!-- Primary & accent colors --> <!-- Primary & accent colors -->
<eat-comment /> <eat-comment />

3
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -1013,7 +1013,8 @@ public class RippleDrawable extends LayerDrawable {
} }
p.setShader(shader); p.setShader(shader);
p.setColorFilter(null); p.setColorFilter(null);
p.setColor(color); // Alpha is handled by the shader (and color is a no-op because there's a shader)
p.setColor(0xFF000000);
return properties; return properties;
} }