From 414b7034f1fcbf729ad5de8e7adbefeb6bc7e43b Mon Sep 17 00:00:00 2001 From: Beverly Date: Mon, 14 May 2018 16:45:49 -0400 Subject: [PATCH] Update zen onboarding - Update text - Update buttons - Update style Fixes: 79702414 Fixes: 78447976 Fixes: 79525632 Test: ZenOnboardingActivityTest Change-Id: Ied476fc920828409993953fba32bf3dae324ea3c (cherry picked from commit e3a66fc16d2f0921b438905bb3a74d31f99b39ea) --- res/layout/zen_onboarding.xml | 114 ++++++++++++++---- res/values/strings.xml | 46 ++++--- res/values/styles.xml | 3 +- .../notification/ZenOnboardingActivity.java | 67 +++++++--- .../ZenOnboardingActivityTest.java | 30 +---- 5 files changed, 178 insertions(+), 82 deletions(-) diff --git a/res/layout/zen_onboarding.xml b/res/layout/zen_onboarding.xml index 64679550189..82951bd264d 100644 --- a/res/layout/zen_onboarding.xml +++ b/res/layout/zen_onboarding.xml @@ -17,40 +17,112 @@ + android:layout_height="wrap_content" > - + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="18dp"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_below="@+id/zen_onboarding_choices" + android:layout_marginLeft="8dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="10dp">