commit 834d74bbf0fc4b27ef204a1238e99bc97bfaa31a
author Farruh Habibullaev <farruhh@google.com> Tue Nov 30 21:09:13 2021 -0800
committer Farruh Habibullaev <farruhh@google.com> Wed Dec 01 18:59:55 2021 +0000
tree ff820ddeff1463ea3bb1168cbba8049eab23f5d3
parent 6bb17f89e98869779bd7eb54bf3524fc17117baa

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

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">