summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Mantler <nicoya@google.com>2014-10-07 15:19:49 -0700
committerTony Mantler <nicoya@google.com>2014-10-09 10:38:47 -0700
commit19ebfab06ddb0c0f4f5c56de6f5467af28d12e99 (patch)
tree70a22dd239be5448d8f9d601f543e44d4bac854b
parentab3ed2cb7ac10a90d3bc9d4bc95f209c2de20d5a (diff)
downloadandroid_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
-rw-r--r--res/color/buttontext.xml4
-rw-r--r--res/drawable-hdpi/ic_nav_arrow_left.pngbin4554 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_nav_arrow_left_disabled.pngbin3976 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_nav_arrow_left_pressed.pngbin4513 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_nav_arrow_right.pngbin4662 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_nav_arrow_right_disabled.pngbin4057 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_nav_arrow_right_pressed.pngbin4736 -> 0 bytes
-rw-r--r--res/drawable-ldrtl/ic_nav_arrow_next_button.xml24
-rw-r--r--res/drawable-ldrtl/ic_nav_arrow_previous_button.xml24
-rw-r--r--res/drawable-mdpi/ic_nav_arrow_left.pngbin2903 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_nav_arrow_left_disabled.pngbin2770 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_nav_arrow_left_pressed.pngbin3035 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_nav_arrow_right.pngbin3152 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_nav_arrow_right_disabled.pngbin2914 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_nav_arrow_right_pressed.pngbin3220 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_nav_arrow_left.pngbin6175 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_nav_arrow_left_disabled.pngbin5645 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_nav_arrow_left_pressed.pngbin6348 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_nav_arrow_right.pngbin6054 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_nav_arrow_right_disabled.pngbin5764 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_nav_arrow_right_pressed.pngbin6311 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_nav_arrow_left.pngbin5364 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_nav_arrow_left_disabled.pngbin5184 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_nav_arrow_left_pressed.pngbin5357 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_nav_arrow_right.pngbin5415 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_nav_arrow_right_disabled.pngbin5099 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_nav_arrow_right_pressed.pngbin5313 -> 0 bytes
-rw-r--r--res/drawable/ic_nav_arrow_next_button.xml24
-rw-r--r--res/drawable/ic_nav_arrow_previous_button.xml24
-rw-r--r--res/layout/account_setup_template.xml127
-rw-r--r--res/values-w600dp/dimensions.xml3
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/constants.xml5
-rw-r--r--res/values/dimensions.xml8
-rw-r--r--res/values/styles.xml16
-rw-r--r--src/com/android/email/activity/setup/AccountSetupBasicsFragment.java9
36 files changed, 82 insertions, 189 deletions
diff --git a/res/color/buttontext.xml b/res/color/buttontext.xml
index 25aca0d14..e2250be44 100644
--- a/res/color/buttontext.xml
+++ b/res/color/buttontext.xml
@@ -15,6 +15,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false" android:color="@color/button_text_disabled_color" />
- <item android:color="@color/button_text_color" />
+ <item android:state_enabled="false" android:color="@color/text_color_disabled" />
+ <item android:color="@color/text_color_black" />
</selector>
diff --git a/res/drawable-hdpi/ic_nav_arrow_left.png b/res/drawable-hdpi/ic_nav_arrow_left.png
deleted file mode 100644
index 57ee89f62..000000000
--- a/res/drawable-hdpi/ic_nav_arrow_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_nav_arrow_left_disabled.png b/res/drawable-hdpi/ic_nav_arrow_left_disabled.png
deleted file mode 100644
index 3bd1ab8f2..000000000
--- a/res/drawable-hdpi/ic_nav_arrow_left_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_nav_arrow_left_pressed.png b/res/drawable-hdpi/ic_nav_arrow_left_pressed.png
deleted file mode 100644
index d9ef5c25e..000000000
--- a/res/drawable-hdpi/ic_nav_arrow_left_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_nav_arrow_right.png b/res/drawable-hdpi/ic_nav_arrow_right.png
deleted file mode 100644
index d9346cdbd..000000000
--- a/res/drawable-hdpi/ic_nav_arrow_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_nav_arrow_right_disabled.png b/res/drawable-hdpi/ic_nav_arrow_right_disabled.png
deleted file mode 100644
index e6702ee22..000000000
--- a/res/drawable-hdpi/ic_nav_arrow_right_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_nav_arrow_right_pressed.png b/res/drawable-hdpi/ic_nav_arrow_right_pressed.png
deleted file mode 100644
index d3a97ae16..000000000
--- a/res/drawable-hdpi/ic_nav_arrow_right_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl/ic_nav_arrow_next_button.xml b/res/drawable-ldrtl/ic_nav_arrow_next_button.xml
deleted file mode 100644
index b3a14e5ba..000000000
--- a/res/drawable-ldrtl/ic_nav_arrow_next_button.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_nav_arrow_left_disabled"
- android:state_enabled="false" />
- <item android:drawable="@drawable/ic_nav_arrow_left_pressed"
- android:state_pressed="true" />
- <item android:drawable="@drawable/ic_nav_arrow_left" />
-</selector> \ No newline at end of file
diff --git a/res/drawable-ldrtl/ic_nav_arrow_previous_button.xml b/res/drawable-ldrtl/ic_nav_arrow_previous_button.xml
deleted file mode 100644
index 8670749af..000000000
--- a/res/drawable-ldrtl/ic_nav_arrow_previous_button.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_nav_arrow_right_disabled"
- android:state_enabled="false" />
- <item android:drawable="@drawable/ic_nav_arrow_right_pressed"
- android:state_pressed="true" />
- <item android:drawable="@drawable/ic_nav_arrow_right" />
-</selector> \ No newline at end of file
diff --git a/res/drawable-mdpi/ic_nav_arrow_left.png b/res/drawable-mdpi/ic_nav_arrow_left.png
deleted file mode 100644
index c9757565d..000000000
--- a/res/drawable-mdpi/ic_nav_arrow_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_nav_arrow_left_disabled.png b/res/drawable-mdpi/ic_nav_arrow_left_disabled.png
deleted file mode 100644
index b5151a5f6..000000000
--- a/res/drawable-mdpi/ic_nav_arrow_left_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_nav_arrow_left_pressed.png b/res/drawable-mdpi/ic_nav_arrow_left_pressed.png
deleted file mode 100644
index b57d48b1c..000000000
--- a/res/drawable-mdpi/ic_nav_arrow_left_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_nav_arrow_right.png b/res/drawable-mdpi/ic_nav_arrow_right.png
deleted file mode 100644
index 414bb7021..000000000
--- a/res/drawable-mdpi/ic_nav_arrow_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_nav_arrow_right_disabled.png b/res/drawable-mdpi/ic_nav_arrow_right_disabled.png
deleted file mode 100644
index 08a761f88..000000000
--- a/res/drawable-mdpi/ic_nav_arrow_right_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_nav_arrow_right_pressed.png b/res/drawable-mdpi/ic_nav_arrow_right_pressed.png
deleted file mode 100644
index 37f9cb6e3..000000000
--- a/res/drawable-mdpi/ic_nav_arrow_right_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_nav_arrow_left.png b/res/drawable-xhdpi/ic_nav_arrow_left.png
deleted file mode 100644
index 058aead77..000000000
--- a/res/drawable-xhdpi/ic_nav_arrow_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_nav_arrow_left_disabled.png b/res/drawable-xhdpi/ic_nav_arrow_left_disabled.png
deleted file mode 100644
index b8b2e0b3f..000000000
--- a/res/drawable-xhdpi/ic_nav_arrow_left_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_nav_arrow_left_pressed.png b/res/drawable-xhdpi/ic_nav_arrow_left_pressed.png
deleted file mode 100644
index daca8617d..000000000
--- a/res/drawable-xhdpi/ic_nav_arrow_left_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_nav_arrow_right.png b/res/drawable-xhdpi/ic_nav_arrow_right.png
deleted file mode 100644
index 08e278dbd..000000000
--- a/res/drawable-xhdpi/ic_nav_arrow_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_nav_arrow_right_disabled.png b/res/drawable-xhdpi/ic_nav_arrow_right_disabled.png
deleted file mode 100644
index fdc645e16..000000000
--- a/res/drawable-xhdpi/ic_nav_arrow_right_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_nav_arrow_right_pressed.png b/res/drawable-xhdpi/ic_nav_arrow_right_pressed.png
deleted file mode 100644
index 06e589f10..000000000
--- a/res/drawable-xhdpi/ic_nav_arrow_right_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_nav_arrow_left.png b/res/drawable-xxhdpi/ic_nav_arrow_left.png
deleted file mode 100644
index f5684a636..000000000
--- a/res/drawable-xxhdpi/ic_nav_arrow_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_nav_arrow_left_disabled.png b/res/drawable-xxhdpi/ic_nav_arrow_left_disabled.png
deleted file mode 100644
index 2e61c652d..000000000
--- a/res/drawable-xxhdpi/ic_nav_arrow_left_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_nav_arrow_left_pressed.png b/res/drawable-xxhdpi/ic_nav_arrow_left_pressed.png
deleted file mode 100644
index 0ae57f0f2..000000000
--- a/res/drawable-xxhdpi/ic_nav_arrow_left_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_nav_arrow_right.png b/res/drawable-xxhdpi/ic_nav_arrow_right.png
deleted file mode 100644
index 53a65dc05..000000000
--- a/res/drawable-xxhdpi/ic_nav_arrow_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_nav_arrow_right_disabled.png b/res/drawable-xxhdpi/ic_nav_arrow_right_disabled.png
deleted file mode 100644
index 8ce98e2d6..000000000
--- a/res/drawable-xxhdpi/ic_nav_arrow_right_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_nav_arrow_right_pressed.png b/res/drawable-xxhdpi/ic_nav_arrow_right_pressed.png
deleted file mode 100644
index e250115b6..000000000
--- a/res/drawable-xxhdpi/ic_nav_arrow_right_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_nav_arrow_next_button.xml b/res/drawable/ic_nav_arrow_next_button.xml
deleted file mode 100644
index 8670749af..000000000
--- a/res/drawable/ic_nav_arrow_next_button.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_nav_arrow_right_disabled"
- android:state_enabled="false" />
- <item android:drawable="@drawable/ic_nav_arrow_right_pressed"
- android:state_pressed="true" />
- <item android:drawable="@drawable/ic_nav_arrow_right" />
-</selector> \ No newline at end of file
diff --git a/res/drawable/ic_nav_arrow_previous_button.xml b/res/drawable/ic_nav_arrow_previous_button.xml
deleted file mode 100644
index b3a14e5ba..000000000
--- a/res/drawable/ic_nav_arrow_previous_button.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/ic_nav_arrow_left_disabled"
- android:state_enabled="false" />
- <item android:drawable="@drawable/ic_nav_arrow_left_pressed"
- android:state_pressed="true" />
- <item android:drawable="@drawable/ic_nav_arrow_left" />
-</selector> \ No newline at end of file
diff --git a/res/layout/account_setup_template.xml b/res/layout/account_setup_template.xml
index fc44c88dc..affe9c99f 100644
--- a/res/layout/account_setup_template.xml
+++ b/res/layout/account_setup_template.xml
@@ -14,75 +14,78 @@
limitations under the License.
-->
-<!-- Account Setup Layout - standard -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- Account Setup Layout -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ style="@style/account_setup_content" >
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- style="@style/account_setup_content"
- android:fillViewport="true" >
+ android:layout_height="wrap_content"
+ android:orientation="vertical" >
+
+ <!-- Headline -->
+ <!-- Set headline for first fragment, change in code as we progress through screens -->
+ <TextView
+ android:id="@+id/headline"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/account_setup_options_headline"
+ style="@style/account_setup_headline" />
+
+ <!-- Primary Content -->
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/setup_fragment_content"
+ style="@style/account_setup_fragment_container"
+ />
+
+ </LinearLayout>
+ </ScrollView>
+ <!-- Buttons below that -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <!-- Headline -->
- <!-- Set headline for first fragment, change in code as we progress through screens -->
+ android:minHeight="56dp"
+ android:orientation="horizontal"
+ android:background="@color/account_setup_button_bar_background" >
<TextView
- android:id="@+id/headline"
+ android:id="@+id/previous"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:text="@string/account_setup_options_headline"
- style="@style/account_setup_headline" />
-
- <!-- Primary Content -->
- <FrameLayout
- android:layout_width="match_parent"
+ android:layout_gravity="center_vertical"
+ android:drawableStart="@drawable/ic_prev"
+ android:drawableLeft="@drawable/ic_prev"
+ android:drawablePadding="@dimen/setup_nav_button_drawable_padding"
+ android:text="@string/previous"
+ style="@style/account_setup_nav_button" />
+ <TextView
+ android:id="@+id/manual_setup"
android:layout_height="wrap_content"
- android:id="@+id/setup_fragment_content"
- style="@style/account_setup_fragment_container"
- />
- <View
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"/>
-
- <!-- Buttons below that -->
- <LinearLayout
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:text="@string/account_setup_basics_manual_setup_action"
+ android:visibility="gone"
+ style="@style/account_setup_nav_button" />
+ <Space
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+ <TextView
+ android:id="@+id/next"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/setup_nav_button_padding_top"
- android:paddingLeft="@dimen/setup_nav_button_padding_side"
- android:paddingRight="@dimen/setup_nav_button_padding_side"
- android:paddingBottom="@dimen/setup_nav_button_padding_bottom"
- android:orientation="horizontal">
- <ImageButton
- style="@style/account_setup_nav_button"
- android:contentDescription="@string/previous"
- android:id="@+id/previous"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:src="@drawable/ic_nav_arrow_previous_button"
- android:text="@string/next" />
- <Button
- android:id="@+id/manual_setup"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:text="@string/account_setup_basics_manual_setup_action"
- android:visibility="gone"
- android:layout_gravity="center_vertical"
- style="@style/account_setup_manual_button" />
- <View
- android:layout_height="match_parent"
- android:layout_width="0dp"
- android:layout_weight="1" />
- <ImageButton
- style="@style/account_setup_nav_button"
- android:contentDescription="@string/next"
- android:id="@+id/next"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:src="@drawable/ic_nav_arrow_next_button"
- android:text="@string/next" />
- </LinearLayout>
+ android:layout_width="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:drawableEnd="@drawable/ic_next"
+ android:drawableRight="@drawable/ic_next"
+ android:drawablePadding="@dimen/setup_nav_button_drawable_padding"
+ android:text="@string/next"
+ style="@style/account_setup_nav_button" />
</LinearLayout>
-</ScrollView>
+</LinearLayout>
diff --git a/res/values-w600dp/dimensions.xml b/res/values-w600dp/dimensions.xml
index e5efb6c6d..97f465823 100644
--- a/res/values-w600dp/dimensions.xml
+++ b/res/values-w600dp/dimensions.xml
@@ -21,9 +21,6 @@
<dimen name="settings_fragment_padding_side">32dp</dimen>
<dimen name="settings_fragment_padding_bottom">24dp</dimen>
- <!-- Account setup nav buttons -->
- <dimen name="setup_nav_button_padding_side">64dp</dimen>
-
<!-- Account setup fragments -->
<dimen name="setup_fragment_padding_top">16dp</dimen>
<dimen name="setup_fragment_padding_side">64dp</dimen>
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>
diff --git a/src/com/android/email/activity/setup/AccountSetupBasicsFragment.java b/src/com/android/email/activity/setup/AccountSetupBasicsFragment.java
index 7afbcab75..2f67342f8 100644
--- a/src/com/android/email/activity/setup/AccountSetupBasicsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupBasicsFragment.java
@@ -122,15 +122,6 @@ public class AccountSetupBasicsFragment extends AccountSetupFragment {
public void setNextButtonEnabled(boolean enabled) {
super.setNextButtonEnabled(enabled);
mManualSetupView.setEnabled(enabled);
- final float manualButtonAlpha;
- if (enabled) {
- manualButtonAlpha =
- getResources().getFraction(R.fraction.manual_setup_enabled_alpha, 1, 1);
- } else {
- manualButtonAlpha =
- getResources().getFraction(R.fraction.manual_setup_disabled_alpha, 1, 1);
- }
- mManualSetupView.setAlpha(manualButtonAlpha);
}
public void setEmail(final String email) {