From 88017c845156eb269bfdc5a010e95b1306cda297 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 9 Jan 2018 13:44:06 -0800
Subject: [PATCH] Tweak layouts for action button to match spec

Change-Id: Ic59ee1f15f20dc431bc4a2c6df20b732842a6591
Fixes: 70903732
Test: visual
---
 res/layout/two_action_buttons.xml | 7 +++++--
 res/values/strings.xml            | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/res/layout/two_action_buttons.xml b/res/layout/two_action_buttons.xml
index 41bcfc36efd..23bb886c901 100644
--- a/res/layout/two_action_buttons.xml
+++ b/res/layout/two_action_buttons.xml
@@ -20,9 +20,9 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:paddingTop="8dp"
+    android:paddingTop="24dp"
     android:paddingStart="68dp"
-    android:paddingEnd="8dp"
+    android:paddingEnd="24dp"
     android:orientation="horizontal">
 
     <FrameLayout
@@ -42,6 +42,9 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="4dp" />
     </FrameLayout>
+    <Space
+        android:layout_width="16dp"
+        android:layout_height="wrap_content" />
     <FrameLayout
         android:layout_width="0dp"
         android:layout_weight="1"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ace024b0bfd..717a3b61c9a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6799,10 +6799,10 @@
     <string name="zen_mode_add">Add</string>
 
     <!--  Do not disturb: Label for button that will turn on zen mode. [CHAR LIMIT=30] -->
-    <string name="zen_mode_button_turn_on">TURN ON NOW</string>
+    <string name="zen_mode_button_turn_on">Turn on now</string>
 
     <!--  Do not disturb: Label for button that will turn off zen mode. [CHAR LIMIT=30] -->
-    <string name="zen_mode_button_turn_off">TURN OFF NOW</string>
+    <string name="zen_mode_button_turn_off">Turn off now</string>
 
     <!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing end time of DND -->
     <string name="zen_mode_settings_dnd_manual_end_time">Do Not Disturb is on until <xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g></string>