From 2fa9b7b652dc0424110fdb75c9c8b54cb0086db1 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 30 Oct 2018 15:21:42 -0700
Subject: [PATCH] Fix slice card layout so show more button works correctly

Change padding top/bottom to margin, so the sliceview can use the full
288dp height (4 rows + see more button).

Side effect is that ripple doesn't fill the entire cardview. But it
never did anyway.

Change-Id: Ie57187fbe2b8caa2cf9d0dc31d7678eee07085f4
Fixes: 118398695
Test: visual
---
 res/layout/homepage_slice_tile.xml | 7 +++----
 res/values/dimens.xml              | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/res/layout/homepage_slice_tile.xml b/res/layout/homepage_slice_tile.xml
index bd69eeeed2d..7cb84073666 100644
--- a/res/layout/homepage_slice_tile.xml
+++ b/res/layout/homepage_slice_tile.xml
@@ -17,7 +17,6 @@
 
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="@style/ContextualCardStyle">
@@ -26,9 +25,9 @@
         android:id="@+id/slice_view"
         android:layout_width="match_parent"
         android:layout_height="@dimen/homepage_slice_card_max_height"
+        android:layout_marginBottom="@dimen/homepage_card_bottom_margin"
+        android:layout_marginTop="@dimen/homepage_card_top_margin"
         android:paddingStart="@dimen/homepage_card_padding_start"
-        android:paddingEnd="@dimen/homepage_card_padding_end"
-        android:paddingTop="@dimen/homepage_card_padding_top"
-        android:paddingBottom="@dimen/homepage_card_padding_bottom"/>
+        android:paddingEnd="@dimen/homepage_card_padding_end"/>
 
 </androidx.cardview.widget.CardView>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 805909746aa..5f0097a9117 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -336,8 +336,8 @@
     <dimen name="homepage_card_padding_bottom">6dp</dimen>
 
     <!-- Slice cards maximum height (4 rows + show more)
-        MODE_LARGE height(3 rows + show more) 240dp + one line text(1 row) 48dp = 288dp -->
-    <dimen name="homepage_slice_card_max_height">288dp</dimen>
+        MODE_LARGE height(3 rows + show more) 240dp + two lines text(1 row) 60dp = 300dp -->
+    <dimen name="homepage_slice_card_max_height">300dp</dimen>
 
     <!-- Signal icon in NetworkSelectSetting -->
     <dimen name="signal_strength_icon_size">24dp</dimen>