Allow notifications actions button margin configuration
Add a dimen to add a right margin on the action view. This is so that notifications can be configured to avoid overlapping
with the dismiss button.
Unfortunately this doesn't work well to change dynamically based on
whether we're in rotary mode or not. OEMs should be able to configure
their notifications to avoid this kind of issue on their devices by
ensuring that the notification cards are wide enough.
Bug: 173728678
Test: manual
Change-Id: I8ad360474b02c62b9f56a522822daa9a328bbe80
diff --git a/res/layout/dismiss_button.xml b/res/layout/dismiss_button.xml
index d47bc01..b24e070 100644
--- a/res/layout/dismiss_button.xml
+++ b/res/layout/dismiss_button.xml
@@ -23,7 +23,8 @@
android:id="@+id/dismiss_button"
android:layout_width="@dimen/dismiss_button_diameter"
android:layout_height="@dimen/dismiss_button_diameter"
- android:layout_marginRight="@dimen/dismiss_button_right_margin"
+ android:layout_marginLeft="@dimen/dismiss_button_horizontal_margin"
+ android:layout_marginRight="@dimen/dismiss_button_horizontal_margin"
android:layout_marginBottom="@dimen/card_min_bottom_padding"
android:background="@drawable/dismiss_button_background"
android:scaleType="center"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8887249..9f7ae23 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -59,6 +59,9 @@
<dimen name="action_button_spacing_start">@*android:dimen/car_padding_4</dimen>
<dimen name="action_button_padding_top">10dp</dimen>
<dimen name="action_button_padding_bottom">10dp</dimen>
+ <!-- This value is recommended to be greater than or equal to
+ @dimen/dismiss_button_diameter + 2 * @dimen/dismiss_button_horizontal_margin -->
+ <dimen name="action_view_right_margin">120dp</dimen>
<!-- Icons -->
<dimen name="notification_primary_icon_size">@*android:dimen/car_primary_icon_size</dimen>
@@ -79,7 +82,7 @@
<!-- Dismiss button -->
<dimen name="dismiss_button_diameter">@*android:dimen/car_button_height</dimen>
- <dimen name="dismiss_button_right_margin">32dp</dimen>
+ <dimen name="dismiss_button_horizontal_margin">@*android:dimen/car_padding_4</dimen>
<!-- Clear all button -->
<dimen name="clear_all_button_margin">@*android:dimen/car_padding_3</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c4d7474..cd9f61c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -55,6 +55,7 @@
<item name="android:layout_gravity">left</item>
<item name="android:minHeight">@dimen/card_min_bottom_padding</item>
<item name="android:layout_marginLeft">@dimen/action_view_left_margin</item>
+ <item name="android:layout_marginRight">@dimen/action_view_right_margin</item>
</style>
<style name="NotificationActionButtonBase" parent="@android:Widget.DeviceDefault.Button.Borderless.Colored">
