am 9cca981b: am 1dedf065: am 88fbe4ad: am e64d5291: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '9cca981b4494f2a4d78d08ac83e9a162322f9ad1':
Restyle account setup flow nav buttons
diff --git a/res/drawable-hdpi/ic_next_24dp.png b/res/drawable-hdpi/ic_next_24dp.png
new file mode 100644
index 0000000..b88f557
--- /dev/null
+++ b/res/drawable-hdpi/ic_next_24dp.png
Binary files differ
diff --git a/res/drawable-ldrtl/ic_next.xml b/res/drawable-ldrtl/ic_next.xml
new file mode 100644
index 0000000..6e585df
--- /dev/null
+++ b/res/drawable-ldrtl/ic_next.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 Google Inc.
+ Licensed to 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.
+-->
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/ic_next_24dp"
+ android:fromDegrees="180"
+ android:toDegrees="180" />
diff --git a/res/drawable-ldrtl/ic_prev.xml b/res/drawable-ldrtl/ic_prev.xml
new file mode 100644
index 0000000..34586dd
--- /dev/null
+++ b/res/drawable-ldrtl/ic_prev.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 Google Inc.
+ Licensed to 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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_next_24dp" />
diff --git a/res/drawable-mdpi/ic_next_24dp.png b/res/drawable-mdpi/ic_next_24dp.png
new file mode 100644
index 0000000..6ed579c
--- /dev/null
+++ b/res/drawable-mdpi/ic_next_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_next_24dp.png b/res/drawable-xhdpi/ic_next_24dp.png
new file mode 100644
index 0000000..1efbf09
--- /dev/null
+++ b/res/drawable-xhdpi/ic_next_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_next_24dp.png b/res/drawable-xxhdpi/ic_next_24dp.png
new file mode 100644
index 0000000..2d90b17
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_next_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_next_24dp.png b/res/drawable-xxxhdpi/ic_next_24dp.png
new file mode 100644
index 0000000..4e7264d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_next_24dp.png
Binary files differ
diff --git a/res/drawable/ic_next.xml b/res/drawable/ic_next.xml
new file mode 100644
index 0000000..34586dd
--- /dev/null
+++ b/res/drawable/ic_next.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 Google Inc.
+ Licensed to 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.
+-->
+
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_next_24dp" />
diff --git a/res/drawable/ic_prev.xml b/res/drawable/ic_prev.xml
new file mode 100644
index 0000000..6e585df
--- /dev/null
+++ b/res/drawable/ic_prev.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 Google Inc.
+ Licensed to 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.
+-->
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+ android:drawable="@drawable/ic_next_24dp"
+ android:fromDegrees="180"
+ android:toDegrees="180" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 71e45aa..6455cf8 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,6 +19,7 @@
<color name="text_color_medium_grey">#9e9e9e</color>
<color name="text_color_grey">#757575</color>
<color name="text_color_black">#212121</color>
+ <color name="text_color_disabled">#bdbdbd</color>
<color name="accent_blue">#4285f4</color>
<color name="text_color_blue">@color/accent_blue</color>
<color name="text_color_draft_red">@color/primary_color</color>
@@ -26,6 +27,7 @@
<color name="gray_text_color">#777777</color>
<color name="dark_gray_text_color">#58585b</color>
<color name="light_gray">#cccccc</color>
+ <color name="very_light_grey">#f5f5f5</color>
<!-- if you want to make something blue, please try to use THIS blue -->
<color name="mail_app_blue">@android:color/holo_blue_light</color>
<color name="divider_color">#e5e5e5</color>
@@ -70,7 +72,7 @@
<!-- Conversation message header colors -->
<color name="conversation_view_border_color">@color/divider_color</color>
- <color name="conversation_view_background_color">#f5f5f5</color>
+ <color name="conversation_view_background_color">@color/very_light_grey</color>
<color name="conversation_view_text_color_light">@color/text_color_grey</color>
<color name="conversation_view_text_color_dark">@color/text_color_black</color>
<color name="conversation_view_text_color_link_blue">@color/text_color_blue</color>
