From 08908b2b2021e7a68f535d0d632f52e2d87dceec Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Mon, 2 Apr 2018 17:17:42 -0700
Subject: [PATCH] Adjust alignment for suggestion icon.

- add margin to the suggestion icon so that it align properly with the
suggestion text.
- also align the action button with the suggestion icon and text.

Change-Id: Ic12e4160d6583cf2d837e65ee5fd5a1ad73d348d
Fixes: 74414989
Test: visual
---
 res/layout/suggestion_tile_with_button.xml | 17 ++++++++++-------
 res/values/dimens.xml                      |  4 ++++
 res/values/styles.xml                      | 10 ++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml
index a901a48491a..cff05660944 100644
--- a/res/layout/suggestion_tile_with_button.xml
+++ b/res/layout/suggestion_tile_with_button.xml
@@ -86,15 +86,18 @@
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.SuggestionSummary" />
 
-        <Button
-            android:id="@android:id/primary"
-            style="@style/ActionPrimaryButton"
-            android:layout_gravity="center"
+        <FrameLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="18dp"
-            android:text="@string/suggestion_button_text" />
+            style="@style/SuggestionCardButton">
+            <Button
+                android:id="@android:id/primary"
+                style="@style/ActionPrimaryButton"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/suggestion_button_text" />
+        </FrameLayout>
 
     </LinearLayout>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 406cac28a3a..6a052d21011 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -318,6 +318,10 @@
     <dimen name="suggestion_card_inner_margin">12dp</dimen>
     <dimen name="suggestion_card_padding_bottom_one_card">16dp</dimen>
     <dimen name="suggestion_card_corner_radius">2dp</dimen>
+    <dimen name="suggestion_card_icon_side_margin">12dp</dimen>
+    <dimen name="suggestion_card_button_side_margin">8dp</dimen>
+    <dimen name="suggestion_card_button_top_margin">16dp</dimen>
+    <dimen name="suggestion_card_button_bottom_margin">18dp</dimen>
 
     <!-- Padding for the reset screens -->
     <dimen name="reset_checkbox_padding_end">8dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 86375faa7c4..c6500c49026 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -329,6 +329,16 @@
     <style name="SuggestionCardIcon">
         <item name="android:layout_centerHorizontal">false</item>
         <item name="android:layout_alignParentStart">true</item>
+        <item name="android:layout_marginStart">@dimen/suggestion_card_icon_side_margin</item>
+        <item name="android:layout_marginEnd">@dimen/suggestion_card_icon_side_margin</item>
+    </style>
+
+    <style name="SuggestionCardButton">
+        <item name="android:layout_gravity">start</item>
+        <item name="android:layout_marginStart">@dimen/suggestion_card_button_side_margin</item>
+        <item name="android:layout_marginEnd">@dimen/suggestion_card_button_side_margin</item>
+        <item name="android:layout_marginTop">@dimen/suggestion_card_button_top_margin</item>
+        <item name="android:layout_marginBottom">@dimen/suggestion_card_button_bottom_margin</item>
     </style>
 
     <style name="TextAppearance.SuggestionTitle"