diff options
| author | Farruh Habibullaev <farruhh@google.com> | 2021-12-01 22:27:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-01 22:27:26 +0000 |
| commit | d58a24804d4f71ab88ee9ddde808e69228978b15 (patch) | |
| tree | dddf4bde101853a219a11b8f125d2cba7c8b6af3 | |
| parent | ad9dee6dd11d3cdef9dc0fde8ff05788ccc6d74d (diff) | |
| parent | 5ef0c1063d237a4f08110623cbef00e9445c4cb6 (diff) | |
| download | setupwizard-d58a24804d4f71ab88ee9ddde808e69228978b15.tar.gz | |
Fix the issue with buttonStyle in carsuwlib am: 834d74bbf0 am: 5ef0c1063d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/16368745
Change-Id: I60957a5de19bb76b3c2ef57d451f3f980a2d1bbd
| -rw-r--r-- | library/main/res/values/themes.xml | 8 |
1 files changed, 7 insertions, 1 deletions
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"> |