summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Wenbo Jie <wenbojie@google.com> 2025-01-20 16:48:11 +0000
committer Wenbo Jie <wenbojie@google.com> 2025-01-20 16:48:11 +0000
commit41256da564bf24d564eb97d31008d0ec511e47d5 (patch)
treee51a2993069b2a0def1ff88b0061b46df12ec1e8
parentc334f5a238f06e6742992f9fef353c00b039f9e7 (diff)
[DocsUI M3] Update alpha for hover/ripple
Update the alpha value for hover and ripple layer to match the material spec: * hover - 8% * ripple - 10% Bug: 388127521 Test: m DocumentsUIGoogle && manual inspection Flag: com.android.documentsui.flags.use_material3 Change-Id: I0078d4e28d2e55fd97ab1aa26e7532d7664ef928
-rw-r--r--res/flag(com.android.documentsui.flags.use_material3)/drawable/list_item_background.xml4
-rw-r--r--res/flag(com.android.documentsui.flags.use_material3)/drawable/nav_rail_item_icon_background.xml12
-rw-r--r--res/flag(com.android.documentsui.flags.use_material3)/drawable/root_item_background.xml12
-rw-r--r--res/flag(com.android.documentsui.flags.use_material3)/drawable/tab_border_rounded.xml8
-rw-r--r--res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml6
-rw-r--r--res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml4
6 files changed, 23 insertions, 23 deletions
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/drawable/list_item_background.xml b/res/flag(com.android.documentsui.flags.use_material3)/drawable/list_item_background.xml
index 7835fbc6a..797685ce6 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/drawable/list_item_background.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/drawable/list_item_background.xml
@@ -29,7 +29,7 @@
<item>
<shape android:tint="?attr/colorOnPrimary">
<corners android:radius="@dimen/list_item_height" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
</layer-list>
@@ -73,7 +73,7 @@
<item android:state_drag_hovered="true">
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/list_item_height" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
<item android:state_focused="true">
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/drawable/nav_rail_item_icon_background.xml b/res/flag(com.android.documentsui.flags.use_material3)/drawable/nav_rail_item_icon_background.xml
index 7864321af..1c7bc8c0b 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/drawable/nav_rail_item_icon_background.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/drawable/nav_rail_item_icon_background.xml
@@ -42,7 +42,7 @@
<item>
<shape android:tint="?attr/colorOnSecondaryContainer">
<corners android:radius="@dimen/nav_rail_item_icon_bg_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
</layer-list>
@@ -60,7 +60,7 @@
<item>
<shape android:tint="?attr/colorOnSecondaryContainer">
<corners android:radius="@dimen/nav_rail_item_icon_bg_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
</layer-list>
@@ -98,7 +98,7 @@
<item>
<shape android:tint="?attr/colorOnSecondaryContainer">
<corners android:radius="@dimen/nav_rail_item_icon_bg_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
</layer-list>
@@ -114,13 +114,13 @@
<item app:state_highlighted="true">
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/nav_rail_item_icon_bg_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
<item android:state_pressed="true">
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/nav_rail_item_icon_bg_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
<item android:state_focused="true">
@@ -134,7 +134,7 @@
<item android:state_hovered="true">
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/nav_rail_item_icon_bg_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/drawable/root_item_background.xml b/res/flag(com.android.documentsui.flags.use_material3)/drawable/root_item_background.xml
index eea916ce2..236b92179 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/drawable/root_item_background.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/drawable/root_item_background.xml
@@ -40,7 +40,7 @@
<item>
<shape android:tint="?attr/colorOnSecondaryContainer">
<corners android:radius="@dimen/drawer_item_height"/>
- <solid android:color="@color/overlay_color_percentage_10"/>
+ <solid android:color="@color/overlay_hover_color_percentage"/>
</shape>
</item>
</layer-list>
@@ -56,7 +56,7 @@
<item>
<shape android:tint="?attr/colorOnSecondaryContainer">
<corners android:radius="@dimen/drawer_item_height"/>
- <solid android:color="@color/overlay_color_percentage_10"/>
+ <solid android:color="@color/overlay_hover_color_percentage"/>
</shape>
</item>
</layer-list>
@@ -88,7 +88,7 @@
<item>
<shape android:tint="?attr/colorOnSecondaryContainer">
<corners android:radius="@dimen/drawer_item_height"/>
- <solid android:color="@color/overlay_color_percentage_10"/>
+ <solid android:color="@color/overlay_hover_color_percentage"/>
</shape>
</item>
</layer-list>
@@ -99,13 +99,13 @@
<item app:state_highlighted="true">
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/drawer_item_height"/>
- <solid android:color="@color/overlay_color_percentage_10"/>
+ <solid android:color="@color/overlay_hover_color_percentage"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/drawer_item_height"/>
- <solid android:color="@color/overlay_color_percentage_10"/>
+ <solid android:color="@color/overlay_hover_color_percentage"/>
</shape>
</item>
<item android:state_focused="true">
@@ -117,7 +117,7 @@
<item android:state_hovered="true">
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/drawer_item_height"/>
- <solid android:color="@color/overlay_color_percentage_10"/>
+ <solid android:color="@color/overlay_hover_color_percentage"/>
</shape>
</item>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/drawable/tab_border_rounded.xml b/res/flag(com.android.documentsui.flags.use_material3)/drawable/tab_border_rounded.xml
index b50587c01..08d515301 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/drawable/tab_border_rounded.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/drawable/tab_border_rounded.xml
@@ -38,7 +38,7 @@
<item>
<shape android:tint="?attr/colorOnPrimaryContainer">
<corners android:radius="@dimen/profile_tab_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
</layer-list>
@@ -72,7 +72,7 @@
<item>
<shape android:tint="?attr/colorOnPrimaryContainer">
<corners android:radius="@dimen/profile_tab_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
</layer-list>
@@ -96,7 +96,7 @@
<item>
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/profile_tab_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
</layer-list>
@@ -130,7 +130,7 @@
<item>
<shape android:tint="?attr/colorOnSurface">
<corners android:radius="@dimen/profile_tab_radius" />
- <solid android:color="@color/overlay_color_percentage_10" />
+ <solid android:color="@color/overlay_hover_color_percentage" />
</shape>
</item>
</layer-list>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml
index 13f057b0d..c7ac0124b 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml
@@ -69,11 +69,11 @@
<color name="search_chip_text_selected_color">@android:color/white</color>
<!-- Use this when we need to set alpha channel on top of a theme attribute color in the
- color selector list, e.g. to set colorOnSecondaryContainer with 10% alpha channel, use:
+ color selector list, e.g. to set colorOnSecondaryContainer with a hover overlay alpha, use:
<shape android:tint="?attr/colorOnSecondaryContainer">
- <solid android:color="@color/overlay_color_percentage_10"/>
+ <solid android:color="@color/overlay_hover_color_percentage"/>
</shape>
-->
- <color name="overlay_color_percentage_10">#1A000000</color>
+ <color name="overlay_hover_color_percentage">#14000000</color> <!-- 8% -->
</resources>
diff --git a/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml b/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml
index 2c2d54f34..7487421e5 100644
--- a/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml
+++ b/res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml
@@ -180,6 +180,6 @@
<dimen name="focus_ring_width">3dp</dimen>
<dimen name="focus_ring_gap">5dp</dimen>
- <dimen name="hover_overlay_alpha">0.10</dimen>
- <dimen name="ripple_overlay_alpha">0.08</dimen>
+ <dimen name="hover_overlay_alpha">0.08</dimen>
+ <dimen name="ripple_overlay_alpha">0.10</dimen>
</resources>