Merge "Implement pending notification indicator" into qt-dev
diff --git a/core/res/res/values/dimens_car.xml b/core/res/res/values/dimens_car.xml
index 880f9cc..12a9ea2 100644
--- a/core/res/res/values/dimens_car.xml
+++ b/core/res/res/values/dimens_car.xml
@@ -141,4 +141,11 @@
<dimen name="car_preference_category_icon_size">@dimen/car_primary_icon_size</dimen>
<dimen name="car_preference_row_vertical_margin">@dimen/car_padding_2</dimen>
+ <!-- Action bar -->
+ <dimen name="action_bar_margin">@*android:dimen/car_margin</dimen>
+ <dimen name="action_bar_margin_start">@*android:dimen/car_margin</dimen>
+ <dimen name="action_bar_margin_end">@*android:dimen/car_margin</dimen>
+ <!-- Space between a button and another button or screen edge -->
+ <dimen name="action_bar_button_margin">@*android:dimen/car_padding_4</dimen>
+ <dimen name="action_bar_toggle_internal_padding">@*android:dimen/car_padding_3</dimen>
</resources>
diff --git a/core/res/res/values/styles_car.xml b/core/res/res/values/styles_car.xml
index 2129734..d2f5cbb 100644
--- a/core/res/res/values/styles_car.xml
+++ b/core/res/res/values/styles_car.xml
@@ -86,4 +86,19 @@
<item name="textColor">@color/car_title_light</item>
</style>
+ <!-- Action bar -->
+ <style name="ActionBarButton"
+ parent="@style/Widget.DeviceDefault.Button.Borderless.Colored">
+ <item name="android:textAppearance">@style/ActionBarButtonTextAppearance</item>
+ <!-- Button's internal horizontal padding -->
+ <item name="android:paddingStart">@*android:dimen/car_padding_3</item>
+ <item name="android:paddingEnd">@*android:dimen/car_padding_3</item>
+ <item name="android:drawablePadding">@*android:dimen/car_padding_2</item>
+ </style>
+
+ <style name="ActionBarButtonTextAppearance"
+ parent="@style/TextAppearance.DeviceDefault.Widget.Button.Borderless.Colored">
+ <item name="android:singleLine">true</item>
+ <item name="android:textAllCaps">false</item>
+ </style>
</resources>