From 392c263c1943fde9dd5276e8854e6e46dd3386e6 Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Mon, 31 Mar 2014 16:42:26 -0700 Subject: [PATCH] Change 'Manual setup' into clickable text instead of a checkbox b/13733521 Change-Id: I7f338cbfb8357c5e1a27c6e886ea96e5c6924d22 --- .../account_setup_basics_fragment.xml | 2 +- res/layout-w800dp/account_setup_template.xml | 7 +++ res/layout/account_setup_basics_fragment.xml | 6 --- res/layout/account_setup_buttons.xml | 45 ----------------- res/layout/account_setup_template.xml | 38 +++++++++++++- res/values-w800dp/constants.xml | 23 +++++++++ res/values/colors.xml | 1 + res/values/constants.xml | 4 ++ res/values/styles.xml | 6 +++ .../setup/AccountSetupBasicsFragment.java | 50 +++++++++++++++++-- 10 files changed, 126 insertions(+), 56 deletions(-) delete mode 100644 res/layout/account_setup_buttons.xml create mode 100644 res/values-w800dp/constants.xml diff --git a/res/layout-w600dp/account_setup_basics_fragment.xml b/res/layout-w600dp/account_setup_basics_fragment.xml index 982bb6cd6..791cfe27e 100644 --- a/res/layout-w600dp/account_setup_basics_fragment.xml +++ b/res/layout-w600dp/account_setup_basics_fragment.xml @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:inputType="textEmailAddress" /> - + - - diff --git a/res/layout/account_setup_buttons.xml b/res/layout/account_setup_buttons.xml deleted file mode 100644 index b1608b8d9..000000000 --- a/res/layout/account_setup_buttons.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - diff --git a/res/layout/account_setup_template.xml b/res/layout/account_setup_template.xml index a784973b2..b989126c9 100644 --- a/res/layout/account_setup_template.xml +++ b/res/layout/account_setup_template.xml @@ -48,6 +48,42 @@ android:layout_weight="1"/> - + + + + + + diff --git a/res/values-w800dp/constants.xml b/res/values-w800dp/constants.xml new file mode 100644 index 000000000..bf2bc5c32 --- /dev/null +++ b/res/values-w800dp/constants.xml @@ -0,0 +1,23 @@ + + + + + false + + \ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index 1459a58d9..016a4d81e 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -23,6 +23,7 @@ #666666 #CCCCCC #3b3b3b + #373737 #666666 diff --git a/res/values/constants.xml b/res/values/constants.xml index 794528164..895252e21 100644 --- a/res/values/constants.xml +++ b/res/values/constants.xml @@ -18,4 +18,8 @@ false + + + true \ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index c88858747..49893f595 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -66,6 +66,12 @@ @dimen/setup_info_text_margin_bottom + +