From 87cd0f9db8d21ebb1843b80aadbc7f52835664b4 Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Mon, 26 Nov 2018 16:39:30 +0800
Subject: [PATCH] Modify margin for overall contextual settings home screen

- Excluding margin of search bar, it will be modified by b/118886724.

Bug: 119639077
Test: robotests, visual
Change-Id: I6776d69842c952de04864b5439ca2cd2fbdd5e09
---
 res/layout/homepage_slice_tile.xml         | 2 --
 res/layout/settings_homepage_container.xml | 4 +++-
 res/values/dimens.xml                      | 4 ++--
 res/values/styles.xml                      | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/res/layout/homepage_slice_tile.xml b/res/layout/homepage_slice_tile.xml
index dbdb91bec8c..e062dbaf080 100644
--- a/res/layout/homepage_slice_tile.xml
+++ b/res/layout/homepage_slice_tile.xml
@@ -30,8 +30,6 @@
             android:id="@+id/slice_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/homepage_card_vertical_margin"
-            android:layout_marginTop="@dimen/homepage_card_vertical_margin"
             android:paddingStart="@dimen/homepage_card_padding_start"
             android:paddingEnd="@dimen/homepage_card_padding_end"/>
 
diff --git a/res/layout/settings_homepage_container.xml b/res/layout/settings_homepage_container.xml
index 7a84e32d61c..42b78b441cb 100644
--- a/res/layout/settings_homepage_container.xml
+++ b/res/layout/settings_homepage_container.xml
@@ -42,7 +42,9 @@
             <FrameLayout
                 android:id="@+id/contextual_cards_content"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/homepage_card_side_margin"
+                android:layout_marginEnd="@dimen/homepage_card_side_margin"/>
 
             <FrameLayout
                 android:id="@+id/main_content"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8f44c692952..075979d94e0 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -329,8 +329,8 @@
     <dimen name="homepage_card_icon_size">24dp</dimen>
     <dimen name="homepage_card_corner_radius">8dp</dimen>
     <dimen name="homepage_card_elevation">2dp</dimen>
-    <dimen name="homepage_card_vertical_margin">4dp</dimen>
-    <dimen name="homepage_card_side_margin">8dp</dimen>
+    <dimen name="homepage_card_vertical_margin">8dp</dimen>
+    <dimen name="homepage_card_side_margin">4dp</dimen>
     <dimen name="homepage_card_padding_start">16dp</dimen>
     <dimen name="homepage_card_padding_end">16dp</dimen>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index cfc5fd3abb1..3ce11931eb4 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -482,7 +482,6 @@
     </style>
 
     <style name="ContextualCardStyle">
-        <item name="android:layout_marginTop">@dimen/homepage_card_vertical_margin</item>
         <item name="android:layout_marginBottom">@dimen/homepage_card_vertical_margin</item>
         <item name="android:layout_marginStart">@dimen/homepage_card_side_margin</item>
         <item name="android:layout_marginEnd">@dimen/homepage_card_side_margin</item>