Merge "Add new darker action bar icons." into jb-ub-mail-ur10
diff --git a/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png b/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png
new file mode 100644
index 0000000..735bcb8
--- /dev/null
+++ b/res/drawable-hdpi/btn_default_disabled_focused_holo_light.9.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_default_disabled_holo_light.9.png b/res/drawable-hdpi/btn_default_disabled_holo_light.9.png
new file mode 100644
index 0000000..b5a25f7
--- /dev/null
+++ b/res/drawable-hdpi/btn_default_disabled_holo_light.9.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_default_focused_holo_light.9.png b/res/drawable-hdpi/btn_default_focused_holo_light.9.png
new file mode 100644
index 0000000..6555635
--- /dev/null
+++ b/res/drawable-hdpi/btn_default_focused_holo_light.9.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_default_normal_holo_light.9.png b/res/drawable-hdpi/btn_default_normal_holo_light.9.png
new file mode 100644
index 0000000..3367a76
--- /dev/null
+++ b/res/drawable-hdpi/btn_default_normal_holo_light.9.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_default_pressed_holo_light.9.png b/res/drawable-hdpi/btn_default_pressed_holo_light.9.png
new file mode 100644
index 0000000..d9ead96
--- /dev/null
+++ b/res/drawable-hdpi/btn_default_pressed_holo_light.9.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_doc.png b/res/drawable-hdpi/ic_attach_doc.png
deleted file mode 100644
index ecc92f1..0000000
--- a/res/drawable-hdpi/ic_attach_doc.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_event.png b/res/drawable-hdpi/ic_attach_event.png
deleted file mode 100644
index 10930db..0000000
--- a/res/drawable-hdpi/ic_attach_event.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_excel.png b/res/drawable-hdpi/ic_attach_excel.png
deleted file mode 100644
index 4f34b54..0000000
--- a/res/drawable-hdpi/ic_attach_excel.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_pdf.png b/res/drawable-hdpi/ic_attach_pdf.png
deleted file mode 100644
index 858e846..0000000
--- a/res/drawable-hdpi/ic_attach_pdf.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_pic.png b/res/drawable-hdpi/ic_attach_pic.png
deleted file mode 100644
index f787812..0000000
--- a/res/drawable-hdpi/ic_attach_pic.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_slide.png b/res/drawable-hdpi/ic_attach_slide.png
deleted file mode 100644
index 8f8f71e..0000000
--- a/res/drawable-hdpi/ic_attach_slide.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_various.png b/res/drawable-hdpi/ic_attach_various.png
deleted file mode 100644
index 91cf56c..0000000
--- a/res/drawable-hdpi/ic_attach_various.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_video.png b/res/drawable-hdpi/ic_attach_video.png
deleted file mode 100644
index 96b5df4..0000000
--- a/res/drawable-hdpi/ic_attach_video.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_attach_video_holo_light.png b/res/drawable-hdpi/ic_attach_video_holo_light.png
deleted file mode 100644
index 6073be1..0000000
--- a/res/drawable-hdpi/ic_attach_video_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_edit_holo_dark.png b/res/drawable-hdpi/ic_edit_holo_dark.png
deleted file mode 100644
index 8fc5df1..0000000
--- a/res/drawable-hdpi/ic_edit_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward_holo_dark.png b/res/drawable-hdpi/ic_forward_holo_dark.png
deleted file mode 100644
index 1f1349d..0000000
--- a/res/drawable-hdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_notification_multiple_mail_holo_dark.png b/res/drawable-hdpi/ic_notification_multiple_mail_holo_dark.png
index c4f3648..a733c2a 100644
--- a/res/drawable-hdpi/ic_notification_multiple_mail_holo_dark.png
+++ b/res/drawable-hdpi/ic_notification_multiple_mail_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/spinner_ab_default_holo_light.9.png b/res/drawable-hdpi/spinner_ab_default_holo_light.9.png
deleted file mode 100644
index d281adb..0000000
--- a/res/drawable-hdpi/spinner_ab_default_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/spinner_ab_disabled_holo_light.9.png b/res/drawable-hdpi/spinner_ab_disabled_holo_light.9.png
deleted file mode 100644
index 4215396..0000000
--- a/res/drawable-hdpi/spinner_ab_disabled_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/spinner_ab_focused_holo_light.9.png b/res/drawable-hdpi/spinner_ab_focused_holo_light.9.png
deleted file mode 100644
index f8d619b..0000000
--- a/res/drawable-hdpi/spinner_ab_focused_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/spinner_ab_pressed_holo_light.9.png b/res/drawable-hdpi/spinner_ab_pressed_holo_light.9.png
deleted file mode 100644
index 6c22e22..0000000
--- a/res/drawable-hdpi/spinner_ab_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png b/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png
new file mode 100644
index 0000000..d3ea4e5
--- /dev/null
+++ b/res/drawable-mdpi/btn_default_disabled_focused_holo_light.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_default_disabled_holo_light.9.png b/res/drawable-mdpi/btn_default_disabled_holo_light.9.png
new file mode 100644
index 0000000..9fdc75e
--- /dev/null
+++ b/res/drawable-mdpi/btn_default_disabled_holo_light.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_default_focused_holo_light.9.png b/res/drawable-mdpi/btn_default_focused_holo_light.9.png
new file mode 100644
index 0000000..9596ba9
--- /dev/null
+++ b/res/drawable-mdpi/btn_default_focused_holo_light.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_default_normal_holo_light.9.png b/res/drawable-mdpi/btn_default_normal_holo_light.9.png
new file mode 100644
index 0000000..4ccfaac
--- /dev/null
+++ b/res/drawable-mdpi/btn_default_normal_holo_light.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_default_pressed_holo_light.9.png b/res/drawable-mdpi/btn_default_pressed_holo_light.9.png
new file mode 100644
index 0000000..e489850
--- /dev/null
+++ b/res/drawable-mdpi/btn_default_pressed_holo_light.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_doc.png b/res/drawable-mdpi/ic_attach_doc.png
deleted file mode 100644
index 325eb09..0000000
--- a/res/drawable-mdpi/ic_attach_doc.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_event.png b/res/drawable-mdpi/ic_attach_event.png
deleted file mode 100644
index 3553b1a..0000000
--- a/res/drawable-mdpi/ic_attach_event.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_excel.png b/res/drawable-mdpi/ic_attach_excel.png
deleted file mode 100644
index 5eaa304..0000000
--- a/res/drawable-mdpi/ic_attach_excel.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_pdf.png b/res/drawable-mdpi/ic_attach_pdf.png
deleted file mode 100644
index f1c1aa9..0000000
--- a/res/drawable-mdpi/ic_attach_pdf.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_pic.png b/res/drawable-mdpi/ic_attach_pic.png
deleted file mode 100644
index 9daf8de..0000000
--- a/res/drawable-mdpi/ic_attach_pic.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_slide.png b/res/drawable-mdpi/ic_attach_slide.png
deleted file mode 100644
index 7c5db31..0000000
--- a/res/drawable-mdpi/ic_attach_slide.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_various.png b/res/drawable-mdpi/ic_attach_various.png
deleted file mode 100644
index ea3f377..0000000
--- a/res/drawable-mdpi/ic_attach_various.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_video.png b/res/drawable-mdpi/ic_attach_video.png
deleted file mode 100644
index ea352f0..0000000
--- a/res/drawable-mdpi/ic_attach_video.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attach_video_holo_light.png b/res/drawable-mdpi/ic_attach_video_holo_light.png
deleted file mode 100644
index 92eca7b..0000000
--- a/res/drawable-mdpi/ic_attach_video_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_edit_holo_dark.png b/res/drawable-mdpi/ic_edit_holo_dark.png
deleted file mode 100644
index 66b595e..0000000
--- a/res/drawable-mdpi/ic_edit_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward_holo_dark.png b/res/drawable-mdpi/ic_forward_holo_dark.png
deleted file mode 100644
index 0894ce5..0000000
--- a/res/drawable-mdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png b/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png
index a6394aa..8071c27 100644
--- a/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png
+++ b/res/drawable-mdpi/ic_notification_multiple_mail_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/spinner_ab_default_holo_light.9.png b/res/drawable-mdpi/spinner_ab_default_holo_light.9.png
deleted file mode 100644
index 4055f70..0000000
--- a/res/drawable-mdpi/spinner_ab_default_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/spinner_ab_disabled_holo_light.9.png b/res/drawable-mdpi/spinner_ab_disabled_holo_light.9.png
deleted file mode 100644
index f74c02b..0000000
--- a/res/drawable-mdpi/spinner_ab_disabled_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/spinner_ab_focused_holo_light.9.png b/res/drawable-mdpi/spinner_ab_focused_holo_light.9.png
deleted file mode 100644
index 6536ee6..0000000
--- a/res/drawable-mdpi/spinner_ab_focused_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/spinner_ab_pressed_holo_light.9.png b/res/drawable-mdpi/spinner_ab_pressed_holo_light.9.png
deleted file mode 100644
index 6de0ba8..0000000
--- a/res/drawable-mdpi/spinner_ab_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_default_disabled_focused_holo_light.9.png b/res/drawable-xhdpi/btn_default_disabled_focused_holo_light.9.png
new file mode 100644
index 0000000..efb728a
--- /dev/null
+++ b/res/drawable-xhdpi/btn_default_disabled_focused_holo_light.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_default_disabled_holo_light.9.png b/res/drawable-xhdpi/btn_default_disabled_holo_light.9.png
new file mode 100644
index 0000000..2139044
--- /dev/null
+++ b/res/drawable-xhdpi/btn_default_disabled_holo_light.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_default_focused_holo_light.9.png b/res/drawable-xhdpi/btn_default_focused_holo_light.9.png
new file mode 100644
index 0000000..6fd626e
--- /dev/null
+++ b/res/drawable-xhdpi/btn_default_focused_holo_light.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_default_normal_holo_light.9.png b/res/drawable-xhdpi/btn_default_normal_holo_light.9.png
new file mode 100644
index 0000000..cd330ba
--- /dev/null
+++ b/res/drawable-xhdpi/btn_default_normal_holo_light.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_default_pressed_holo_light.9.png b/res/drawable-xhdpi/btn_default_pressed_holo_light.9.png
new file mode 100644
index 0000000..681e561
--- /dev/null
+++ b/res/drawable-xhdpi/btn_default_pressed_holo_light.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_doc.png b/res/drawable-xhdpi/ic_attach_doc.png
deleted file mode 100644
index b8c664c..0000000
--- a/res/drawable-xhdpi/ic_attach_doc.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_event.png b/res/drawable-xhdpi/ic_attach_event.png
deleted file mode 100644
index b6bf96e..0000000
--- a/res/drawable-xhdpi/ic_attach_event.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_excel.png b/res/drawable-xhdpi/ic_attach_excel.png
deleted file mode 100644
index 247bb17..0000000
--- a/res/drawable-xhdpi/ic_attach_excel.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_pdf.png b/res/drawable-xhdpi/ic_attach_pdf.png
deleted file mode 100644
index f902b49..0000000
--- a/res/drawable-xhdpi/ic_attach_pdf.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_pic.png b/res/drawable-xhdpi/ic_attach_pic.png
deleted file mode 100644
index 719c42a..0000000
--- a/res/drawable-xhdpi/ic_attach_pic.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_slide.png b/res/drawable-xhdpi/ic_attach_slide.png
deleted file mode 100644
index 2bebd94..0000000
--- a/res/drawable-xhdpi/ic_attach_slide.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_various.png b/res/drawable-xhdpi/ic_attach_various.png
deleted file mode 100644
index 2c22a97..0000000
--- a/res/drawable-xhdpi/ic_attach_various.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_video.png b/res/drawable-xhdpi/ic_attach_video.png
deleted file mode 100644
index ef0d461..0000000
--- a/res/drawable-xhdpi/ic_attach_video.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attach_video_holo_light.png b/res/drawable-xhdpi/ic_attach_video_holo_light.png
deleted file mode 100644
index 7b1fbd5..0000000
--- a/res/drawable-xhdpi/ic_attach_video_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_edit_holo_dark.png b/res/drawable-xhdpi/ic_edit_holo_dark.png
deleted file mode 100644
index 169003f..0000000
--- a/res/drawable-xhdpi/ic_edit_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_forward_holo_dark.png b/res/drawable-xhdpi/ic_forward_holo_dark.png
deleted file mode 100644
index 95e617e..0000000
--- a/res/drawable-xhdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_notification_multiple_mail_holo_dark.png b/res/drawable-xhdpi/ic_notification_multiple_mail_holo_dark.png
index ddb32fe..03bf26c 100644
--- a/res/drawable-xhdpi/ic_notification_multiple_mail_holo_dark.png
+++ b/res/drawable-xhdpi/ic_notification_multiple_mail_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/spinner_ab_default_holo_light.9.png b/res/drawable-xhdpi/spinner_ab_default_holo_light.9.png
deleted file mode 100644
index 9174c4e..0000000
--- a/res/drawable-xhdpi/spinner_ab_default_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/spinner_ab_disabled_holo_light.9.png b/res/drawable-xhdpi/spinner_ab_disabled_holo_light.9.png
deleted file mode 100644
index 126637d..0000000
--- a/res/drawable-xhdpi/spinner_ab_disabled_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/spinner_ab_focused_holo_light.9.png b/res/drawable-xhdpi/spinner_ab_focused_holo_light.9.png
deleted file mode 100644
index 29036b9..0000000
--- a/res/drawable-xhdpi/spinner_ab_focused_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/spinner_ab_pressed_holo_light.9.png b/res/drawable-xhdpi/spinner_ab_pressed_holo_light.9.png
deleted file mode 100644
index 82f752f..0000000
--- a/res/drawable-xhdpi/spinner_ab_pressed_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/btn_default.xml b/res/drawable/btn_default.xml
new file mode 100644
index 0000000..5ed0301
--- /dev/null
+++ b/res/drawable/btn_default.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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:state_window_focused="false" android:state_enabled="true"
+ android:drawable="@drawable/btn_default_normal_holo_light" />
+ <item android:state_window_focused="false" android:state_enabled="false"
+ android:drawable="@drawable/btn_default_disabled_holo_light" />
+ <item android:state_pressed="true"
+ android:drawable="@drawable/btn_default_pressed_holo_light" />
+ <item android:state_focused="true" android:state_enabled="true"
+ android:drawable="@drawable/btn_default_focused_holo_light" />
+ <item android:state_enabled="true"
+ android:drawable="@drawable/btn_default_normal_holo_light" />
+ <item android:state_focused="true"
+ android:drawable="@drawable/btn_default_disabled_focused_holo_light" />
+ <item android:drawable="@drawable/btn_default_disabled_holo_light" />
+</selector>
diff --git a/res/layout/conversation_view.xml b/res/layout/conversation_view.xml
index 56c36c6..8d6e628 100644
--- a/res/layout/conversation_view.xml
+++ b/res/layout/conversation_view.xml
@@ -56,14 +56,20 @@
android:layout_gravity="top"
android:visibility="gone" />
- <include layout="@layout/new_message_notification_bar"
+ <Button xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/new_message_notification_bar"
+ style="@style/NewMessageButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="@dimen/conversation_view_margin_side"
android:layout_marginEnd="@dimen/conversation_view_margin_side"
android:layout_marginLeft="@dimen/conversation_view_margin_side"
- android:layout_marginRight="@dimen/conversation_view_margin_side" />
+ android:layout_marginRight="@dimen/conversation_view_margin_side"
+ android:animateLayoutChanges="true"
+ android:paddingLeft="24dp"
+ android:paddingRight="24dp"
+ android:visibility="gone" />
</FrameLayout>
diff --git a/res/layout/new_message_notification_bar.xml b/res/layout/new_message_notification_bar.xml
deleted file mode 100644
index 82dc342..0000000
--- a/res/layout/new_message_notification_bar.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 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.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_marginBottom="12dp"
- android:animateLayoutChanges="true"
- android:background="@android:color/white">
-
- <!-- ignore UselessParent because the button drawable needs a white background -->
- <LinearLayout
- android:id="@+id/new_message_notification_bar"
- style="?android:attr/buttonStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingLeft="24dp"
- android:paddingRight="24dp"
- android:visibility="gone"
- tools:ignore="UselessParent" >
-
- <TextView
- android:id="@+id/new_message_description"
- style="?android:attr/textAppearanceMedium"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:singleLine="true" />
-
- <TextView
- style="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="8dp"
- android:text="@string/show" />
- </LinearLayout>
-
-</FrameLayout>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 21c4410..dc94356 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -16,10 +16,6 @@
limitations under the License.
-->
<resources>
- <style name="UnreadCountActionBar" parent="UnreadCountActionBarBase">
- <item name="android:gravity">center_vertical|left</item>
- </style>
-
<style name="AccountSpinnerAnchorTextPrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
</style>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7fb8518..7571e12 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -65,9 +65,6 @@
<color name="conv_header_text_dark">@color/dark_gray_text_color</color>
<color name="conv_header_text_link_blue">#35b4e3</color>
-
- <color name="position_bar_background">@color/gray_text_color</color>
-
<!-- Folder colors -->
<color name="folder_disabled_drop_target_text_color">#999999</color>
@@ -104,7 +101,7 @@
<!-- Teaser colors -->
<!-- The color of the section name text in the teaser -->
- <color name="teaser_main_text">#58585b</color>
+ <color name="teaser_main_text">@color/dark_gray_text_color</color>
<!-- swipe to refresh text color, this matches the color in
progressbar_solid_holo.png -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0128e4f..61fd7fa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -221,8 +221,6 @@
<string name="preview_attachment">Preview</string>
<!-- Read email screen, button name. Save an attachment to sd card. [CHAR LIMIT=10] -->
<string name="save_attachment">Save</string>
- <!-- Read email screen, button name. Open a dialog to explain that no application found to view the attachment. [CHAR LIMIT=10] -->
- <string name="info_attachment">Info</string>
<!-- Read email screen, button name. Cancel a downloading attachment. [CHAR LIMIT=10] -->
<string name="cancel_attachment">Cancel</string>
<!-- Read email screen, button name. Redownload an attachment [CHAR LIMIT=20]-->
@@ -437,28 +435,15 @@
<!-- Search Results: Text for header that is shown above search results, while waiting for search results from the server [CHAR LIMIT=30] -->
<string name="search_results_searching_header">Searching\u2026</string>
- <!-- List header for recent folders for current account in account dropdown [CHAR LIMIT=100] -->
- <string name="recent_folders">Recent</string>
-
<!-- Conversation view -->
<!-- Text anchor for control to add / change labels on a conversation when
viewing it. [CHAR LIMIT=40] -->
<string name="add_label">Add label</string>
- <!-- position bar label in conversation view: number out of total [CHAR LIMIT=50]-->
- <string name="conversation_count"><xliff:g id="count">%1$s</xliff:g> of <xliff:g id="total">%2$s</xliff:g></string>
- <!-- position bar label in conversation view: label for a newer conversation [CHAR LIMIT=20]-->
- <string name="conversation_newer">Newer</string>
- <!-- position bar label in conversation view: label for an older conversation [CHAR LIMIT=20]-->
- <string name="conversation_older">Older</string>
<!-- New Message notification text that appears over conversation view on incoming message. [CHAR LIMIT=30] -->
- <string name="new_incoming_messages_one">New message from <xliff:g id="sender">%s</xliff:g>.</string>
+ <string name="new_incoming_messages_one">New message from <xliff:g id="sender">%s</xliff:g>. Show.</string>
<!-- New Message notification text that appears over conversation view on incoming messages. [CHAR LIMIT=30] -->
- <string name="new_incoming_messages_many"><xliff:g id="count">%1$d</xliff:g> new messages</string>
-
- <!-- Anchor text for a control to show new messages when viewing a
- conversation. [CHAR LIMIT=20] -->
- <string name="show">Show</string>
+ <string name="new_incoming_messages_many"><xliff:g id="count">%1$d</xliff:g> new messages. Show.</string>
<!-- Conversation message header strings -->
<!-- Icon name for expanding recipient details in a message when viewing it. [CHAR LIMIT=40] -->
@@ -583,17 +568,6 @@
<!-- Name of the Folder shortcut widget. Should use "Email" to refer to the app. [CHAR LIMIT=30] -->
<string name="folder_shortcut_widget_label">Email folder</string>
- <!-- Manange folders mode, sync option: synchronize all conversations with this folder. [CHAR LIMIT=100] -->
- <string name="sync_all">Sync: All</string>
- <plurals name="sync_recent">
- <!-- Manage folders mode, sync option: synchronize conversations in the last day with this folder [CHAR LIMIT=100] -->
- <item quantity="one">Sync: Last <xliff:g id="count" example="1">%1$d</xliff:g> day</item>
- <!-- Manage folders mode, sync option: synchronize conversations in the last 2+ day with this folder [CHAR LIMIT=100] -->
- <item quantity="other">Sync: Last <xliff:g id="count" example="4">%1$d</xliff:g> days</item>
- </plurals>
- <!-- Manage folders mode, sync option: don't synchronize any conversation with this folder [CHAR LIMIT=100] -->
- <string name="sync_none">Sync: None</string>
-
<!-- Folder selection dialog -->
<!-- Title for change folders dialog [CHAR LIMIT=30] -->
<string name="change_folders_selection_dialog_title">Change folders</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a01ed4d..2feeb5e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -146,24 +146,6 @@
<item name="android:paddingBottom">4dp</item>
</style>
- <style name="UnreadCountActionBarBase" parent="UnreadCount">
- <item name="android:layout_marginRight">8dp</item>
- <item name="android:textColor">#bbbbbb</item>
- <!-- Use dp rather than sp for size since starts large and must not get too large -->
- <item name="android:textSize">36dp</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">match_parent</item>
- <item name="android:gravity">center_vertical</item>
- <item name="android:onClick">doNothingClickHandler</item>
- <item name="android:focusableInTouchMode">true</item>
- <item name="android:focusable">true</item>
- <item name="android:clickable">true</item>
- </style>
-
- <style name="UnreadCountActionBar" parent="UnreadCountActionBarBase">
- <item name="android:gravity">center_vertical|right</item>
- </style>
-
<style name="UnseenCount">
<item name="android:layout_width">44dp</item>
<item name="android:layout_height">wrap_content</item>
@@ -479,4 +461,10 @@
<item name="android:textColor">?android:attr/textColorLink</item>
</style>
+ <style name="NewMessageButtonStyle" parent="@android:style/Widget.Holo.Light.Button">
+ <item name="android:background">@drawable/btn_default</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:textColor">@color/dark_gray_text_color</item>
+ <item name="android:textSize">14sp</item>
+ </style>
</resources>
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 2117580..e8cd3c1 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -41,7 +41,7 @@
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
import android.webkit.WebView;
-import android.widget.TextView;
+import android.widget.Button;
import com.android.mail.FormattedDateBuilder;
import com.android.mail.R;
@@ -127,7 +127,7 @@
private ConversationViewProgressController mProgressController;
- private View mNewMessageBar;
+ private Button mNewMessageBar;
protected HtmlConversationTemplates mTemplates;
@@ -338,7 +338,7 @@
.findViewById(R.id.conversation_container);
mConversationContainer.setAccountController(this);
- mNewMessageBar = mConversationContainer.findViewById(R.id.new_message_notification_bar);
+ mNewMessageBar = (Button) mConversationContainer.findViewById(R.id.new_message_notification_bar);
mNewMessageBar.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -982,9 +982,7 @@
}
private void showNewMessageNotification(NewMessagesInfo info) {
- final TextView descriptionView = (TextView) mNewMessageBar.findViewById(
- R.id.new_message_description);
- descriptionView.setText(info.getNotificationText());
+ mNewMessageBar.setText(info.getNotificationText());
mNewMessageBar.setVisibility(View.VISIBLE);
}
