From 834d74bbf0fc4b27ef204a1238e99bc97bfaa31a Mon Sep 17 00:00:00 2001
From: Farruh Habibullaev <farruhh@google.com>
Date: Tue, 30 Nov 2021 21:09:13 -0800
Subject: Fix the issue with buttonStyle in carsuwlib

- by providing support for support library & material
design buttons.

Test: Manually tested the behavior.
BUG: 204577686

Change-Id: Ief9b3b3cf5f64d8b9c7596cf04e5267fe0152be8
---
 library/main/res/values/themes.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/main/res/values/themes.xml b/library/main/res/values/themes.xml
index b24738a..ac71ded 100644
--- a/library/main/res/values/themes.xml
+++ b/library/main/res/values/themes.xml
@@ -23,7 +23,13 @@
         <item name="android:colorControlNormal">?android:attr/colorAccent</item>
         <item name="android:colorControlActivated">?android:attr/colorAccent</item>
         <item name="android:buttonStyle">@style/Widget.Car.SetupWizard.Button</item>
-        <item name="android:borderlessButtonStyle">@style/Widget.Car.SetupWizard.Button.Borderless.Colored</item>
+        <item name="buttonStyle">@style/Widget.Car.SetupWizard.Button</item>
+        <item name="materialButtonStyle">@style/Widget.Car.SetupWizard.Button</item>
+        <item name="android:borderlessButtonStyle">
+            @style/Widget.Car.SetupWizard.Button.Borderless.Colored
+        </item>
+        <item name="borderlessButtonStyle">@style/Widget.Car.SetupWizard.Button.Borderless.Colored
+        </item>
     </style>
 
     <style name="Theme.Car.SetupWizard.NoActionBar.Accent" parent="Theme.Car.SetupWizard.NoActionBar">
-- 
cgit v1.2.3