From 9c15e2d709b182122b0cc6c25a5a4954a621cba5 Mon Sep 17 00:00:00 2001
From: manabu-nakamura <ma.nakamura@gmail.com>
Date: Thu, 30 Jan 2025 12:22:17 +0900
Subject: [PATCH 1/2] [Catalog] workaround for #3988 ([Slider] ripple is not
 transparent in dark theme on API 33)

---
 .../theme/res/values-night/styles.xml         | 23 +++++++++++++++++++
 .../application/theme/res/values/styles.xml   |  4 ++++
 .../application/theme/res/values/themes.xml   |  1 +
 3 files changed, 28 insertions(+)
 create mode 100644 catalog/java/io/material/catalog/application/theme/res/values-night/styles.xml

diff --git a/catalog/java/io/material/catalog/application/theme/res/values-night/styles.xml b/catalog/java/io/material/catalog/application/theme/res/values-night/styles.xml
new file mode 100644
index 00000000000..b1de7fcdbeb
--- /dev/null
+++ b/catalog/java/io/material/catalog/application/theme/res/values-night/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2025 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<resources>
+
+  <style name="Widget.Catalog.Slider" parent="Widget.Material3.Slider">
+    <item name="haloColor">@android:color/transparent</item>
+  </style>
+
+</resources>
diff --git a/catalog/java/io/material/catalog/application/theme/res/values/styles.xml b/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
index c575252c74b..54bb1cdaa75 100644
--- a/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
+++ b/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
@@ -32,4 +32,8 @@
     <item name="android:background">?attr/actionBarItemBackground</item>
   </style>
 
+  <style name="Widget.Catalog.Slider" parent="Widget.Material3.Slider">
+    <item name="haloColor">#00FFFFFF</item>
+  </style>
+
 </resources>
diff --git a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
index f9c4ffb74b3..a47ffb7ecd3 100644
--- a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
+++ b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
@@ -22,6 +22,7 @@
     <item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
     <item name="textInputSignInStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
     <item name="windowActionModeOverlay">true</item>
+    <item name="sliderStyle">@style/Widget.Catalog.Slider</item>
   </style>
 
   <!-- A theme which sets the status bar color to transparent -->

From 0af117e355e2566fb146eecfd4beae4304cb0f94 Mon Sep 17 00:00:00 2001
From: manabu-nakamura <ma.nakamura@gmail.com>
Date: Fri, 31 Jan 2025 16:43:12 +0900
Subject: [PATCH 2/2] [Catalog] workaround for #3988 ([Slider] ripple is not
 transparent in dark theme on API 33)

---
 .../material/catalog/application/theme/res/values/styles.xml  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/catalog/java/io/material/catalog/application/theme/res/values/styles.xml b/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
index 54bb1cdaa75..f6171910143 100644
--- a/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
+++ b/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
@@ -32,8 +32,6 @@
     <item name="android:background">?attr/actionBarItemBackground</item>
   </style>
 
-  <style name="Widget.Catalog.Slider" parent="Widget.Material3.Slider">
-    <item name="haloColor">#00FFFFFF</item>
-  </style>
+  <style name="Widget.Catalog.Slider" parent="Widget.Material3.Slider"/>
 
 </resources>