diff options
| author | Tony Mantler <nicoya@google.com> | 2014-10-07 15:19:49 -0700 |
|---|---|---|
| committer | Tony Mantler <nicoya@google.com> | 2014-10-09 10:38:47 -0700 |
| commit | 19ebfab06ddb0c0f4f5c56de6f5467af28d12e99 (patch) | |
| tree | 70a22dd239be5448d8f9d601f543e44d4bac854b /res/values | |
| parent | ab3ed2cb7ac10a90d3bc9d4bc95f209c2de20d5a (diff) | |
| download | android_packages_apps_Email-19ebfab06ddb0c0f4f5c56de6f5467af28d12e99.tar.gz android_packages_apps_Email-19ebfab06ddb0c0f4f5c56de6f5467af28d12e99.tar.bz2 android_packages_apps_Email-19ebfab06ddb0c0f4f5c56de6f5467af28d12e99.zip | |
Restyle account setup flow nav buttons
b/17266006
Change-Id: Ie60e56b493ba23465a06cce8a3c37d3fd9d061e5
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 3 | ||||
| -rw-r--r-- | res/values/constants.xml | 5 | ||||
| -rw-r--r-- | res/values/dimensions.xml | 8 | ||||
| -rw-r--r-- | res/values/styles.xml | 16 |
4 files changed, 15 insertions, 17 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index f9a185c3f..54ec8b4e2 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -24,7 +24,7 @@ <color name="account_setup_label_large_text_color">#000000</color> <color name="account_setup_divider_color">#CCCCCC</color> <color name="account_setup_xlarge_background_color">#e5e5e5</color> - <color name="account_setup_manual_button_color">#373737</color> + <color name="account_setup_button_bar_background">@color/very_light_grey</color> <!-- Standard text colors --> <color name="text_secondary_color">#666666</color> @@ -40,7 +40,6 @@ <color name="combined_view_account_color_8">#ff738359</color> <color name="combined_view_account_color_9">#ff9d50a4</color> - <color name="button_text_color">#777777</color> <color name="button_text_disabled_color">#cccccc</color> <color name="password_warning_color">#d30000</color> diff --git a/res/values/constants.xml b/res/values/constants.xml index 74ce82f68..3b88d7d6f 100644 --- a/res/values/constants.xml +++ b/res/values/constants.xml @@ -19,11 +19,6 @@ <!-- Boolean value indicating whether the feedback is supported. --> <bool name="feedback_supported">false</bool> - <!-- Alpha value for 'manual setup' button when disabled --> - <fraction name="manual_setup_disabled_alpha">40%</fraction> - <!-- Alpha value for 'manual setup' button when enabled --> - <fraction name="manual_setup_enabled_alpha">100%</fraction> - <!-- Boolean value indicating if quick responses are supported --> <bool name="quickresponse_supported">true</bool> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 8b3dba70c..949bbbf2f 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -45,9 +45,11 @@ <dimen name="setup_fragment_padding_bottom">16dp</dimen> <!-- Account setup navigation buttons --> - <dimen name="setup_nav_button_padding_top">24dp</dimen> - <dimen name="setup_nav_button_padding_side">20dp</dimen> - <dimen name="setup_nav_button_padding_bottom">24dp</dimen> + <dimen name="setup_nav_button_padding_top">16dp</dimen> + <dimen name="setup_nav_button_drawable_padding">16dp</dimen> + <dimen name="setup_nav_button_padding_side">12dp</dimen> + <dimen name="setup_nav_button_padding_bottom">16dp</dimen> + <dimen name="setup_nav_button_margin">4dp</dimen> <!-- Account setup text buttons --> <!-- See also w600dp --> diff --git a/res/values/styles.xml b/res/values/styles.xml index f78a14eb4..435474f1b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -59,7 +59,15 @@ <!-- Navigation buttons on the account setup screens --> <style name="account_setup_nav_button"> - <item name="android:background">@android:color/transparent</item> + <item name="android:layout_margin">@dimen/setup_nav_button_margin</item> + <item name="android:background">?android:attr/selectableItemBackground</item> + <item name="android:paddingTop">@dimen/setup_nav_button_padding_top</item> + <item name="android:paddingLeft">@dimen/setup_nav_button_padding_side</item> + <item name="android:paddingRight">@dimen/setup_nav_button_padding_side</item> + <item name="android:paddingBottom">@dimen/setup_nav_button_padding_bottom</item> + <item name="android:textAllCaps">true</item> + <item name="android:textAppearance">?android:attr/textAppearanceMedium</item> + <item name="android:textColor">@color/buttontext</item> </style> <!-- Cancel/Done buttons on the account settings (server settings) fragments --> @@ -78,12 +86,6 @@ <item name="android:layout_marginBottom">@dimen/setup_info_text_margin_bottom</item> </style> - <style name="account_setup_manual_button"> - <item name="android:textSize">16sp</item> - <item name="android:textColor">@color/account_setup_manual_button_color</item> - <item name="android:alpha">0.4</item> - </style> - <!-- Account setup row label text --> <style name="account_setup_label_text"> <item name="android:textColor">?android:attr/textColorPrimary</item> |