From 2ef995b71269a6f6d62e728d18c4af44acf2e9e9 Mon Sep 17 00:00:00 2001
From: Yi-Ling Chuang <emilychuang@google.com>
Date: Sat, 19 Jan 2019 11:43:25 +0800
Subject: [PATCH] Adjust contextual card dismissal view

- Increase the height of button clicking area
- Decrease top margin and some other corresponding adjustments.

Bug: 113783548
Test: visual
Change-Id: Iba1cea6c82036ebb9fe2e08d32eb663e0ad026ac
---
 res/layout/homepage_dismissal_view.xml | 5 ++---
 res/values/dimens.xml                  | 6 +++---
 res/values/styles.xml                  | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/res/layout/homepage_dismissal_view.xml b/res/layout/homepage_dismissal_view.xml
index 6d8f7116b40..4295ff6899c 100644
--- a/res/layout/homepage_dismissal_view.xml
+++ b/res/layout/homepage_dismissal_view.xml
@@ -34,7 +34,6 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/homepage_card_dismissal_margin_bottom"
         android:gravity="bottom|end">
 
         <Button
@@ -49,8 +48,8 @@
             style="@style/ContextualCardDismissalButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/homepage_card_dismissal_button_side_margin"
-            android:layout_marginEnd="@dimen/homepage_card_dismissal_button_side_margin"
+            android:layout_marginStart="@dimen/homepage_card_dismissal_button_margin_start"
+            android:layout_marginEnd="@dimen/homepage_card_dismissal_button_margin_end"
             android:text="@string/contextual_card_dismiss_keep"/>
 
     </LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 416c8d714fc..087c870523d 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -335,10 +335,10 @@
     <dimen name="homepage_half_card_title_margin_top">12dp</dimen>
 
     <!-- Homepage dismissal cards size and padding -->
-    <dimen name="homepage_card_dismissal_margin_top">16dp</dimen>
-    <dimen name="homepage_card_dismissal_margin_bottom">2dp</dimen>
+    <dimen name="homepage_card_dismissal_margin_top">12dp</dimen>
     <dimen name="homepage_card_dismissal_side_margin">16dp</dimen>
-    <dimen name="homepage_card_dismissal_button_side_margin">6dp</dimen>
+    <dimen name="homepage_card_dismissal_button_margin_start">4dp</dimen>
+    <dimen name="homepage_card_dismissal_button_margin_end">6dp</dimen>
 
     <!-- Horizontal divider size and margin -->
     <dimen name="horizontal_divider_margin_top">4dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8b92d7e5152..8e8e86fc8f6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -460,8 +460,7 @@
 
     <style name="ContextualCardDismissalButton"
            parent="android:Widget.DeviceDefault.Button.Borderless.Colored">
-        <item name="android:minWidth">10dp</item>
-        <item name="android:minHeight">16dp</item>
+        <item name="android:minWidth">24dp</item>
         <item name="android:textAllCaps">false</item>
     </style>