am e1cc96fa: am 9247febe: Merge "Add padding to compose headings" into ub-gmail-ur14-dev
* commit 'e1cc96fa8c7215e04f96bac51a5e9f5944596ffc':
Add padding to compose headings
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 5dbe494..31dcc8f 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -348,6 +348,10 @@
<item name="android:layout_marginEnd">@dimen/compose_content_end_padding</item>
</style>
+ <style name="ComposeHeadingPadding">
+ <item name="android:paddingEnd">@dimen/compose_header_padding</item>
+ </style>
+
<style name="ComposeFieldButton" parent="@style/BaseComposeFieldButton">
<item name="android:layout_marginStart">@dimen/compose_header_btn_padding</item>
</style>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index fc63756..0bc5d61 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -208,6 +208,7 @@
<dimen name="compose_wrapper_top_padding">0dp</dimen>
<dimen name="compose_wrapper_side_padding">0dp</dimen>
+ <dimen name="compose_header_padding">8dp</dimen>
<dimen name="compose_header_btn_padding">8dp</dimen>
<dimen name="compose_header_min_height">56dp</dimen>
<dimen name="compose_header_text_size">16sp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4c4709f..78611db 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -72,7 +72,11 @@
<item name="android:background">@color/compose_divider_color</item>
</style>
- <style name="ComposeHeading">
+ <style name="ComposeHeadingPadding">
+ <item name="android:paddingRight">@dimen/compose_header_padding</item>
+ </style>
+
+ <style name="ComposeHeading" parent="@style/ComposeHeadingPadding">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>