From 57384c44bbb8e2e9fc87f5cfcd68857565e8059e Mon Sep 17 00:00:00 2001
From: Jason Chiu <chiujason@google.com>
Date: Thu, 26 Dec 2019 18:19:41 +0800
Subject: [PATCH] Fix the ripple effect of homepage slice cards

- It's caused by the two side paddings of SliceViewStyle.
- Adjust the slice inside paddings with a new attribute.

Fixes: 131278625
Test: visual
Change-Id: Iee2bc576c58bbdaf856b1b778ccf011302a34859
---
 res/values/styles.xml | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4052813c0d8..47e96d829e7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -483,13 +483,6 @@
     </style>
 
     <style name="SliceViewStyle">
-        <!-- 2dp start padding for the start icon -->
-        <item name="android:paddingStart">2dp</item>
-
-        <!-- End margin of content without end items is 24dp.
-             android:paddingEnd = 24 - 16(contentEndPadding) -->
-        <item name="android:paddingEnd">8dp</item>
-
         <item name="rowStyle">@style/SliceRowStyle</item>
         <item name="android:background">?android:attr/colorBackgroundFloating</item>
     </style>
@@ -499,29 +492,28 @@
     </style>
 
     <style name="SliceRowStyle">
+        <!-- 2dp start padding for the start icon -->
+        <item name="titleItemStartPadding">2dp</item>
         <item name="titleItemEndPadding">0dp</item>
 
-        <!-- Padding between content and the start icon is 14dp. -->
+        <!-- Padding between content and the start icon is 14dp -->
         <item name="contentStartPadding">14dp</item>
-        <!-- Padding between content and end items is 16dp. -->
+        <!-- Padding between content and end items is 16dp -->
         <item name="contentEndPadding">16dp</item>
 
-        <!-- Both side margins of end item are 16dp.
-             endItemEndPadding = 16 - 8(android:paddingEnd) -->
+        <!-- Both side margins of end item are 16dp -->
         <item name="endItemStartPadding">16dp</item>
-        <item name="endItemEndPadding">8dp</item>
+        <item name="endItemEndPadding">16dp</item>
 
-        <!-- Both side margins of bottom divider are 12dp.
-             bottomDividerStartPadding = 12 - 2(android:paddingStart)
-             bottomDividerEndPadding = 12 - 8(android:paddingEnd) -->
-        <item name="bottomDividerStartPadding">10dp</item>
-        <item name="bottomDividerEndPadding">4dp</item>
+        <!-- Both side margins of bottom divider are 12dp -->
+        <item name="bottomDividerStartPadding">12dp</item>
+        <item name="bottomDividerEndPadding">12dp</item>
 
         <item name="actionDividerHeight">32dp</item>
     </style>
 
     <style name="SliceRowStyle.Settings">
-        <!-- Padding between content and the start icon is 8dp. -->
+        <!-- Padding between content and the start icon is 8dp -->
         <item name="contentStartPadding">8dp</item>
     </style>