From 86cd9d70bf770fe45b5cf1e6755b0e12938430db Mon Sep 17 00:00:00 2001
From: rightnao <rightnao@google.com>
Date: Tue, 18 Apr 2023 10:03:05 -0700
Subject: [PATCH] [BottomSheet] Integrate tokens

PiperOrigin-RevId: 525177708
---
 .../m3_bottom_sheet_drag_handle_color.xml     | 20 ++++++++++++++++
 .../drawable/m3_bottom_sheet_drag_handle.xml  | 23 +++++++++++++++++++
 .../bottomsheet/res/values/styles.xml         |  2 +-
 .../bottomsheet/res/values/tokens.xml         |  2 ++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 lib/java/com/google/android/material/bottomsheet/res/color/m3_bottom_sheet_drag_handle_color.xml
 create mode 100644 lib/java/com/google/android/material/bottomsheet/res/drawable/m3_bottom_sheet_drag_handle.xml

diff --git a/lib/java/com/google/android/material/bottomsheet/res/color/m3_bottom_sheet_drag_handle_color.xml b/lib/java/com/google/android/material/bottomsheet/res/color/m3_bottom_sheet_drag_handle_color.xml
new file mode 100644
index 00000000000..d8c8c445cd4
--- /dev/null
+++ b/lib/java/com/google/android/material/bottomsheet/res/color/m3_bottom_sheet_drag_handle_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2023 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.
+-->
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@macro/m3_comp_sheet_bottom_docked_drag_handle_color"/>
+</selector>
diff --git a/lib/java/com/google/android/material/bottomsheet/res/drawable/m3_bottom_sheet_drag_handle.xml b/lib/java/com/google/android/material/bottomsheet/res/drawable/m3_bottom_sheet_drag_handle.xml
new file mode 100644
index 00000000000..a704a57687f
--- /dev/null
+++ b/lib/java/com/google/android/material/bottomsheet/res/drawable/m3_bottom_sheet_drag_handle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <size android:height="@dimen/m3_comp_sheet_bottom_docked_drag_handle_height" android:width="@dimen/m3_comp_sheet_bottom_docked_drag_handle_width" />
+  <corners android:radius="2dp" />
+  <solid android:color="@color/m3_bottom_sheet_drag_handle_color" />
+</shape>
diff --git a/lib/java/com/google/android/material/bottomsheet/res/values/styles.xml b/lib/java/com/google/android/material/bottomsheet/res/values/styles.xml
index b36751acffa..f70373c10fc 100644
--- a/lib/java/com/google/android/material/bottomsheet/res/values/styles.xml
+++ b/lib/java/com/google/android/material/bottomsheet/res/values/styles.xml
@@ -95,7 +95,7 @@
     <item name="android:minWidth">@dimen/mtrl_min_touch_target_size</item>
     <item name="android:minHeight">@dimen/mtrl_min_touch_target_size</item>
     <item name="android:paddingBottom">@dimen/m3_bottom_sheet_drag_handle_bottom_padding</item>
-    <item name="srcCompat">@drawable/mtrl_bottomsheet_drag_handle</item>
+    <item name="srcCompat">@drawable/m3_bottom_sheet_drag_handle</item>
     <item name="tint">@macro/m3_comp_sheet_bottom_docked_drag_handle_color</item>
   </style>
 </resources>
diff --git a/lib/java/com/google/android/material/bottomsheet/res/values/tokens.xml b/lib/java/com/google/android/material/bottomsheet/res/values/tokens.xml
index 206883b5b84..981f9ff3def 100644
--- a/lib/java/com/google/android/material/bottomsheet/res/values/tokens.xml
+++ b/lib/java/com/google/android/material/bottomsheet/res/values/tokens.xml
@@ -29,5 +29,7 @@
   <macro name="m3_comp_sheet_bottom_docked_container_shape">?attr/shapeAppearanceCornerExtraLarge</macro>
   <!-- Enabled - Drag handle -->
   <macro name="m3_comp_sheet_bottom_docked_drag_handle_color">?attr/colorOnSurfaceVariant</macro>
+  <dimen name="m3_comp_sheet_bottom_docked_drag_handle_width">32dp</dimen>
+  <dimen name="m3_comp_sheet_bottom_docked_drag_handle_height">4dp</dimen>
 
 </resources>