[automerger] Adding minWidth for flat button style. Making car_accent color work in the night mode. am: 9fc7da4aa9
Change-Id: Ic328279eefefe71e95e2de659c1ff9eea05b6312
diff --git a/car/res/values-night/colors.xml b/car/res/values-night/colors.xml
index 7e29a5b..4ebfaed 100644
--- a/car/res/values-night/colors.xml
+++ b/car/res/values-night/colors.xml
@@ -37,4 +37,6 @@
<color name="car_list_divider">@color/car_list_divider_dark</color>
<color name="car_scrollbar_thumb">@color/car_scrollbar_thumb_light</color>
<color name="car_scrollbar_thumb_inverse">@color/car_scrollbar_thumb_dark</color>
+
+ <color name="car_accent">@color/car_accent_light</color>
</resources>
diff --git a/car/res/values/colors.xml b/car/res/values/colors.xml
index 9cac744..a32feff 100644
--- a/car/res/values/colors.xml
+++ b/car/res/values/colors.xml
@@ -177,7 +177,7 @@
<color name="car_highlight_dark">@color/car_teal_200</color>
<color name="car_highlight">@color/car_highlight_light</color>
- <color name="car_accent_light">@color/car_teal_700</color>
- <color name="car_accent_dark">@color/car_teal_200</color>
- <color name="car_accent">@color/car_accent_light</color>
+ <color name="car_accent_dark">@color/car_teal_700</color>
+ <color name="car_accent_light">@color/car_teal_200</color>
+ <color name="car_accent">@color/car_accent_dark</color>
</resources>
diff --git a/car/res/values/styles.xml b/car/res/values/styles.xml
index a0a1508..47ced9b 100644
--- a/car/res/values/styles.xml
+++ b/car/res/values/styles.xml
@@ -137,6 +137,7 @@
<style name="Widget.Car.Button.Borderless.Colored"
parent="Widget.AppCompat.Button.Borderless.Colored">
<item name="android:layout_height">@dimen/car_button_height</item>
+ <item name="android:minWidth">@dimen/car_button_min_width</item>
<item name="android:paddingStart">@dimen/car_borderless_button_horizontal_padding</item>
<item name="android:paddingEnd">@dimen/car_borderless_button_horizontal_padding</item>
<item name="android:textSize">@dimen/car_action1_size</item>