Merge "Do not allow draw on top for default sms picker."
diff --git a/res/layout/homepage_slice_tile.xml b/res/layout/homepage_slice_tile.xml
index 7d108e1..807c26b 100644
--- a/res/layout/homepage_slice_tile.xml
+++ b/res/layout/homepage_slice_tile.xml
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- style="@style/slice_view_style"/>
+ style="@style/SliceViewStyle"/>
<!--dismissal view-->
<include layout="@layout/homepage_dismissal_view"/>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 52e3e92..747210e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -454,6 +454,7 @@
<style name="Widget.SliceView.Settings">
<item name="titleSize">@*android:dimen/text_size_subhead_material</item>
+ <item name="rowStyle">@style/SliceRowStyle.Settings</item>
</style>
<style name="TextAppearance.DeferredSetupCardTitle">
@@ -476,7 +477,7 @@
<item name="android:textSize">14sp</item>
</style>
- <style name="slice_view_style">
+ <style name="SliceViewStyle">
<!-- 4dp start padding for the start icon -->
<item name="android:paddingStart">4dp</item>
@@ -484,10 +485,10 @@
android:paddingEnd = 24 - 16(contentEndPadding) -->
<item name="android:paddingEnd">8dp</item>
- <item name="rowStyle">@style/slice_row_style</item>
+ <item name="rowStyle">@style/SliceRowStyle</item>
</style>
- <style name="slice_row_style">
+ <style name="SliceRowStyle">
<item name="titleItemEndPadding">0dp</item>
<!-- Padding between content and the start icon is 12dp. -->
@@ -508,4 +509,9 @@
<item name="actionDividerHeight">32dp</item>
</style>
+
+ <style name="SliceRowStyle.Settings">
+ <!-- Padding between content and the start icon is 8dp. -->
+ <item name="contentStartPadding">8dp</item>
+ </style>
</resources>