am 5cf73b8a: Enable animateLayoutChanges for list view only for >ICS
* commit '5cf73b8acfce82fdc8185313b939d0c35271be3c':
Enable animateLayoutChanges for list view only for >ICS
diff --git a/res/drawable-hdpi/ic_attachment_holo_light.png b/res/drawable-hdpi/ic_attachment_holo_light.png
index 8598cb2..dbde178 100644
--- a/res/drawable-hdpi/ic_attachment_holo_light.png
+++ b/res/drawable-hdpi/ic_attachment_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index 924e8bb..0000000
--- a/res/drawable-hdpi/ic_menu_expander_maximized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index de78288..0000000
--- a/res/drawable-hdpi/ic_menu_expander_minimized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_attachment_holo_light.png b/res/drawable-mdpi/ic_attachment_holo_light.png
index 3669539..62585d9 100644
--- a/res/drawable-mdpi/ic_attachment_holo_light.png
+++ b/res/drawable-mdpi/ic_attachment_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index e2a2dfd..0000000
--- a/res/drawable-mdpi/ic_menu_expander_maximized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index 7eed231..0000000
--- a/res/drawable-mdpi/ic_menu_expander_minimized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_attachment_holo_light.png b/res/drawable-xhdpi/ic_attachment_holo_light.png
index ff0d9dd..3024ed2 100644
--- a/res/drawable-xhdpi/ic_attachment_holo_light.png
+++ b/res/drawable-xhdpi/ic_attachment_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index b174cf8..0000000
--- a/res/drawable-xhdpi/ic_menu_expander_maximized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index fab561e..0000000
--- a/res/drawable-xhdpi/ic_menu_expander_minimized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_attachment_holo_light.png b/res/drawable-xxhdpi/ic_attachment_holo_light.png
index c018930..d355e72 100644
--- a/res/drawable-xxhdpi/ic_attachment_holo_light.png
+++ b/res/drawable-xxhdpi/ic_attachment_holo_light.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png b/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png
deleted file mode 100644
index a42aec2..0000000
--- a/res/drawable-xxhdpi/ic_menu_expander_maximized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png b/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png
deleted file mode 100644
index 1ca2e46..0000000
--- a/res/drawable-xxhdpi/ic_menu_expander_minimized_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/attachment.xml b/res/layout/compose_attachment_bar.xml
similarity index 83%
rename from res/layout/attachment.xml
rename to res/layout/compose_attachment_bar.xml
index c82b998..9c3aed6 100644
--- a/res/layout/attachment.xml
+++ b/res/layout/compose_attachment_bar.xml
@@ -22,18 +22,18 @@
<ImageView
android:id="@+id/thumbnail"
- android:src="@drawable/ic_attachment_holo_light"
- android:layout_gravity="center_vertical"
- style="@style/AttachmentThumbnail"/>
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:scaleType="center"
+ android:src="@drawable/ic_attachment_holo_light" />
<!-- Attachment name and size -->
<LinearLayout
android:orientation="vertical"
- android:layout_width="0dip"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_gravity="center_vertical"
- style="@style/AttachmentTextContainer" >
+ android:layout_gravity="center_vertical" >
<TextView android:id="@+id/attachment_name"
style="@style/AttachmentName" />
@@ -46,7 +46,7 @@
<!-- Remove button -->
<ImageButton android:id="@+id/remove_attachment"
android:src="@drawable/ic_cancel_holo_light"
- android:layout_width="48dip"
+ android:layout_width="48dp"
android:layout_height="match_parent"
android:clickable="true"
android:gravity="center"
diff --git a/res/layout/conversation_item_view_normal.xml b/res/layout/conversation_item_view_normal.xml
index f1f24ae..4f42e9c 100644
--- a/res/layout/conversation_item_view_normal.xml
+++ b/res/layout/conversation_item_view_normal.xml
@@ -107,20 +107,18 @@
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="12dp"
+ android:layout_marginTop="15dp"
android:textSize="12sp"
android:lines="1"
android:includeFontPadding="false"
android:text="@string/long_string"
style="@style/ConversationListDateStyle" />
- <!-- top margin should be 12dp, but the asset has 8dp built-in padding -->
- <!-- left padding should be 8dp, but the asset has 2dp built-in padding -->
<ImageView
android:id="@+id/paperclip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="4dp"
+ android:layout_marginTop="16dp"
android:src="@drawable/ic_attachment_holo_light"
style="@style/ConversationListPaperclipStyle" />
diff --git a/res/layout/conversation_item_view_normal_spacious.xml b/res/layout/conversation_item_view_normal_spacious.xml
index c93d41d..a83cfc8 100644
--- a/res/layout/conversation_item_view_normal_spacious.xml
+++ b/res/layout/conversation_item_view_normal_spacious.xml
@@ -113,13 +113,11 @@
android:text="@string/long_string"
style="@style/ConversationListDateStyle" />
- <!-- top margin should be 16dp, but the asset has 8dp built-in padding -->
- <!-- left padding should be 8dp, but the asset has 2dp built-in padding -->
<ImageView
android:id="@+id/paperclip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="17dp"
android:src="@drawable/ic_attachment_holo_light"
style="@style/ConversationListPaperclipStyle" />
diff --git a/res/layout/conversation_item_view_wide.xml b/res/layout/conversation_item_view_wide.xml
index adc6f4c..6922634 100644
--- a/res/layout/conversation_item_view_wide.xml
+++ b/res/layout/conversation_item_view_wide.xml
@@ -118,13 +118,11 @@
android:includeFontPadding="false"
android:text="@string/long_string" />
- <!-- cancel out the asset's 8dp built-in top padding -->
- <!-- left padding should be 8dp, but the asset has 2dp built-in padding -->
<ImageView
android:id="@+id/paperclip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="-8dp"
+ android:layout_marginTop="1dp"
android:src="@drawable/ic_attachment_holo_light"
style="@style/ConversationListWidePaperclipStyle" />
diff --git a/res/layout/conversation_message_details_header.xml b/res/layout/conversation_message_details_header.xml
index 0a4fad8..209e9cd 100644
--- a/res/layout/conversation_message_details_header.xml
+++ b/res/layout/conversation_message_details_header.xml
@@ -15,23 +15,27 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/details_collapsed_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/message_details_header_margin_top"
+ android:paddingBottom="@dimen/message_details_header_padding_bottom"
android:background="?android:attr/selectableItemBackground"
- android:paddingBottom="@dimen/message_details_header_vertical_padding"
+ android:orientation="vertical"
style="@style/MessageDetailsHeaderStyle" >
<TextView
- android:id="@+id/recipients_summary"
- android:layout_width="0dp"
- android:layout_gravity="fill_horizontal"
- android:singleLine="true"
- android:bufferType="spannable"
- style="@style/RecipientSummaryStyle" />
- <ImageView
- android:layout_width="wrap_content"
+ android:id="@+id/recipients_summary_collapsed"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:contentDescription="@string/expand_recipient_details"
- android:src="@drawable/ic_menu_expander_minimized_holo_light" />
-</GridLayout>
+ android:singleLine="true"
+ style="@style/MessageHeaderSmallStyle" />
+ <TextView
+ android:id="@+id/details_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:text="@string/details"
+ android:textColor="@color/conv_header_text_link_blue"
+ style="@style/MessageHeaderSmallStyle" />
+</LinearLayout>
diff --git a/res/layout/conversation_message_details_header_expanded.xml b/res/layout/conversation_message_details_header_expanded.xml
index 94bc9dc..8585b3d 100644
--- a/res/layout/conversation_message_details_header_expanded.xml
+++ b/res/layout/conversation_message_details_header_expanded.xml
@@ -20,17 +20,40 @@
android:id="@+id/details_expanded_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/message_details_header_margin_top"
+ app:columnCount="2"
+ app:rowCount="8"
android:background="?android:attr/selectableItemBackground"
- app:columnCount="3"
- app:rowCount="6"
style="@style/MessageDetailsHeaderStyle" >
<TextView
+ android:id="@+id/recipients_summary_expanded"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:focusable="true"
+ app:layout_column="0"
+ app:layout_row="0"
+ app:layout_columnSpan="2"
+ android:singleLine="true"
+ style="@style/MessageHeaderSmallStyle" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:focusable="true"
+ app:layout_column="0"
+ app:layout_row="1"
+ app:layout_columnSpan="2"
+ android:text="@string/hide_details"
+ android:textColor="@color/conv_header_text_link_blue"
+ style="@style/MessageHeaderSmallStyle" />
+ <TextView
android:id="@+id/from_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
- app:layout_row="0"
+ app:layout_row="2"
android:text="@string/from_heading"
android:visibility="gone"
style="@style/MessageHeaderDetailsHeadingStyle" />
@@ -38,27 +61,20 @@
android:id="@+id/from_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
- app:layout_row="0"
+ app:layout_row="2"
android:visibility="gone"
style="@style/MessageDetailsValueStyle" />
- <ImageView
- android:id="@+id/details_expander"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:layout_column="2"
- app:layout_row="0"
- android:contentDescription="@string/collapse_recipient_details"
- android:src="@drawable/ic_menu_expander_maximized_holo_light"
- style="@style/DetailsExpanderStyle" />
<TextView
android:id="@+id/replyto_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
- app:layout_row="1"
+ app:layout_row="3"
android:text="@string/replyto_heading"
android:visibility="gone"
style="@style/MessageHeaderDetailsHeadingStyle" />
@@ -66,18 +82,20 @@
android:id="@+id/replyto_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
- app:layout_row="1"
+ app:layout_row="3"
android:visibility="gone"
style="@style/MessageDetailsValueStyle" />
<TextView
android:id="@+id/to_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
- app:layout_row="2"
+ app:layout_row="4"
android:text="@string/to_heading"
android:visibility="gone"
style="@style/MessageHeaderDetailsHeadingStyle" />
@@ -85,18 +103,20 @@
android:id="@+id/to_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
- app:layout_row="2"
+ app:layout_row="4"
android:visibility="gone"
style="@style/MessageDetailsValueStyle" />
<TextView
android:id="@+id/cc_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
- app:layout_row="3"
+ app:layout_row="5"
android:text="@string/cc_heading"
android:visibility="gone"
style="@style/MessageHeaderDetailsHeadingStyle" />
@@ -104,18 +124,20 @@
android:id="@+id/cc_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
- app:layout_row="3"
+ app:layout_row="5"
android:visibility="gone"
style="@style/MessageDetailsValueStyle" />
<TextView
android:id="@+id/bcc_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
- app:layout_row="4"
+ app:layout_row="6"
android:text="@string/bcc_heading"
android:visibility="gone"
style="@style/MessageHeaderDetailsHeadingStyle" />
@@ -123,18 +145,20 @@
android:id="@+id/bcc_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
- app:layout_row="4"
+ app:layout_row="6"
android:visibility="gone"
style="@style/MessageDetailsValueStyle" />
<TextView
android:id="@+id/date_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
- app:layout_row="5"
+ app:layout_row="7"
android:text="@string/date_heading"
android:visibility="gone"
style="@style/MessageHeaderDetailsHeadingStyle" />
@@ -142,10 +166,11 @@
android:id="@+id/date_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
- app:layout_row="5"
+ app:layout_row="7"
android:visibility="gone"
style="@style/MessageDetailsValueStyle" />
diff --git a/res/layout/conversation_message_upper_header.xml b/res/layout/conversation_message_upper_header.xml
index 0a493c6..880560c 100644
--- a/res/layout/conversation_message_upper_header.xml
+++ b/res/layout/conversation_message_upper_header.xml
@@ -25,7 +25,6 @@
android:id="@+id/photo"
android:layout_width="@dimen/message_header_contact_photo_width"
android:layout_height="@dimen/message_header_contact_photo_height"
- android:layout_gravity="center_vertical"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:scaleType="centerCrop"
@@ -36,14 +35,25 @@
android:id="@+id/draft"
android:layout_width="@dimen/message_header_contact_photo_width"
android:layout_height="@dimen/message_header_contact_photo_height"
- android:layout_gravity="center_vertical"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:visibility="gone"
android:scaleType="center"
android:src="@drawable/ic_draft"
style="@style/MessageHeaderContactImageStyle" />
- <include layout="@layout/conversation_message_upper_header_text" />
- <include layout="@layout/conversation_message_upper_header_actions" />
+ <LinearLayout
+ android:id="@+id/actions_and_details"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <include layout="@layout/conversation_message_upper_header_text" />
+ <include layout="@layout/conversation_message_upper_header_actions" />
+ </LinearLayout>
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/conversation_message_upper_header_text.xml b/res/layout/conversation_message_upper_header_text.xml
index 849a058..dcab4ed 100644
--- a/res/layout/conversation_message_upper_header_text.xml
+++ b/res/layout/conversation_message_upper_header_text.xml
@@ -19,52 +19,48 @@
<!-- NOTE: Be careful when setting title_container's marginEnd.
The value is updated in code. See uses of
MessageHeaderView.mCollapsedTitleContainerMarginEnd -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/title_container"
- android:layout_width="0dip"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_marginTop="12dp"
+ android:layout_marginTop="8dp"
+ android:orientation="vertical"
style="@style/MessageUpperHeaderTextStyle" >
- <TextView
- android:id="@+id/upper_date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- android:lines="1"
- style="@style/MessageHeaderUpperDateStyle" />
- <ImageView
- android:id="@+id/attachment"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toStartOf="@id/upper_date"
- android:layout_toLeftOf="@id/upper_date"
- android:src="@drawable/ic_attachment_holo_light"
- style="@style/AttachmentIconStyle" />
- <TextView
- android:id="@+id/sender_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toStartOf="@id/attachment"
- android:layout_toLeftOf="@id/attachment"
- style="@style/MessageSenderNameStyle" />
- <TextView
- android:id="@+id/sender_email"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/sender_name"
- style="@style/MessageHeaderSubtitleStyle" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView
+ android:id="@+id/sender_name"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ style="@style/MessageSenderNameStyle" />
+ <ImageView
+ android:id="@+id/attachment"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:paddingLeft="@dimen/attachment_icon_padding"
+ android:paddingRight="@dimen/attachment_icon_padding"
+ android:src="@drawable/ic_attachment_holo_light"/>
+ <TextView
+ android:id="@+id/upper_date"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/upper_date_margin"
+ android:singleLine="true"
+ style="@style/MessageHeaderSmallStyle" />
+ </LinearLayout>
<TextView
android:id="@+id/send_date"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/sender_email"
style="@style/MessageHeaderSubtitleStyle" />
<TextView
android:id="@+id/email_snippet"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/sender_name"
style="@style/MessageHeaderSnippetStyle" />
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/widget_conversation_list_item.xml b/res/layout/widget_conversation_list_item.xml
index 891db59..ff736af 100644
--- a/res/layout/widget_conversation_list_item.xml
+++ b/res/layout/widget_conversation_list_item.xml
@@ -55,8 +55,9 @@
android:layout_weight="1"
android:singleLine="true"
android:ellipsize="end"
+ android:textAlignment="viewStart"
+ android:textColor="@color/dark_gray_text_color"
android:textSize="@dimen/senders_font_size"
- android:textColor="#58585b"
android:includeFontPadding="false"
style="@style/WidgetSendersStyle" />
<!-- Use negative margins to align attachment icon with text -->
@@ -64,12 +65,17 @@
android:id="@+id/widget_attachment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="-4sp"/>
+ android:layout_marginTop="4dp"
+ android:layout_marginLeft="4dp"
+ android:layout_marginRight="4dp"
+ android:src="@drawable/ic_attachment_holo_light" />
<TextView
android:id="@+id/widget_date"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:gravity="top" />
+ android:gravity="top"
+ android:textColor="@color/date_text_color"
+ android:textSize="@dimen/widget_date_font_size" />
</LinearLayout>
<TextView
@@ -79,7 +85,10 @@
android:layout_marginLeft="16dip"
android:layout_marginRight="16dip"
android:maxLines="2"
- android:includeFontPadding="false" />
+ android:includeFontPadding="false"
+ android:textAlignment="viewStart"
+ android:textColor="@color/dark_gray_text_color"
+ android:textSize="@dimen/widget_subject_font_size" />
<LinearLayout
android:id="@+id/labels"
android:layout_width="wrap_content"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 20d934b..27f1644 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Vouerinstellings"</string>
<string name="menu_settings" msgid="6007027046949837282">"Instellings"</string>
<string name="menu_search" msgid="5297197523031943248">"Soek"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigasie"</string>
<string name="mark_important" msgid="6904096897104265870">"Merk as belangrik"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Merk as onbelangrik"</string>
<string name="add_cc_label" msgid="504861315425773180">"Voeg Cc/Bcc by"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Verskuif na <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultate"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Search word nie ondersteun op hierdie rekening nie."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Soek tans…"</string>
<string name="add_label" msgid="6060201715848652940">"Voeg vouer by"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Wys nuwe boodskap van <xliff:g id="SENDER">%s</xliff:g> af."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Benoem vouer se kortpad"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Wag vir sinkronisasie"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Jou e-pos sal binnekort verskyn."</string>
<string name="not_synced_title" msgid="794279749170198599">"Rekening nie gesinkroniseer nie"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Hierdie rekening is nie opgestel om outomaties te sinkroniseer nie.\nRaak "<b>"Sinkroniseer nou"</b>" om pos een keer te sinkroniseer, of "<b>"Verander sinkroniseer-instellings"</b>" om hierdie rekening op te stel om pos outomaties te sinkroniseer."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinkroniseer nou"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 42200ff..c2f0700 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -21,7 +21,7 @@
<string name="to" msgid="4392614766835725698">"ለ"</string>
<string name="cc" msgid="7017720927911078193">"ካርቦን ቅጂ"</string>
<string name="bcc" msgid="3098643138241111579">"ስውር ቅጂ"</string>
- <string name="subject_hint" msgid="7253964583324677128">"ርእሰ ጉዳይ"</string>
+ <string name="subject_hint" msgid="7253964583324677128">"ርዕሰ ጉዳይ"</string>
<string name="body_hint" msgid="4279864165439577668">"ኢሜይል ፃፍ"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"ፋይል አያይዝ"</string>
<string name="add_photo_attachment" msgid="3738882100645552858">"ስዕል አያይዝ"</string>
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"የአቃፊ ቅንብሮች"</string>
<string name="menu_settings" msgid="6007027046949837282">"ቅንብሮች"</string>
<string name="menu_search" msgid="5297197523031943248">"ፍለጋ"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"አሰሳ"</string>
<string name="mark_important" msgid="6904096897104265870">"አስፈላጊ የሚል ምልክት አድርግ"</string>
<string name="mark_not_important" msgid="4550967327747977068">"አስፈላጊ አይደለም የሚል ምልክት አድርግ"</string>
<string name="add_cc_label" msgid="504861315425773180">"ካርቦን ቅጂ/ስውር ቅጂ አክል"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"ወደ <xliff:g id="FOLDERNAME">%1$s</xliff:g> ተወስዷል"</string>
<string name="search_results_header" msgid="4669917471897026269">"ውጤቶች"</string>
<string name="search_unsupported" msgid="4654227193354052607">"ፍለጋ በዚህ መለያ አይደገፍም።"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"በመፈለግ ላይ…"</string>
<string name="add_label" msgid="6060201715848652940">"አቃፊ አክል"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"ከ<xliff:g id="SENDER">%s</xliff:g> የመጣ አዲስ መልዕክት አሳይ።"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"ለአቃፊ አቋራጭ ስም ስጥ"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"ማመሳሰል በመጠበቅ ላይ"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"ኢሜይልህ ከትንሽ ጊዜ በኋላ ብቅ ይላል።"</string>
<string name="not_synced_title" msgid="794279749170198599">"መለያ አልተመሳሰለም"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"ይህ መለያ በራስ-ሰር እንዲመሳሰል አልተዋቀረም።\nመልዕክት አንዴ ለማመሳሰል "<b>"አሁን አመሳስል"</b>"ን ንካ፣ ወይም ደግሞ ይሄ መለያ መልዕክት በራስ-ሰር እንዲያመሳስል ለማዋቀር "<b>"የማመሳሰል ቅንብሮችን ቀይር"</b>"።"</string>
<string name="manual_sync" msgid="6743983544685622800">"አሁን አመሳስል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c98092e..27607b8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"إعدادات المجلد"</string>
<string name="menu_settings" msgid="6007027046949837282">"إعدادات"</string>
<string name="menu_search" msgid="5297197523031943248">"بحث"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"التنقل"</string>
<string name="mark_important" msgid="6904096897104265870">"وضع علامة كمهمة"</string>
<string name="mark_not_important" msgid="4550967327747977068">"وضع علامة كغير مهمة"</string>
<string name="add_cc_label" msgid="504861315425773180">"إضافة نسخة/ مخفية"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"تم النقل إلى <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"النتائج"</string>
<string name="search_unsupported" msgid="4654227193354052607">"لا يمكن استخدام البحث على هذا الحساب."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"جارٍ البحث…"</string>
<string name="add_label" msgid="6060201715848652940">"إضافة مجلد"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"عرض رسالة جديدة من <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"اختصار اسم المجلد"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"في انتظار المزامنة"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"سيظهر بريدك الإلكتروني بعد قليل."</string>
<string name="not_synced_title" msgid="794279749170198599">"لم تتم مزامنة الحساب"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"لم يتم تعيين هذا الحساب على المزامنة تلقائيًا.\nيمكنك لمس "<b>"المزامنة الآن"</b>" لمزامنة البريد مرة واحدة أو "<b>"تغيير إعدادات المزامنة"</b>" لإعداد هذا الحساب على مزامنة البريد تلقائيًا."</string>
<string name="manual_sync" msgid="6743983544685622800">"مزامنة الآن"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6c48eb0..a97724c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Настройки за папката"</string>
<string name="menu_settings" msgid="6007027046949837282">"Настройки"</string>
<string name="menu_search" msgid="5297197523031943248">"Търсене"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Придвижване"</string>
<string name="mark_important" msgid="6904096897104265870">"Означаване като важно"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Означаване като маловажно"</string>
<string name="add_cc_label" msgid="504861315425773180">"Добавяне на Як:/Ск:"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Преместено в/ъв „<xliff:g id="FOLDERNAME">%1$s</xliff:g>“"</string>
<string name="search_results_header" msgid="4669917471897026269">"Резултати"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Търсенето не се поддържа за този профил."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Търси се…"</string>
<string name="add_label" msgid="6060201715848652940">"Добавяне на папка"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Показване на ново съобщение от <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Наименуване на пряк път към папка"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Изчаква се синхронизиране"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Имейлът ви ще се покаже след малко."</string>
<string name="not_synced_title" msgid="794279749170198599">"Профилът не е синхронизиран"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Този профил не е настроен за автоматично синхронизиране.\nДокоснете "<b>"Синхрон сега"</b>", за да синхронизирате еднократно пощата, или "<b>"Настройки за синхрон: Промяна"</b>", за да го настроите за автоматично синхронизиране."</string>
<string name="manual_sync" msgid="6743983544685622800">"Синхрон сега"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fd74c06..e4e1a61 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Configuració de la carpeta"</string>
<string name="menu_settings" msgid="6007027046949837282">"Configuració"</string>
<string name="menu_search" msgid="5297197523031943248">"Cerca"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navegació"</string>
<string name="mark_important" msgid="6904096897104265870">"Marca com a important"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Marca com a no important"</string>
<string name="add_cc_label" msgid="504861315425773180">"Afegeix Cc/Cco"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"S\'ha mogut a <xliff:g id="FOLDERNAME">%1$s</xliff:g>."</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultats"</string>
<string name="search_unsupported" msgid="4654227193354052607">"La cerca no és compatible en aquest compte."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"S\'està cercant..."</string>
<string name="add_label" msgid="6060201715848652940">"Afegeix una carpeta"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Mostra el missatge nou de <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Tecla de drecera per posar nom a la carpeta"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"S\'està esperant per sincronitzar"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"El correu electrònic apareixerà aviat."</string>
<string name="not_synced_title" msgid="794279749170198599">"El compte no s\'ha sincronitzat"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Aquest compte no està configurat per sincronitzar automàticament.\nToca "<b>"Sincronitza ara"</b>" per sincronitzar el correu una vegada o bé "<b>"Canvia la configuració de sincronització"</b>" per configurar aquest compte per sincronitzar el correu de manera automàtica."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronitza ara"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cc47c9a..ad83fc8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Nastavení složek"</string>
<string name="menu_settings" msgid="6007027046949837282">"Nastavení"</string>
<string name="menu_search" msgid="5297197523031943248">"Vyhledat"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigace"</string>
<string name="mark_important" msgid="6904096897104265870">"Označit jako důležité"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Označit jako nedůležité"</string>
<string name="add_cc_label" msgid="504861315425773180">"Přidat kopii/skrytou"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Přesunuto do složky <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Výsledky"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Vyhledávání není v tomto účtu podporováno."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Vyhledávání..."</string>
<string name="add_label" msgid="6060201715848652940">"Přidat složku"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Zobrazit novou zprávu od odesílatele <xliff:g id="SENDER">%s</xliff:g>"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Zadejte název zkratky složky"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Čekání na synchronizaci"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Vaše e-maily se zobrazí za chvíli."</string>
<string name="not_synced_title" msgid="794279749170198599">"Účet není synchronizován"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Tento účet není nastaven na automatickou synchronizaci.\nChcete-li poštu jednou synchronizovat, dotkněte se položky "<b>"Synchronizovat"</b>". Chcete-li v účtu nastavit automatickou synchronizaci pošty, dotkněte se položky "<b>"Změnit nastavení synchronizace"</b>"."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchronizovat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fd1ae20..5725d28 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Indstillinger for mapper"</string>
<string name="menu_settings" msgid="6007027046949837282">"Indstillinger"</string>
<string name="menu_search" msgid="5297197523031943248">"Søg"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigation"</string>
<string name="mark_important" msgid="6904096897104265870">"Markér som vigtig"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Markér som uvigtig"</string>
<string name="add_cc_label" msgid="504861315425773180">"Tilføj Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Flyttet til <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultater"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Søgningen understøttes ikke på denne konto."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Søger..."</string>
<string name="add_label" msgid="6060201715848652940">"Tilføj mappe"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Vis ny besked fra <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Genvej til navngivning af mappe"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Venter på synkronisering"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Din e-mail vises om et øjeblik."</string>
<string name="not_synced_title" msgid="794279749170198599">"Kontoen er ikke synkroniseret"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Denne konto er ikke konfigureret til automatisk synkronisering.\nTryk på "<b>"Synkroniser nu"</b>" for at synkronisere e-mails én gang, eller tryk på "<b>"Skift synkroniseringsindstillinger"</b>" for at konfigurere denne konto til at synkronisere e-mail automatisk."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synkroniser nu"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2e0114e..5693f07 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Ordnereinstellungen"</string>
<string name="menu_settings" msgid="6007027046949837282">"Einstellungen"</string>
<string name="menu_search" msgid="5297197523031943248">"Suche"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigation"</string>
<string name="mark_important" msgid="6904096897104265870">"Als wichtig markieren"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Als nicht wichtig markieren"</string>
<string name="add_cc_label" msgid="504861315425773180">"Cc/Bcc hinzufügen"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Verschoben nach <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Ergebnisse"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Die Suche wird für dieses Konto nicht unterstützt."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Wird gesucht..."</string>
<string name="add_label" msgid="6060201715848652940">"Ordner hinzufügen"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Neue Nachricht von <xliff:g id="SENDER">%s</xliff:g> anzeigen"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ordnerverknüpfung benennen"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Warten auf Synchronisierung"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Ihre E-Mails werden gleich angezeigt."</string>
<string name="not_synced_title" msgid="794279749170198599">"Konto nicht synchronisiert"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Für dieses Konto ist keine automatische Synchronisierung eingerichtet.\nZur einmaligen Synchronisierung der E-Mails tippen Sie auf "<b>"Synchronisieren"</b>". Zum Einrichten der automatischen Synchronisierung für dieses Konto tippen Sie auf "<b>"Synchronisierungseinstellungen ändern"</b>"."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchronisieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a88dd2f..ffb81a8 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Ρυθμίσεις φακέλου..."</string>
<string name="menu_settings" msgid="6007027046949837282">"Ρυθμίσεις"</string>
<string name="menu_search" msgid="5297197523031943248">"Αναζήτηση"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Πλοήγηση"</string>
<string name="mark_important" msgid="6904096897104265870">"Επισήμανση ως σημαντικής"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Επισήμανση ως μη σημαντικής"</string>
<string name="add_cc_label" msgid="504861315425773180">"Προσθήκη Κοιν./Κρ.κοιν."</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Μεταφέρθηκε στο φάκελο <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Αποτελέσματα"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Η αναζήτηση δεν υποστηρίζεται σε αυτόν τον λογαριασμό."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Αναζήτηση…"</string>
<string name="add_label" msgid="6060201715848652940">"Προσθήκη φακέλου"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Εμφάνιση νέου μηνύματος από το χρήστη <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Όνομα συντόμευσης φακέλου"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Αναμονή για συγχρονισμό"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Η αλληλογραφία θα εμφανιστεί σύντομα."</string>
<string name="not_synced_title" msgid="794279749170198599">"Ο λογαριασμός δεν συγχρονίστηκε"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ο λογαριασμός αυτός δεν έχει ρυθμιστεί για αυτόματο συγχρονισμό.\nΑγγίξτε "<b>"Συγχρ. τώρα"</b>" για συγχρονισμό της αλληλογραφίας μία φορά ή "<b>"Αλλαγή ρυθμίσεων συγχρονισμού"</b>" για να ρυθμίσετε το λογαριασμό για αυτόματο συγχρονισμό της αλληλογραφίας."</string>
<string name="manual_sync" msgid="6743983544685622800">"Συγχρ. τώρα"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 51f138e..33ab9bf 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Folder settings"</string>
<string name="menu_settings" msgid="6007027046949837282">"Settings"</string>
<string name="menu_search" msgid="5297197523031943248">"Search"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigation"</string>
<string name="mark_important" msgid="6904096897104265870">"Mark as important"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Mark as not important"</string>
<string name="add_cc_label" msgid="504861315425773180">"Add Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Moved to <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Results"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Search is not supported on this account."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Searching…"</string>
<string name="add_label" msgid="6060201715848652940">"Add folder"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Show new message from <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Name folder shortcut"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Waiting for sync"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Your email will appear shortly."</string>
<string name="not_synced_title" msgid="794279749170198599">"Account not synced"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"This account isn\'t set up to sync automatically.\nTouch "<b>"Sync Now"</b>" to sync mail once, or "<b>"Change Sync Settings"</b>" to set up this account to sync mail automatically."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sync now"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 51f138e..33ab9bf 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Folder settings"</string>
<string name="menu_settings" msgid="6007027046949837282">"Settings"</string>
<string name="menu_search" msgid="5297197523031943248">"Search"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigation"</string>
<string name="mark_important" msgid="6904096897104265870">"Mark as important"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Mark as not important"</string>
<string name="add_cc_label" msgid="504861315425773180">"Add Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Moved to <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Results"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Search is not supported on this account."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Searching…"</string>
<string name="add_label" msgid="6060201715848652940">"Add folder"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Show new message from <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Name folder shortcut"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Waiting for sync"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Your email will appear shortly."</string>
<string name="not_synced_title" msgid="794279749170198599">"Account not synced"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"This account isn\'t set up to sync automatically.\nTouch "<b>"Sync Now"</b>" to sync mail once, or "<b>"Change Sync Settings"</b>" to set up this account to sync mail automatically."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sync now"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 308dc80..1a46df4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Configuración de la carpeta"</string>
<string name="menu_settings" msgid="6007027046949837282">"Configuración"</string>
<string name="menu_search" msgid="5297197523031943248">"Buscar"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navegación"</string>
<string name="mark_important" msgid="6904096897104265870">"Marcar como importante"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Marcar como no importante"</string>
<string name="add_cc_label" msgid="504861315425773180">"Agregar CC/CCO"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Enviada a <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Esta cuenta no admite la función de búsqueda."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Buscando…"</string>
<string name="add_label" msgid="6060201715848652940">"Agregar carpeta"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Mostrar mensaje nuevo de <xliff:g id="SENDER">%s</xliff:g>"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Definir el nombre del acceso directo a la carpeta"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Esperando para sincronizar"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Tu correo aparecerá en breve."</string>
<string name="not_synced_title" msgid="794279749170198599">"Cuenta no sincronizada"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Esta cuenta no está configurada para sincronizar el correo automáticamente.\nToca "<b>"Sincronizar ahora"</b>" para sincronizar el correo una vez o "<b>"Cambiar la configuración de sincronización"</b>" para que esta cuenta sincronice el correo automáticamente."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincr. ahora"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5d77997..b433b3f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Ajustes de carpeta"</string>
<string name="menu_settings" msgid="6007027046949837282">"Ajustes"</string>
<string name="menu_search" msgid="5297197523031943248">"Buscar"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navegación"</string>
<string name="mark_important" msgid="6904096897104265870">"Marcar como importante"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Marcar como no importante"</string>
<string name="add_cc_label" msgid="504861315425773180">"Añadir Cc/Cco"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Movida a <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Esta cuenta no admite la función de búsqueda."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Buscando..."</string>
<string name="add_label" msgid="6060201715848652940">"Añadir carpeta"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Mostrar mensaje nuevo de <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Asignar nombre a acceso directo de carpeta"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Esperando para sincronizar..."</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Tu correo electrónico aparecerá en breve."</string>
<string name="not_synced_title" msgid="794279749170198599">"Cuenta no sincronizada"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Esta cuenta no está configurada para sincronizarse de forma automática.\nToca "<b>"Sincronizar ahora"</b>" para sincronizar el correo una vez o selecciona "<b>"Cambiar ajustes de sincronización"</b>" para configurar la sincronización automática del correo en esta cuenta."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronizar ahora"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index b4f64aa..17276dd 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Kausta seaded"</string>
<string name="menu_settings" msgid="6007027046949837282">"Seaded"</string>
<string name="menu_search" msgid="5297197523031943248">"Otsing ..."</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigeerimine"</string>
<string name="mark_important" msgid="6904096897104265870">"Märgi oluliseks"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Märgi ebaoluliseks"</string>
<string name="add_cc_label" msgid="504861315425773180">"Lisa koopia/pimekoopia"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Teisaldati kausta <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Tulemused"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Sellel kontol ei toetata otsingut."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Otsimine ..."</string>
<string name="add_label" msgid="6060201715848652940">"Lisa kaust"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Näita uut sõnumit saatjalt <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Kausta otseteele nime andmine"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Sünkroonimise ootel"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Teie meil ilmub peagi."</string>
<string name="not_synced_title" msgid="794279749170198599">"Konto ei ole sünkroonitud"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"See konto ei ole seadistatud automaatseks sünkroonimiseks.\nPuudutage käsku "<b>"Sünkrooni kohe"</b>", et meile üks kord sünkroonida, või käsku "<b>"Muuda sünkroonimisseadeid"</b>", et seadistada see konto meilide automaatseks sünkroonimiseks."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sünkr. kohe"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7ae5a44..aef7203 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"تنظیمات پوشه"</string>
<string name="menu_settings" msgid="6007027046949837282">"تنظیمات"</string>
<string name="menu_search" msgid="5297197523031943248">"جستجو"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"پیمایش"</string>
<string name="mark_important" msgid="6904096897104265870">"علامتگذاری بهعنوان مهم"</string>
<string name="mark_not_important" msgid="4550967327747977068">"علامتگذاری بهعنوان غیرمهم"</string>
<string name="add_cc_label" msgid="504861315425773180">"افزودن گیرندهٔ کپی/گیرنده مخفی"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"به <xliff:g id="FOLDERNAME">%1$s</xliff:g> انتقال یافت"</string>
<string name="search_results_header" msgid="4669917471897026269">"نتایج"</string>
<string name="search_unsupported" msgid="4654227193354052607">"جستجو در این حساب پشتیبانی نمیشود."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"در حال جستجو..."</string>
<string name="add_label" msgid="6060201715848652940">"افزودن پوشه"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"نمایش پیام جدید از <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"میانبر نامگذاری پوشه"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"در انتظار همگامسازی"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"ایمیل شما به زودی نمایش داده میشود."</string>
<string name="not_synced_title" msgid="794279749170198599">"حساب همگام نشد"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"این حساب برای همگامسازی به طور خودکار تنظیم نشده است.\nبرای یک بار همگامسازی نامه، "<b>"اکنون همگامسازی شود"</b>" را لمس کنید، یا برای تنظیم این حساب برای همگامسازی نامه به طور خودکار، "<b>"تنظیمات همگامسازی را تغییر دهید"</b>"."</string>
<string name="manual_sync" msgid="6743983544685622800">"اکنون همگامسازی شود"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4a2b781..5fe582f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Kansion asetukset..."</string>
<string name="menu_settings" msgid="6007027046949837282">"Asetukset"</string>
<string name="menu_search" msgid="5297197523031943248">"Haku"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigointi"</string>
<string name="mark_important" msgid="6904096897104265870">"Merkitse tärkeäksi"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Merkitse ei-tärkeäksi"</string>
<string name="add_cc_label" msgid="504861315425773180">"Lisää kopio/piilokopio"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Siirretty kansioon <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Tulokset"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Hakua ei voi käyttää tällä tilillä."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Haetaan.."</string>
<string name="add_label" msgid="6060201715848652940">"Lisää kansio"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Näytä uusi viesti lähettäjältä <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nimeä kansion pikakuvake"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Odotetaan synkronointia"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Sähköpostit näytetään piakkoin."</string>
<string name="not_synced_title" msgid="794279749170198599">"Tiliä ei ole synkronoitu"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Tätä tiliä ei ole määritetty synkronoitavaksi automaattisesti.\nKosketa "<b>"Synkronoi"</b>" synkronoidaksesi sähköpostit kerran tai "<b>"Muuta synkronointiasetuksia"</b>" asettaaksesi tilin synkronoimaan sähköpostit automaattisesti."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synkronoi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 43c825d..694d4ad 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Paramètres des dossiers"</string>
<string name="menu_settings" msgid="6007027046949837282">"Paramètres"</string>
<string name="menu_search" msgid="5297197523031943248">"Recherche"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigation"</string>
<string name="mark_important" msgid="6904096897104265870">"Marquer comme important"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Marquer comme non important"</string>
<string name="add_cc_label" msgid="504861315425773180">"Ajouter Cc/Cci"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Déplacée vers <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Résultats"</string>
<string name="search_unsupported" msgid="4654227193354052607">"La fonctionnalité de recherche n\'est pas compatible avec ce compte."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Recherche en cours…"</string>
<string name="add_label" msgid="6060201715848652940">"Ajouter un dossier"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Afficher le nouveau message envoyé par <xliff:g id="SENDER">%s</xliff:g>"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nom du raccourci du dossier"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"En attente de synchronisation"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Votre courriel va bientôt s\'afficher."</string>
<string name="not_synced_title" msgid="794279749170198599">"Compte non synchronisé"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"La synchronisation automatique n\'est pas configurée pour ce compte.\nAppuyez sur "<b>"Synchroniser"</b>" pour une synchronisation ponctuelle de la messagerie ou sur "<b>"Modifier les paramètres"</b>" pour activer la synchronisation automatique."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchroniser"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4fe4902..71f4c17 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Paramètres du dossier"</string>
<string name="menu_settings" msgid="6007027046949837282">"Paramètres"</string>
<string name="menu_search" msgid="5297197523031943248">"Rechercher"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigation"</string>
<string name="mark_important" msgid="6904096897104265870">"Marquer comme importante"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Marquer comme non importante"</string>
<string name="add_cc_label" msgid="504861315425773180">"Ajouter Cc/Cci"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Déplacée vers <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Résultats"</string>
<string name="search_unsupported" msgid="4654227193354052607">"La fonctionnalité de recherche n\'est pas compatible avec ce compte."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Recherche en cours…"</string>
<string name="add_label" msgid="6060201715848652940">"Ajouter un dossier"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Afficher le nouveau message envoyé par <xliff:g id="SENDER">%s</xliff:g>"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nom du raccourci du dossier"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"En attente de synchronisation"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Votre e-mail va bientôt s\'afficher."</string>
<string name="not_synced_title" msgid="794279749170198599">"Compte non synchronisé"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"La synchronisation automatique n\'est pas configurée pour ce compte.\nAppuyez sur "<b>"Synchroniser"</b>" pour une synchronisation ponctuelle de la messagerie ou sur "<b>"Modifier les paramètres"</b>" pour activer la synchronisation automatique."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchroniser"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 691395d..6fcd274 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"फ़ोल्डर सेटिंग"</string>
<string name="menu_settings" msgid="6007027046949837282">"सेटिंग"</string>
<string name="menu_search" msgid="5297197523031943248">"खोजें"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"मार्गदर्शक"</string>
<string name="mark_important" msgid="6904096897104265870">"महत्व. के रूप में चिह्नित करें"</string>
<string name="mark_not_important" msgid="4550967327747977068">"महत्वपूर्ण नहीं चिह्नित करें"</string>
<string name="add_cc_label" msgid="504861315425773180">"Cc/Bcc जोड़ें"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> में ले जाया गया"</string>
<string name="search_results_header" msgid="4669917471897026269">"परिणाम"</string>
<string name="search_unsupported" msgid="4654227193354052607">"इस खाते पर खोज समर्थित नहीं है."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"खोज रहा है…"</string>
<string name="add_label" msgid="6060201715848652940">"फ़ोल्डर जोड़ें"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"<xliff:g id="SENDER">%s</xliff:g> के नए संदेश दिखाएं."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"नाम फ़ोल्डर शॉर्टकट"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"समन्वयन की प्रतीक्षा कर रहा है"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"आपका ईमेल शीघ्र ही दिखाई देगा."</string>
<string name="not_synced_title" msgid="794279749170198599">"खाता समन्वयित नहीं है"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"यह खाता अपने आप समन्वयित करने के लिए सेट नहीं है. \nएक बार मेल समन्वयित करने के लिए, "<b>"अभी समन्वयित करें"</b>" स्पर्श करें, या इस खाते को मेल अपने आप समन्वयित करने के लिए सेट करने हेतु "<b>"समन्वयन सेटिंग बदलें"</b>" स्पर्श करें."</string>
<string name="manual_sync" msgid="6743983544685622800">"अभी समन्वयित करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bc8a776..017db00 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Postavke mape"</string>
<string name="menu_settings" msgid="6007027046949837282">"Postavke"</string>
<string name="menu_search" msgid="5297197523031943248">"Pretraživanje"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Kretanje"</string>
<string name="mark_important" msgid="6904096897104265870">"Označi kao važno"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Označi kao nevažno"</string>
<string name="add_cc_label" msgid="504861315425773180">"Dodaj kopiju/skrivenu kopiju"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Premješteno u mapu <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Rezultati"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Pretraživanje nije podržano na ovom računu."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Traženje..."</string>
<string name="add_label" msgid="6060201715848652940">"Dodaj mapu"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Pokaži nove poruke pošiljatelja <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Naziv prečaca mape"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Čekanje na sinkronizaciju"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Vaša će se e-pošta uskoro pojaviti."</string>
<string name="not_synced_title" msgid="794279749170198599">"Račun nije sinkroniziran"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ovaj račun nije postavljen za automatsku sinkronizaciju.\nDodirnite "<b>"Sinkroniziraj sada"</b>" da biste poštu sinkronizirali jednom ili "<b>"Promjena sinkronizacije"</b>" da biste ovaj račun postavili za automatsku sinkronizaciju pošte."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sink. sada"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 41ed1f3..995955d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Mappabeállítások"</string>
<string name="menu_settings" msgid="6007027046949837282">"Beállítások"</string>
<string name="menu_search" msgid="5297197523031943248">"Keresés"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigálás"</string>
<string name="mark_important" msgid="6904096897104265870">"Megjelölés fontosként"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Megjelölés nem fontosként"</string>
<string name="add_cc_label" msgid="504861315425773180">"Másolatmezők"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Áthelyezve ide: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Találatok"</string>
<string name="search_unsupported" msgid="4654227193354052607">"A keresés nem támogatott ebben a fiókban."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Keresés..."</string>
<string name="add_label" msgid="6060201715848652940">"Mappa hozzáadása"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Új üzenetek megjelenítése tőle: <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Mappaparancsikon elnevezése"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Várakozás a szinkronizálásra"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Az e-mail hamarosan megjelenik."</string>
<string name="not_synced_title" msgid="794279749170198599">"A fiók nincs szinkronizálva"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ez a fiók nincs beállítva automatikus szinkronizáláshoz.\nÉrintse meg a "<b>"Szinkr. most"</b>" elemet a levelek egyszeri szinkronizálásához, vagy érintse meg a "<b>"Szinkr. beállítások módosítása"</b>" lehetőséget a fiók leveleinek automatikusan szinkronizálásához."</string>
<string name="manual_sync" msgid="6743983544685622800">"Szinkr. most"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index a40c3d9..4d1661a 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Թղթապանակի կարգավորումներ"</string>
<string name="menu_settings" msgid="6007027046949837282">"Կարգավորումներ"</string>
<string name="menu_search" msgid="5297197523031943248">"Որոնել"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Նավարկում"</string>
<string name="mark_important" msgid="6904096897104265870">"Նշել կարևոր"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Նշել որպես ոչ կարևոր"</string>
<string name="add_cc_label" msgid="504861315425773180">"Ավելացնել Պտճ/Ծածկպտճ"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Տեղափոխվել է <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Արդյունքներ"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Որոնումը չի աջակցվում այս հաշվի համար:"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Որոնում..."</string>
<string name="add_label" msgid="6060201715848652940">"Ավելացնել թղթապանակ"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Ցույց տալ նոր հաղորդագրությունը <xliff:g id="SENDER">%s</xliff:g>-ից:"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Անվանեք դյուրանցման թղթապանակը"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Սպասում է համաժամեցմանը"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Ձեր էլփոստը շուտով կհայտնվի:"</string>
<string name="not_synced_title" msgid="794279749170198599">"Հաշիվը համաժամեցված չէ"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Այս հաշիվը չի կարգավորվել ավտոմատ համաժամեցման համար:\nՀպեք "<b>"Համաժամեցնել հիմա՝"</b>" էլփոստը միանվագ համաժամեցնելու համար կամ "<b>"Փոխել համաժամեցման կարգավորումները`"</b>" այս հաշվի էլփոստը ինքնաբերաբար համաժամեցնելով կարգավորելու համար:"</string>
<string name="manual_sync" msgid="6743983544685622800">"Համաժամեցնել հիմա"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 33a3e50..ab44f9b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Setelan folder"</string>
<string name="menu_settings" msgid="6007027046949837282">"Setelan"</string>
<string name="menu_search" msgid="5297197523031943248">"Telusuri"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigasi"</string>
<string name="mark_important" msgid="6904096897104265870">"Tandai sebagai penting"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Tandai sebagai tidak penting"</string>
<string name="add_cc_label" msgid="504861315425773180">"Tambahkan Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Dipindahkan ke <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Hasil"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Penelusuran tidak didukung pada akun ini."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Menelusuri…"</string>
<string name="add_label" msgid="6060201715848652940">"Tambahkan folder"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Tampilkan pesan baru dari <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Beri nama pintasan folder"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Menunggu sinkronisasi"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Email Anda akan segera muncul."</string>
<string name="not_synced_title" msgid="794279749170198599">"Akun tidak disinkronkan"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Akun ini tidak disiapkan untuk menyinkronkan secara otomatis.\nSentuh "<b>"Sinkronkan Sekarang"</b>" untuk menyinkronkan surat, atau "<b>"Ubah Setelan Sinkronisasi"</b>" untuk menyiapkan akun ini untuk sinkronisasi secara otomatis."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinkron skrg"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3935d53..20d361c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Impostazioni cartella"</string>
<string name="menu_settings" msgid="6007027046949837282">"Impostazioni"</string>
<string name="menu_search" msgid="5297197523031943248">"Cerca"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigazione"</string>
<string name="mark_important" msgid="6904096897104265870">"Segna come importante"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Segna come Non importante"</string>
<string name="add_cc_label" msgid="504861315425773180">"Aggiungi Cc/Ccn"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Spostata in <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Risultati"</string>
<string name="search_unsupported" msgid="4654227193354052607">"La ricerca non è supportata per l\'account in uso."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Ricerca…"</string>
<string name="add_label" msgid="6060201715848652940">"Aggiungi cartella"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Mostra nuovo messaggio di <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nome scorciatoia cartella"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"In attesa di sincronizzazione"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Le email verranno visualizzate tra poco."</string>
<string name="not_synced_title" msgid="794279749170198599">"Account non sincronizzato"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Questo account non è configurato per la sincronizzazione automatica.\nTocca "<b>"Sincronizza ora"</b>" per sincronizzare una volta i messaggi, oppure "<b>"Modifica impostazioni sincronizzazione"</b>" per configurare la sincronizzazione automatica dei messaggi per questo account."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronizza"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f6bd1bf..9aa42ea 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"הגדרות תיקיה"</string>
<string name="menu_settings" msgid="6007027046949837282">"הגדרות"</string>
<string name="menu_search" msgid="5297197523031943248">"חפש"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"ניווט"</string>
<string name="mark_important" msgid="6904096897104265870">"סמן כחשובה"</string>
<string name="mark_not_important" msgid="4550967327747977068">"סמן כלא חשובה"</string>
<string name="add_cc_label" msgid="504861315425773180">"הוסף עותק/עותק מוסתר"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"הועברה אל <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"תוצאות"</string>
<string name="search_unsupported" msgid="4654227193354052607">"חיפוש אינו נתמך בחשבון זה."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"מחפש…"</string>
<string name="add_label" msgid="6060201715848652940">"הוסף תיקיה"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"הצג הודעות חדשות מ-<xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"תן שם לקיצור הדרך של התיקיה"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"ממתין לסנכרון"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"הדוא\"ל שלך יופיע בעוד זמן קצר."</string>
<string name="not_synced_title" msgid="794279749170198599">"החשבון אינו מסונכרן"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"חשבון זה אינו מוגדר לסנכרון אוטומטי.\nגע באפשרות "<b>"סנכרן כעת"</b>" כדי לסנכרן את הדואר פעם אחת, או באפשרות "<b>"שנה הגדרות סנכרון"</b>" כדי להגדיר חשבון זה לסנכרון דואר באופן אוטומטי."</string>
<string name="manual_sync" msgid="6743983544685622800">"סנכרן עכשיו"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 534ec11..99f9b9d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"フォルダの設定"</string>
<string name="menu_settings" msgid="6007027046949837282">"設定"</string>
<string name="menu_search" msgid="5297197523031943248">"検索"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"ナビゲーション"</string>
<string name="mark_important" msgid="6904096897104265870">"重要マークを付ける"</string>
<string name="mark_not_important" msgid="4550967327747977068">"重要マークを外す"</string>
<string name="add_cc_label" msgid="504861315425773180">"Cc/Bccを追加"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>に移動しました"</string>
<string name="search_results_header" msgid="4669917471897026269">"検索結果"</string>
<string name="search_unsupported" msgid="4654227193354052607">"このアカウントでは検索をご利用いただけません。"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"検索しています…"</string>
<string name="add_label" msgid="6060201715848652940">"フォルダを追加"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"<xliff:g id="SENDER">%s</xliff:g>さんからの新着メールを表示"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"フォルダのショートカットへの名前の指定"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"同期を待機中"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"まもなくメールが表示されます。"</string>
<string name="not_synced_title" msgid="794279749170198599">"アカウントが同期していません"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"このアカウントには自動同期が設定されていません。\nメールを一度だけ同期させるには["<b>"今すぐ同期"</b>"]をタップします。このアカウントでメールが自動的に同期されるように設定するには、["<b>"同期設定の変更"</b>"]をタップします。"</string>
<string name="manual_sync" msgid="6743983544685622800">"今すぐ同期"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 9cd9b3a..f89bf80 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"საქაღალდის პარამეტრები"</string>
<string name="menu_settings" msgid="6007027046949837282">"პარამეტრები"</string>
<string name="menu_search" msgid="5297197523031943248">"ძიება"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"ნავიგაცია"</string>
<string name="mark_important" msgid="6904096897104265870">"მნიშვნელოვნად მონიშვნა"</string>
<string name="mark_not_important" msgid="4550967327747977068">"უმნიშვნელოდ მონიშვნა"</string>
<string name="add_cc_label" msgid="504861315425773180">"ასლისა და უხილავი ასლის დამატება"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"გადატანილია <xliff:g id="FOLDERNAME">%1$s</xliff:g>-ში"</string>
<string name="search_results_header" msgid="4669917471897026269">"შედეგები"</string>
<string name="search_unsupported" msgid="4654227193354052607">"ძიება ამ ანგარიშში არ არის მხარდაჭერილი."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"ძიება…"</string>
<string name="add_label" msgid="6060201715848652940">"საქაღალდის დამატება"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"<xliff:g id="SENDER">%s</xliff:g>-დან მიღებული ახალი შეტყობინების ჩვენება."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"საქათალდის მალმძახისთვის სახელის დარქმევა"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"სინქრონიზაციის მოლოდინი"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"თქვენი ელფოსტა გამოჩნდება ცოტა ხანში."</string>
<string name="not_synced_title" msgid="794279749170198599">"ანგარიში არ დასინქრონებულა"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"ამ ანგარიშს არ აქვს დაყენებული ავტომატური სინქრონიზაცია.\nშეეხეთ "<b>"სინქრონიზაციას"</b>" ელფოსტის ერთხელ სინქრონიზაციისთვის, ან "<b>"შეცვალეთ სინქრონიზაციის პარამეტრები"</b>" რათა დააყენოთ ელფოსტის ავტომატური სინქრონიზაცია."</string>
<string name="manual_sync" msgid="6743983544685622800">"სინქრონიზაცია"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 96dc68f..34c88e4 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"ការកំណត់ថត"</string>
<string name="menu_settings" msgid="6007027046949837282">"ការកំណត់"</string>
<string name="menu_search" msgid="5297197523031943248">"ស្វែងរក"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"ការរុករក"</string>
<string name="mark_important" msgid="6904096897104265870">"សម្គាល់ថាសំខាន់"</string>
<string name="mark_not_important" msgid="4550967327747977068">"សម្គាល់ថាមិនសំខាន់"</string>
<string name="add_cc_label" msgid="504861315425773180">"បន្ថែម ចម្លងជូន/ចម្លងជាសម្ងាត់ជូន"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"បានផ្លាស់ទីទៅ <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"លទ្ធផល"</string>
<string name="search_unsupported" msgid="4654227193354052607">"មិនគាំទ្រការស្វែងរកនៅលើគណនីនេះ។"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"កំពុងស្វែងរក..."</string>
<string name="add_label" msgid="6060201715848652940">"បន្ថែមថត"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"បង្ហាញសារថ្មីពី <xliff:g id="SENDER">%s</xliff:g> ។"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"ដាក់ឈ្មោះផ្លូវកាត់ថត"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"រង់ចាំធ្វើសមកាលកម្ម"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"អ៊ីមែលរបស់អ្នកនឹងលេចឡើងបន្តិចទៀត។"</string>
<string name="not_synced_title" msgid="794279749170198599">"មិនបានធ្វើសមកាលកម្មគណនី"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"គណនីនេះមិនត្រូវបានរៀបចំ ដើម្បីធ្វើសមកាលកម្មស្វ័យប្រវត្តិ។ \n ប៉ះ "<b>" ដើម្បីធ្វើសមកាលកម្មឥឡូវនេះ "</b>" សំបុត្រ ឬ "<b>" ប្ដូរការកំណត់ការធ្វើសមកាលកម្ម "</b>" ដើម្បីរៀបចំគណនីនេះត្រូវធ្វើសមកាលកម្មសំបុត្រស្វ័យប្រវត្តិ។"</string>
<string name="manual_sync" msgid="6743983544685622800">"ធ្វើសមកាលកម្មឥឡូវនេះ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 25848af..7fdcd2b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"폴더 설정"</string>
<string name="menu_settings" msgid="6007027046949837282">"설정"</string>
<string name="menu_search" msgid="5297197523031943248">"검색"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"탐색"</string>
<string name="mark_important" msgid="6904096897104265870">"중요 표시"</string>
<string name="mark_not_important" msgid="4550967327747977068">"중요하지 않은 대화로 표시"</string>
<string name="add_cc_label" msgid="504861315425773180">"참조/숨은참조 추가"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"<xliff:g id="FOLDERNAME">%1$s</xliff:g>(으)로 이동함"</string>
<string name="search_results_header" msgid="4669917471897026269">"검색결과"</string>
<string name="search_unsupported" msgid="4654227193354052607">"이 계정에서는 검색이 지원되지 않습니다."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"검색 중…"</string>
<string name="add_label" msgid="6060201715848652940">"폴더 추가"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"<xliff:g id="SENDER">%s</xliff:g>님이 보낸 새 메일 보기"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"폴더 바로가기 이름 지정"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"동기화 대기 중"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"이메일이 곧 표시됩니다."</string>
<string name="not_synced_title" msgid="794279749170198599">"계정이 동기화되지 않음"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"이 계정은 자동으로 동기화되도록 설정되지 않았습니다.\n"<b>"지금 동기화"</b>"를 터치하여 메일을 한 번 동기화하거나 "<b>"동기화 설정 변경"</b>"을 터치하여 이 계정이 메일을 자동으로 동기화하도록 설정하세요."</string>
<string name="manual_sync" msgid="6743983544685622800">"지금 동기화"</string>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 59b3676..70a0afe 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -23,18 +23,17 @@
</style>
<style name="MessageDetailsHeaderStyle">
- <item name="android:paddingStart">@dimen/message_details_header_padding_start_collapsed
- </item>
- <item name="android:paddingEnd">@dimen/message_details_header_padding_end</item>
+ <item name="android:layout_marginStart">@dimen/message_details_header_margin_start</item>
+ <item name="android:paddingStart">@dimen/message_details_header_padding</item>
+ <item name="android:layout_marginEnd">@dimen/message_details_header_margin_end</item>
</style>
<style name="MessageAttachmentsHeaderStyle" parent="AbstractMessageAttachmentsHeaderStyle">
- <item name="android:paddingStart">@dimen/message_details_header_padding_start</item>
+ <item name="android:paddingStart">@dimen/message_attachment_header_padding_start</item>
</style>
<style name="MessageHeaderShowPicsStyle" parent="AbstractMessageHeaderShowPicsStyle">
- <item name="android:paddingStart">@dimen/message_details_header_padding_start_collapsed
- </item>
+ <item name="android:paddingStart">@dimen/message_details_extra_content_padding_start</item>
<item name="android:paddingEnd">@dimen/message_show_pics_header_padding_end</item>
<item name="android:drawableStart">@drawable/ic_show_images_holo_light</item>
</style>
@@ -103,10 +102,6 @@
<item name="android:layout_marginStart">@dimen/teaser_text_padding</item>
</style>
- <style name="DetailsExpanderStyle">
- <item name="android:layout_marginStart">@dimen/message_header_inner_side_padding</item>
- </style>
-
<style name="MessageHeaderDetailsHeadingStyle" parent="MessageHeaderSmallStyle">
<item name="android:layout_marginEnd">@dimen/message_header_inner_side_padding</item>
</style>
@@ -120,10 +115,6 @@
<item name="android:layout_marginStart">@dimen/message_header_padding_start</item>
</style>
- <style name="AttachmentIconStyle">
- <item name="android:layout_marginStart">@dimen/attachment_icon_padding</item>
- </style>
-
<style name="ConversationHeaderSideMarginStyle">
<item name="android:layout_marginStart">@dimen/conversation_header_margin_side</item>
<item name="android:layout_marginEnd">@dimen/conversation_header_margin_side</item>
@@ -142,10 +133,6 @@
<item name="android:layout_marginEnd">@dimen/folder_list_item_end_margin</item>
</style>
- <style name="RecipientSummaryStyle" parent="MessageHeaderSmallStyle">
- <item name="android:layout_marginEnd">@dimen/recipient_summary_margin</item>
- </style>
-
<style name="AttachmentTextContainer">
<item name="android:paddingStart">@dimen/compose_attachment_text_padding</item>
</style>
@@ -230,14 +217,6 @@
<item name="android:paddingEnd">@dimen/vacation_responder_inner_padding</item>
</style>
- <style name="MessageSenderNameStyle" parent="AbstractMessageSenderNameStyle">
- <item name="android:layout_alignParentStart">true</item>
- </style>
-
- <style name="MessageHeaderSubtitleStyle" parent="AbstractMessageHeaderSubtitleStyle">
- <item name="android:layout_alignParentStart">true</item>
- </style>
-
<style name="FolderColorBoxStyle" parent="AbstractFolderColorBoxStyle">
<item name="android:layout_alignParentStart">true</item>
</style>
@@ -247,10 +226,6 @@
<item name="android:layout_alignParentStart">true</item>
</style>
- <style name="MessageHeaderUpperDateStyle" parent="AbstractMessageHeaderUpperDateStyle">
- <item name="android:layout_alignParentEnd">true</item>
- </style>
-
<style name="FolderParentIconStyle">
<item name="android:layout_alignParentEnd">true</item>
</style>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index b0dd6e0..3230021 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"ຕັ້ງຄ່າໂຟນເດີ"</string>
<string name="menu_settings" msgid="6007027046949837282">"ຕັ້ງຄ່າ"</string>
<string name="menu_search" msgid="5297197523031943248">"ຊອກຫາ"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"ການນຳທາງ"</string>
<string name="mark_important" msgid="6904096897104265870">"ໝາຍວ່າສໍາຄັນ"</string>
<string name="mark_not_important" msgid="4550967327747977068">"ໝາຍວ່າບໍ່ສຳຄັນ"</string>
<string name="add_cc_label" msgid="504861315425773180">"ເພີ່ມ Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"ຍ້າຍໄປ <xliff:g id="FOLDERNAME">%1$s</xliff:g> ແລ້ວ"</string>
<string name="search_results_header" msgid="4669917471897026269">"ຜົນໄດ້ຮັບ"</string>
<string name="search_unsupported" msgid="4654227193354052607">"ການຊອກຫາບໍ່ຮອງຮັບສຳລັບບັນຊີນີ້."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"ກຳລັງຊອກຫາ..."</string>
<string name="add_label" msgid="6060201715848652940">"ເພີ່ມໂຟນເດີ"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"ສະແດງຂໍ້ຄວາມໃຫມ່ຈາກ <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"ຊື່ໂຟນເດີທາງລັດ"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"ກຳລັງລໍຖ້າເພື່ອຊິ້ງຂໍ້ມູນ"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"ອີເມວຂອງທ່ານຈະໄປປາກົດໄວໆນີ້."</string>
<string name="not_synced_title" msgid="794279749170198599">"ບັນຊີບໍ່ໄດ້ຊິ້ງຂໍ້ມູນ"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"ບັນຊີນີ້ບໍ່ໄດ້ຖືກຕັ້ງໃຫ້ຊິ້ງຂໍ້ມູນອັດຕະໂນມັດ.\nແຕະ "<b>"ຊິ້ງຂໍ້ມູນດຽວນີ້"</b>" ເພື່ອຊິ້ງຂໍ້ມູນເມວ ຫຼື "<b>"ປ່ຽນການຕັ້ງຄ່າການຊິ້ງຂໍ້ມູນ"</b>" ເພື່ອຕັ້ງໃຫ້ບັນຊີນີ້ຊິ້ງຂໍ້ມູນອີເມວອັດຕະໂນມັດ."</string>
<string name="manual_sync" msgid="6743983544685622800">"ຊິ້ງຂໍ້ມູນດຽວນີ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index afb9b60..226273b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Aplankų nustatymai"</string>
<string name="menu_settings" msgid="6007027046949837282">"Nustatymai"</string>
<string name="menu_search" msgid="5297197523031943248">"Paieška"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Naršymas"</string>
<string name="mark_important" msgid="6904096897104265870">"Pažymėti kaip svarbų"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Pažymėti kaip nesvarbų"</string>
<string name="add_cc_label" msgid="504861315425773180">"Pridėti Cc / Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Perkelta į <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Rezultatai"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Šioje paskyroje paieška nepalaikoma."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Ieškoma…"</string>
<string name="add_label" msgid="6060201715848652940">"Pridėti aplanką"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Rodyti naują pranešimą nuo <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nurodyti spartųjį aplanko klavišą"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Laukiama sinchronizavimo"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"El. paštas netrukus bus rodomas."</string>
<string name="not_synced_title" msgid="794279749170198599">"Paskyra nesinchronizuota"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ši paskyra nenustatyta automatiškai sinchronizuoti.\nJei norite vieną kartą sinchronizuoti paštą, palieskite "<b>"Sinch. dabar"</b>" arba palieskite "<b>"Keisti sinchronizavimo nustat."</b>", kad nustatytumėte šią paskyrą automatiškai sinchronizuoti paštą."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinch. dabar"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4059379..514c1b6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Mapes iestatījumi"</string>
<string name="menu_settings" msgid="6007027046949837282">"Iestatījumi"</string>
<string name="menu_search" msgid="5297197523031943248">"Meklēt"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigācija"</string>
<string name="mark_important" msgid="6904096897104265870">"Atzīmēt kā svarīgu"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Atzīmēt kā nesvarīgu"</string>
<string name="add_cc_label" msgid="504861315425773180">"Pievienot kopiju/diskrēto kopiju"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Pārvietota uz: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Rezultāti"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Šajā kontā netiek atbalstīta meklēšana."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Notiek meklēšana..."</string>
<string name="add_label" msgid="6060201715848652940">"Pievienot mapi"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Rādīt jaunu ziņojumu no: <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nosaukuma piešķiršana mapes saīsnei"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Gaida sinhronizāciju"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-pasta saturs drīz tiks parādīts."</string>
<string name="not_synced_title" msgid="794279749170198599">"Konts nav sinhronizēts"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Šajā kontā nav iestatīta automātiskā sinhronizācija.\nPieskarieties vienumam "<b>"Sinhronizēt tūlīt"</b>", lai vienreiz sinhronizētu pastu, vai vienumam "<b>"Mainīt sinhronizācijas iestatījumus"</b>", lai šajā kontā iestatītu automātisku pasta sinhronizāciju."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinhr. tūlīt"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 712ff50..7fce862 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Фолдерын тохиргоо"</string>
<string name="menu_settings" msgid="6007027046949837282">"Тохиргоо"</string>
<string name="menu_search" msgid="5297197523031943248">"Хайх"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Чиглүүлэгч"</string>
<string name="mark_important" msgid="6904096897104265870">"Чухал болгож тэмдэглэх"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Чухал бус болгох"</string>
<string name="add_cc_label" msgid="504861315425773180">"Cc/Bcc нэмэх"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> руу зөөсөн"</string>
<string name="search_results_header" msgid="4669917471897026269">"Илэрцүүд"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Энэ акаунтад хайлт дэмжигддэггүй."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Хайж байна..."</string>
<string name="add_label" msgid="6060201715848652940">"Фолдер нэмэх"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"<xliff:g id="SENDER">%s</xliff:g>-с ирсэн шинэ зурвасыг харуулах."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Нэрийн фолдерын товчилбор"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Синк хийгдэхийг хүлээж байна"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Таны имэйл удахгүй гарч ирэх болно."</string>
<string name="not_synced_title" msgid="794279749170198599">"Акаунт синк хийгдээгүй"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Энэ акаунтыг автоматаар синк хийхээр тохируулаагүй.\nИмэйлийг нэг удаа синк хийхийн тулд "<b>"Одоо синк хийх"</b>" гэсэнд хүрэх буюу энэ акаунтыг автоматаар синк хийхээр тохируулахын тулд "<b>"Синкийн Тохиргоог Өөрчлөх"</b>" гэсэнд хүрнэ үү."</string>
<string name="manual_sync" msgid="6743983544685622800">"Одоо синк хийх"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index a6a91b3..4c87353 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Tetapan folder"</string>
<string name="menu_settings" msgid="6007027046949837282">"Tetapan"</string>
<string name="menu_search" msgid="5297197523031943248">"Carian"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigasi"</string>
<string name="mark_important" msgid="6904096897104265870">"Tandakan penting"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Tandakan tidak penting"</string>
<string name="add_cc_label" msgid="504861315425773180">"Tambah Sk/Skt"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Dialihkan ke <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Hasil"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Carian tidak disokong pada akaun ini."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Mencari..."</string>
<string name="add_label" msgid="6060201715848652940">"Tambah folder"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Tunjukkan mesej baharu daripada <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Namakan pintasan folder"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Menunggu penyegerakan"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-mel anda akan muncul tidak lama lagi."</string>
<string name="not_synced_title" msgid="794279749170198599">"Akaun tidak tersegerak"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Akaun ini tidak ditetapkan untuk disegerakkan secara automatik.\nSentuh "<b>"Segerakkan Sekarang"</b>" untuk menyegerakkan e-mel sekali, atau "<b>"Tukar Tetapan Penyegerakan"</b>" untuk menyediakan akaun ini agar menyegerakkan e-mel secara automatik."</string>
<string name="manual_sync" msgid="6743983544685622800">"Segerakkan sekarang"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9e54eae..6e5c312 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Mappeinnstillinger"</string>
<string name="menu_settings" msgid="6007027046949837282">"Innstillinger"</string>
<string name="menu_search" msgid="5297197523031943248">"Søk"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigering"</string>
<string name="mark_important" msgid="6904096897104265870">"Merk som viktig"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Merk som uviktig"</string>
<string name="add_cc_label" msgid="504861315425773180">"Legg til kopi eller blindkopi"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Flyttet til <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultater"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Søk støttes ikke på denne kontoen."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Søker …"</string>
<string name="add_label" msgid="6060201715848652940">"Legg til mappe"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Vis ny e-post fra <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Navngi mappesnarvei"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Venter på synkronisering"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-posten din vises snart."</string>
<string name="not_synced_title" msgid="794279749170198599">"Kontoen ble ikke synkronisert"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Denne kontoen er ikke konfigurert til å synkroniseres automatisk.\nTrykk på "<b>"Synkroniser nå"</b>" for å synkronisere e-post én gang, eller trykk på "<b>"Endre synkroniseringsinnstillinger"</b>" for å konfigurere denne kontoen til å synkronisere e-post automatisk."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synkroniser nå"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e607231..22c00e0 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Mapinstellingen"</string>
<string name="menu_settings" msgid="6007027046949837282">"Instellingen"</string>
<string name="menu_search" msgid="5297197523031943248">"Zoeken"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigatie"</string>
<string name="mark_important" msgid="6904096897104265870">"Markeren als belangrijk"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Markeren als niet belangrijk"</string>
<string name="add_cc_label" msgid="504861315425773180">"Cc/Bcc toevoegen"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Verplaatst naar <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultaten"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Zoeken wordt niet ondersteund in dit account."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Zoeken…"</string>
<string name="add_label" msgid="6060201715848652940">"Map toevoegen"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Nieuw bericht van <xliff:g id="SENDER">%s</xliff:g> weergeven."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Snelkoppeling naar map een naam geven"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Wachten op synchronisatie"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Uw e-mail wordt zo weergegeven."</string>
<string name="not_synced_title" msgid="794279749170198599">"Account niet gesynchroniseerd"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Automatische synchronisatie is niet ingesteld voor dit account.\nRaak"<b>"Nu synchroniseren"</b>" aan om e-mail één keer te synchroniseren of raak "<b>"Synchronisatie-instellingen wijzigen"</b>" aan om automatische synchronisatie in te stellen voor dit account."</string>
<string name="manual_sync" msgid="6743983544685622800">"Nu synchroniseren"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3d0616e..86d596c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Ustawienia folderu"</string>
<string name="menu_settings" msgid="6007027046949837282">"Ustawienia"</string>
<string name="menu_search" msgid="5297197523031943248">"Szukaj"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Nawigacja"</string>
<string name="mark_important" msgid="6904096897104265870">"Oznacz jako ważne"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Oznacz jako mało ważne"</string>
<string name="add_cc_label" msgid="504861315425773180">"Dodaj DW/UDW"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Przeniesiono do: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Wyniki"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Wyszukiwanie nie jest obsługiwane na tym koncie."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Wyszukiwanie…"</string>
<string name="add_label" msgid="6060201715848652940">"Dodaj folder"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Pokaż nową wiadomość od: <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nazwij skrót folderu"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Czekam na synchronizację"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-maile pojawią się za chwilę."</string>
<string name="not_synced_title" msgid="794279749170198599">"Konto nie jest zsynchronizowane"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Konto nie jest skonfigurowane do automatycznej synchronizacji.\nKliknij "<b>"Synchronizuj"</b>", by zsynchronizować pocztę jeden raz, lub "<b>"Zmień ustawienia synchronizacji"</b>", by skonfigurować konto do automatycznej synchronizacji wiadomości."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchronizuj"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 88af025..fb355c0 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Definições da pasta"</string>
<string name="menu_settings" msgid="6007027046949837282">"Definições"</string>
<string name="menu_search" msgid="5297197523031943248">"Pesquisar"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navegação"</string>
<string name="mark_important" msgid="6904096897104265870">"Marcar como importante"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Marcar como não importante"</string>
<string name="add_cc_label" msgid="504861315425773180">"Adicionar Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Movida para <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
<string name="search_unsupported" msgid="4654227193354052607">"A pesquisa não é suportada nesta conta."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"A pesquisar..."</string>
<string name="add_label" msgid="6060201715848652940">"Adicionar pasta"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Mostrar nova mensagem de <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Atalho para pasta de nome"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"A aguardar sincronização"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"O seu email aparecerá em breve."</string>
<string name="not_synced_title" msgid="794279749170198599">"Conta não sincronizada"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"A conta não está configurada para sincronização automática.\nToque em "<b>"Sincronizar Agora"</b>" para sincronizar correio uma vez ou em "<b>"Alterar Definições de Sincronização"</b>" para configurar esta conta para sincronização automática de correio."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronizar agora"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7122a1e..22378a3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Configurações da pasta"</string>
<string name="menu_settings" msgid="6007027046949837282">"Configurações"</string>
<string name="menu_search" msgid="5297197523031943248">"Pesquisar"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navegação"</string>
<string name="mark_important" msgid="6904096897104265870">"Marcar como importante"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Marcar como não importante"</string>
<string name="add_cc_label" msgid="504861315425773180">"Adicionar Cc/Cco"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Movida para <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Não há suporte para pesquisa nesta conta."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Pesquisando..."</string>
<string name="add_label" msgid="6060201715848652940">"Adicionar pasta"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Mostrar nova mensagem de <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Atalho da pasta Nome"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Aguardando sincronização"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Seu e-mail será exibido em breve."</string>
<string name="not_synced_title" msgid="794279749170198599">"Conta não sincronizada"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Esta conta não está configurada para sincronizar automaticamente.\nToque em "<b>"Sincronizar agora"</b>" para sincronizar os e-mails uma vez ou em "<b>"Alterar configurações de sincronização"</b>" para configurar a sincronização automática de e-mails desta conta."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincr. agora"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index f96be94..c55cc96 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -131,6 +131,8 @@
<skip />
<!-- no translation found for menu_search (5297197523031943248) -->
<skip />
+ <!-- no translation found for drawer_title (5888199203222498840) -->
+ <skip />
<!-- no translation found for mark_important (6904096897104265870) -->
<skip />
<!-- no translation found for mark_not_important (4550967327747977068) -->
@@ -315,8 +317,6 @@
<skip />
<!-- no translation found for search_unsupported (4654227193354052607) -->
<skip />
- <!-- no translation found for search_results_searching_header (3821361153909466819) -->
- <skip />
<!-- no translation found for add_label (6060201715848652940) -->
<skip />
<!-- no translation found for new_incoming_messages_one (827152289636155810) -->
@@ -439,8 +439,6 @@
<skip />
<!-- no translation found for wait_for_sync_title (2767841242539238015) -->
<skip />
- <!-- no translation found for wait_for_sync_body (7718316938173643688) -->
- <skip />
<!-- no translation found for not_synced_title (794279749170198599) -->
<skip />
<!-- no translation found for wait_for_manual_sync_body (2003192935254244968) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b0944bb..6dee716 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Setări pentru dosar"</string>
<string name="menu_settings" msgid="6007027046949837282">"Setări"</string>
<string name="menu_search" msgid="5297197523031943248">"Căutaţi"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigare"</string>
<string name="mark_important" msgid="6904096897104265870">"Marcaţi ca importantă"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Marcaţi ca neimportantă"</string>
<string name="add_cc_label" msgid="504861315425773180">"Adăugaţi cc/bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Mutată în <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Rezultate"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Căutarea nu este acceptată pentru acest cont."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Se caută..."</string>
<string name="add_label" msgid="6060201715848652940">"Adăugați un dosar"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Afișați mesajul nou de la <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Denumiţi o comandă rapidă pentru dosar"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Se aşteaptă sincronizarea"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-mailul dvs. va apărea în curând."</string>
<string name="not_synced_title" msgid="794279749170198599">"Cont nesincronizat"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Acest cont nu este configurat să se sincronizeze în mod automat.\nAtingeţi "<b>"Sincronizaţi acum"</b>", pentru a sincroniza mesajele de e-mail o dată sau "<b>"Modificaţi setările de sincronizare"</b>" ca să configuraţi acest cont pentru a sincroniza mesajele de e-mail în mod automat."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincron.acum"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ba8645a..0390810 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Настройки папки"</string>
<string name="menu_settings" msgid="6007027046949837282">"Настройки"</string>
<string name="menu_search" msgid="5297197523031943248">"Поиск"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Навигация"</string>
<string name="mark_important" msgid="6904096897104265870">"Отметить как важное"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Отметить как неважное"</string>
<string name="add_cc_label" msgid="504861315425773180">"Копия/скрытая"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Перемещено в папку \"<xliff:g id="FOLDERNAME">%1$s</xliff:g>\""</string>
<string name="search_results_header" msgid="4669917471897026269">"Результаты"</string>
<string name="search_unsupported" msgid="4654227193354052607">"В этом аккаунте не поддерживается поиск."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Поиск…"</string>
<string name="add_label" msgid="6060201715848652940">"Добавить папку"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Показать новое сообщение (автор: <xliff:g id="SENDER">%s</xliff:g>)"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ярлык папки"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Синхронизация…"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Ваши сообщения загружаются."</string>
<string name="not_synced_title" msgid="794279749170198599">"Аккаунт не синхронизирован"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"В этом аккаунте не настроена автоматическая синхронизация.\nВыберите "<b>"Настройки синхронизации"</b>", чтобы включить ее, или "<b>"Синхронизировать сейчас"</b>", чтобы синхронизировать почту один раз."</string>
<string name="manual_sync" msgid="6743983544685622800">"Синхр."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e63e6ef..856e19b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Nastavenia priečinka"</string>
<string name="menu_settings" msgid="6007027046949837282">"Nastavenia"</string>
<string name="menu_search" msgid="5297197523031943248">"Hľadať"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigačný panel"</string>
<string name="mark_important" msgid="6904096897104265870">"Označiť ako dôležité"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Označiť ako nedôležité"</string>
<string name="add_cc_label" msgid="504861315425773180">"Pridať kópiu / skrytú kópiu"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Presunuté do priečinka <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Výsledky"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Hľadanie nie je v tomto účte podporované."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Prebieha vyhľadávanie..."</string>
<string name="add_label" msgid="6060201715848652940">"Pridať priečinok"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Zobraziť novú správu od odosielateľa <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Pomenovať skratku priečinka"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Čaká sa na synchronizáciu"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Váš e-mail sa zobrazí čoskoro."</string>
<string name="not_synced_title" msgid="794279749170198599">"Účet nie je synchronizovaný"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Tento účet nie je nastavený na automatickú synchronizáciu.\nAk chcete synchronizovať e-maily jednorazovo, dotknite sa položky "<b>"Synchronizovať"</b>". Ak chcete nastaviť, aby účet synchronizoval e-maily automaticky, dotknite sa položky "<b>"Zmeniť nastavenia synchronizácie"</b>"."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchroniz."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 81027db..6f88d5a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Nastavitve mape"</string>
<string name="menu_settings" msgid="6007027046949837282">"Nastavitve"</string>
<string name="menu_search" msgid="5297197523031943248">"Išči"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Krmarjenje"</string>
<string name="mark_important" msgid="6904096897104265870">"Označi kot pomemben"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Označi kot nepomemben"</string>
<string name="add_cc_label" msgid="504861315425773180">"Dodaj Kp/Skp"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Premaknjeno v: <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Rezultati"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Iskanje ni podprto za ta račun."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Iskanje ..."</string>
<string name="add_label" msgid="6060201715848652940">"Dodaj mapo"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Prikaži novo sporočilo pošiljatelja <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ime bližnjice do mape"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Čakanje na sinhronizacijo"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Vaša e-pošta se bo kmalu pojavila."</string>
<string name="not_synced_title" msgid="794279749170198599">"Račun ni sinhroniziran"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ta račun se ne sinhronizira samodejno.\nDotaknite se "<b>"Sinhroniziraj"</b>", če želite enkrat sinhronizirati pošto, ali "<b>"Spremeni nastavitve sinhronizacije"</b>", če želite spremeniti nastavitve računa tako, da se bo pošta samodejno sinhronizirala."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinhroniz."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 25091ae..bf84397 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -22,7 +22,7 @@
<string name="cc" msgid="7017720927911078193">"Копија"</string>
<string name="bcc" msgid="3098643138241111579">"Скривена копија"</string>
<string name="subject_hint" msgid="7253964583324677128">"Наслов"</string>
- <string name="body_hint" msgid="4279864165439577668">"Напишите поруку е-поште"</string>
+ <string name="body_hint" msgid="4279864165439577668">"Напишите имејл"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Приложи датотеку"</string>
<string name="add_photo_attachment" msgid="3738882100645552858">"Приложи слику"</string>
<string name="save_draft" msgid="5555744208032445632">"Сачувај недовршену поруку"</string>
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Подешавања директоријума"</string>
<string name="menu_settings" msgid="6007027046949837282">"Подешавања"</string>
<string name="menu_search" msgid="5297197523031943248">"Претражи"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Навигација"</string>
<string name="mark_important" msgid="6904096897104265870">"Означи као важно"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Означи као неважно"</string>
<string name="add_cc_label" msgid="504861315425773180">"Додај Cc/Bcc"</string>
@@ -123,7 +124,7 @@
<string name="contextmenu_dial_dot" msgid="9104426720103729453">"Позови..."</string>
<string name="contextmenu_sms_dot" msgid="6481040539501081547">"SMS…"</string>
<string name="contextmenu_add_contact" msgid="8395100913366045250">"Додај контакт"</string>
- <string name="contextmenu_send_mail" msgid="8301941130009797208">"Пошаљи поруку е-поште"</string>
+ <string name="contextmenu_send_mail" msgid="8301941130009797208">"Пошаљи имејл"</string>
<string name="contextmenu_map" msgid="7721544518698532954">"Мапа"</string>
<string name="contextmenu_sharelink" msgid="6213520416250245200">"Дели везу"</string>
<string name="contextmenu_help" msgid="4651718679842414097">"Помоћ"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Премештена је у <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Резултати"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Претрага није подржана на овом налогу."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Претраживање..."</string>
<string name="add_label" msgid="6060201715848652940">"Додај директоријум"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Прикажи нову поруку пошиљаоца <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Именовање пречице директоријума"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Чека се синхронизација"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Адреса е-поште ће се ускоро појавити."</string>
<string name="not_synced_title" msgid="794279749170198599">"Налог није синхронизован"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Овај налог није подешен за аутоматску синхронизацију.\nДодирните "<b>"Синхронизуј одмах"</b>" да бисте синхронизовали пошту једном, односно "<b>"Промени подешавања синхронизације"</b>" да бисте подесили овај налог да аутоматски синхронизује пошту."</string>
<string name="manual_sync" msgid="6743983544685622800">"Синхр. одмах"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a900225..fe8fd1f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Mappinställningar"</string>
<string name="menu_settings" msgid="6007027046949837282">"Inställningar"</string>
<string name="menu_search" msgid="5297197523031943248">"Sök"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Navigering"</string>
<string name="mark_important" msgid="6904096897104265870">"Markera som viktigt"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Markera som inte viktigt"</string>
<string name="add_cc_label" msgid="504861315425773180">"Lägg till kopia/hemlig kopia"</string>
@@ -188,8 +189,8 @@
<item quantity="other" msgid="2250720080221922267">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har rapporterats som Inte skräppost."</item>
</plurals>
<plurals name="conversation_not_important">
- <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har markerats som oviktig."</item>
- <item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har markerats som oviktig."</item>
+ <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har markerats som icke viktig."</item>
+ <item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har markerats som icke viktig."</item>
</plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har rapporterats som nätfiske."</item>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Flyttades till <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultat"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Det går inte att söka i det här kontot."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Söker …"</string>
<string name="add_label" msgid="6060201715848652940">"Lägg till mapp"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Visa nytt meddelande från <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Kortkommando för att namnge mapp"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Väntar på synk"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Ditt e-postmeddelande visas snart."</string>
<string name="not_synced_title" msgid="794279749170198599">"Kontot är inte synkat"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Det här kontot har inte konfigurerats så att det synkroniseras automatiskt.\nTryck på "<b>"Synka nu"</b>" om du vill synkronisera e-post en gång eller "<b>"Ändra synkroniseringsinställn."</b>" om du vill konfigurera kontot så att e-post synkroniseras automatiskt."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synka nu"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 82e91f8..3a88557 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Mipangilio ya folda"</string>
<string name="menu_settings" msgid="6007027046949837282">"Mipangilio"</string>
<string name="menu_search" msgid="5297197523031943248">"Tafuta"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Usogezaji"</string>
<string name="mark_important" msgid="6904096897104265870">"Tia alama kama muhimu"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Tia alama kama isiyo muhimu"</string>
<string name="add_cc_label" msgid="504861315425773180">"Ongeza Nakala kwa/Nakala fiche kwa"</string>
@@ -166,7 +167,7 @@
<string name="loading_conversations" msgid="2649440958602369555">"Inapakia…"</string>
<string name="empty_inbox" msgid="7623182658180140245">"Umemaliza! Tafadhali furahia siku yako."</string>
<string name="empty_search" msgid="7123710829748939105">"Lo! Hatukupata chochote kwa utafutaji wa \"<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>\"."</string>
- <string name="empty_spam_folder" msgid="7915096608607243274">"Riboribo, hakuna barua taka hapa!"</string>
+ <string name="empty_spam_folder" msgid="7915096608607243274">"Hoyaaa, hakuna barua taka!"</string>
<string name="empty_trash_folder" msgid="2205589798674653912">"Hakuna takataka hapa. Asante kwa kurejeleza!"</string>
<string name="empty_folder" msgid="107806583742395757">"Hakuna barua pepe hapa."</string>
<string name="getting_messages" msgid="563711962781090231">"Inaleta ujumbe wako"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Imehamishwa kwenda <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Matokeo"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Utafutaji hauauniwi kwenye akaunti hii."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Inatafuta…"</string>
<string name="add_label" msgid="6060201715848652940">"Ongeza folda"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Onyesha barua pepe mpya kutoka kwa <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ipe jina njia ya mkato ya folda"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Inasubiri usawazishaji"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Barua pepe yako itaonekana baada ya muda mfupi."</string>
<string name="not_synced_title" msgid="794279749170198599">"Akaunti haijasawazishwa"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Akaunti hii haijawekwa kujisawazisha kiotomatiki.\nGusa "<b>"Sawazisha Sasa"</b>" ili kusawazisha barua pepe mara moja, au "<b>"Badilisha Mipangilio ya Usawazishaji"</b>" ili kuweka akaunti hii isawazishe barua pepe kiotomatiki."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sawazisha sasa"</string>
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 57a7b73..9866487 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -27,11 +27,17 @@
<dimen name="conversation_page_gutter">0dip</dimen>
<dimen name="message_border_height">16dp</dimen>
<dimen name="message_header_inner_side_padding">16dp</dimen>
+ <dimen name="message_details_header_margin_start">10dp</dimen>
+ <dimen name="message_details_header_margin_end">@dimen/message_header_action_button_width
+ </dimen>
+ <dimen name="message_details_header_padding">6dp</dimen>
+ <dimen name="message_details_header_margin_top">0dp</dimen>
+ <dimen name="message_details_header_padding_bottom">4dp</dimen>
<dimen name="message_header_contact_photo_width">64dp</dimen>
<dimen name="message_header_contact_photo_height">64dp</dimen>
<dimen name="message_header_action_button_width">56dp</dimen>
<dimen name="message_header_action_button_height">56dp</dimen>
- <dimen name="message_details_header_padding_start_collapsed">104dip</dimen>
+ <dimen name="message_details_extra_content_padding_start">104dip</dimen>
<dimen name="message_sender_name_text_size">20sp</dimen>
<dimen name="message_header_subtitle_text_size">16sp</dimen>
<dimen name="super_collapsed_height">39sp</dimen>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 00256cd..007b1ef 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -21,7 +21,7 @@
<string name="to" msgid="4392614766835725698">"ถึง"</string>
<string name="cc" msgid="7017720927911078193">"สำเนา"</string>
<string name="bcc" msgid="3098643138241111579">"สำเนาลับ"</string>
- <string name="subject_hint" msgid="7253964583324677128">"หัวเรื่อง"</string>
+ <string name="subject_hint" msgid="7253964583324677128">"เรื่อง"</string>
<string name="body_hint" msgid="4279864165439577668">"เขียนอีเมล"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"แนบไฟล์"</string>
<string name="add_photo_attachment" msgid="3738882100645552858">"แนบรูปภาพ"</string>
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"การตั้งค่าโฟลเดอร์"</string>
<string name="menu_settings" msgid="6007027046949837282">"การตั้งค่า"</string>
<string name="menu_search" msgid="5297197523031943248">"ค้นหา"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"การนำทาง"</string>
<string name="mark_important" msgid="6904096897104265870">"ทำเครื่องหมายว่าสำคัญ"</string>
<string name="mark_not_important" msgid="4550967327747977068">"ทำเครื่องหมายว่าไม่สำคัญ"</string>
<string name="add_cc_label" msgid="504861315425773180">"เพิ่มสำเนา/สำเนาลับ"</string>
@@ -111,11 +112,11 @@
<string name="download_failed" msgid="442019281547315527">"โหลดไม่ได้ แตะเพื่อลองซ้ำ"</string>
<string name="attachments_header" msgid="6459475590011460229">"ไฟล์แนบ"</string>
<string name="menu_photo_save_all" msgid="4295226099481995348">"บันทึกทั้งหมด"</string>
- <string name="menu_photo_share" msgid="2214772815165829079">"แบ่งปัน"</string>
- <string name="menu_photo_share_all" msgid="4577299400844129078">"แบ่งปันหมด"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"แชร์"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"แชร์หมด"</string>
<string name="menu_photo_print" msgid="1751063711206436775">"พิมพ์"</string>
<string name="saving" msgid="925514721138014677">"กำลังบันทึก…"</string>
- <string name="choosertitle_sharevia" msgid="6142681649048665134">"แบ่งปันผ่าน"</string>
+ <string name="choosertitle_sharevia" msgid="6142681649048665134">"แชร์ผ่าน"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"เปิดในเบราว์เซอร์"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"คัดลอก"</string>
<string name="contextmenu_copylink" msgid="3580131515400610839">"คัดลอก URL ของลิงก์"</string>
@@ -125,7 +126,7 @@
<string name="contextmenu_add_contact" msgid="8395100913366045250">"เพิ่มรายชื่อติดต่อ"</string>
<string name="contextmenu_send_mail" msgid="8301941130009797208">"ส่งอีเมล"</string>
<string name="contextmenu_map" msgid="7721544518698532954">"แผนที่"</string>
- <string name="contextmenu_sharelink" msgid="6213520416250245200">"แบ่งปันลิงก์"</string>
+ <string name="contextmenu_sharelink" msgid="6213520416250245200">"แชร์ลิงก์"</string>
<string name="contextmenu_help" msgid="4651718679842414097">"ความช่วยเหลือ"</string>
<string name="contextmenu_feedback" msgid="4429118420169571473">"ส่งความคิดเห็น"</string>
<!-- no translation found for num_selected (5723323585692387843) -->
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"ย้ายไปยัง <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"ผลการค้นหา"</string>
<string name="search_unsupported" msgid="4654227193354052607">"บัญชีนี้ไม่สนับสนุนการค้นหา"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"กำลังค้นหา..."</string>
<string name="add_label" msgid="6060201715848652940">"เพิ่มโฟลเดอร์"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"แสดงข้อความใหม่จาก <xliff:g id="SENDER">%s</xliff:g>"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"ตั้งชื่อทางลัดของโฟลเดอร์"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"กำลังรอการซิงค์"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"อีเมลของคุณจะปรากฏในไม่ช้า"</string>
<string name="not_synced_title" msgid="794279749170198599">"บัญชีไม่ได้ซิงค์"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"บัญชีนี้ไม่ได้รับการตั้งค่าให้ซิงค์อัตโนมัติ\nแตะ "<b>"ซิงค์เลย"</b>" เพื่อซิงค์เมลหนึ่งครั้ง หรือแตะ "<b>"เปลี่ยนการตั้งค่าการซิงค์"</b>" เพื่อตั้งค่าบัญชีนี้ให้ซิงค์เมลอัตโนมัติ"</string>
<string name="manual_sync" msgid="6743983544685622800">"ซิงค์เลย"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3d807f0..66b1382 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Mga setting ng folder"</string>
<string name="menu_settings" msgid="6007027046949837282">"Mga Setting"</string>
<string name="menu_search" msgid="5297197523031943248">"Maghanap"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Nabigasyon"</string>
<string name="mark_important" msgid="6904096897104265870">"Markahang mahalaga"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Markahang hindi mahalaga"</string>
<string name="add_cc_label" msgid="504861315425773180">"Magdagdag ng Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Inilipat sa <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Mga resulta"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Hindi sinusuportahan ang paghahanap sa account na ito."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Naghahanap..."</string>
<string name="add_label" msgid="6060201715848652940">"Magdagdag ng folder"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Ipakita mga bagong mensahe mula kay <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Shortcut sa pangalan ng folder"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Naghihintay ng pag-sync"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Lilitaw na ang iyong email."</string>
<string name="not_synced_title" msgid="794279749170198599">"Hindi na-sync ang account"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Hindi naka-set up ang account na ito upang awtomatikong mag-sync.\nPindutin ang "<b>"I-sync Ngayon"</b>" upang i-sync ang mail nang isang beses, o "<b>"Baguhin ang Mga Setting ng Pag-sync"</b>" upang i-set up ang account na ito upang awtomatikong i-sync ang mail."</string>
<string name="manual_sync" msgid="6743983544685622800">"I-sync na"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ebcd69b..ecbf706 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Klasör ayarları"</string>
<string name="menu_settings" msgid="6007027046949837282">"Ayarlar"</string>
<string name="menu_search" msgid="5297197523031943248">"Ara"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Gezinme"</string>
<string name="mark_important" msgid="6904096897104265870">"Önemli olarak işaretle"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Önemsiz olarak işaretle"</string>
<string name="add_cc_label" msgid="504861315425773180">"Cc/Bcc ekle"</string>
@@ -134,8 +135,8 @@
<item quantity="one" msgid="3657821200245019288">"İleti dizisini taşı"</item>
<item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> ileti dizisini taşı"</item>
</plurals>
- <string name="content_description" msgid="169080965055367954">"<xliff:g id="SUBJECT">%3$s</xliff:g> hakkında <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="DATE">%5$s</xliff:g> tarihinde <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
- <string name="content_description_today" msgid="7796658700638720091">"<xliff:g id="SUBJECT">%3$s</xliff:g> hakkında <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (saat: <xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
+ <string name="content_description" msgid="169080965055367954">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> adlı katılımcıya <xliff:g id="DATE">%5$s</xliff:g> tarihinde gönderilen <xliff:g id="SUBJECT">%3$s</xliff:g> konulu ve <xliff:g id="READSTATE">%6$s</xliff:g> durumda olan iletinin bir bölümü: <xliff:g id="SNIPPET">%4$s</xliff:g>"</string>
+ <string name="content_description_today" msgid="7796658700638720091">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, konu: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (saat: <xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="219566857950091332">"ileti dizisi okundu"</string>
<string name="unread_string" msgid="588180203444398297">"ileti dizisi okunmadı"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> klasörüne taşındı"</string>
<string name="search_results_header" msgid="4669917471897026269">"Sonuçlar"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Bu hesapta arama desteklenmiyor"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Aranıyor…"</string>
<string name="add_label" msgid="6060201715848652940">"Klasör ekle"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"<xliff:g id="SENDER">%s</xliff:g> adlı kişiden gelen yeni mesajı göster."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ad klasörü kısayolu"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Senkronize etmek için bekleniyor"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-postanız birazdan görüntülenecektir."</string>
<string name="not_synced_title" msgid="794279749170198599">"Hesap senkronize değil"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Bu hesap otomatik olarak senkronize edilecek şekilde yapılandırılmadı.\nPostayı bir kez senkronize etmek için "<b>"Şimdi Senk Et"</b>"\'e veya bu hesabı postayı otomatik olarak senkronize edilecek şekilde ayarlamak için "<b>"Senk Ayarlarını Değiştir"</b>"\'e dokunun."</string>
<string name="manual_sync" msgid="6743983544685622800">"Şimdi senk et"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index dd74128..be11cf9 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Налаштування папки"</string>
<string name="menu_settings" msgid="6007027046949837282">"Налаштування"</string>
<string name="menu_search" msgid="5297197523031943248">"Пошук"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Панель навігації"</string>
<string name="mark_important" msgid="6904096897104265870">"Позначити як важливу"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Позначити як неважливу"</string>
<string name="add_cc_label" msgid="504861315425773180">"Додати копію/приховану копію"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Переміщено в папку <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Результати"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Функція пошуку в цьому обліковому записі не підтримується."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Пошук..."</string>
<string name="add_label" msgid="6060201715848652940">"Додати папку"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Показати нове повідомлення (автор <xliff:g id="SENDER">%s</xliff:g>)."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Назвати ярлик папки"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Очікування на синхронізацію"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Електронна пошта з’явиться незабаром."</string>
<string name="not_synced_title" msgid="794279749170198599">"Обліковий запис не синхронізовано"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Цей обліковий запис не налаштовано для автоматичної синхронізації.\nВиберіть "<b>"Синхронізувати зараз"</b>", щоб синхронізувати пошту один раз, або "<b>"Змінити налаштування синхронізації"</b>", щоб налаштувати цей обліковий запис для автоматичної синхронізації пошти."</string>
<string name="manual_sync" msgid="6743983544685622800">"Синхр. зараз"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2daa4dc..4b494e3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -61,7 +61,7 @@
<string name="archive" msgid="847250094775910499">"Lưu trữ"</string>
<string name="report_spam" msgid="6467567747975393907">"Báo cáo spam"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Báo cáo không phải spam"</string>
- <string name="report_phishing" msgid="5714205737453138338">"Báo cáo thư lừa đảo"</string>
+ <string name="report_phishing" msgid="5714205737453138338">"Báo cáo lừa đảo"</string>
<string name="delete" msgid="844871204175957681">"Xóa"</string>
<string name="discard_drafts" msgid="6862272443470085375">"Hủy thư nháp"</string>
<string name="refresh" msgid="490989798005710951">"Làm mới"</string>
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Cài đặt thư mục"</string>
<string name="menu_settings" msgid="6007027046949837282">"Cài đặt"</string>
<string name="menu_search" msgid="5297197523031943248">"Tìm kiếm"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Điều hướng"</string>
<string name="mark_important" msgid="6904096897104265870">"Đánh dấu là quan trọng"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Đánh dấu là không quan trọng"</string>
<string name="add_cc_label" msgid="504861315425773180">"Thêm Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Đã chuyển vào <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Kết quả"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Không hỗ trợ tính năng tìm kiếm trên tài khoản này."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Đang tìm kiếm…"</string>
<string name="add_label" msgid="6060201715848652940">"Thêm thư mục"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Hiển thị tin nhắn mới từ <xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Lối tắt thư mục tên"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Đang đợi đồng bộ hóa"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Email của bạn sẽ xuất hiện trong chốc lát."</string>
<string name="not_synced_title" msgid="794279749170198599">"Tài khoản chưa được đồng bộ hóa"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Tài khoản này không được thiết lập để tự động đồng bộ hóa.\nChạm vào "<b>"Đồng bộ hóa ngay bây giờ"</b>" để đồng bộ hóa thư một lần hoặc "<b>"Thay đổi cài đặt đồng bộ hóa"</b>" để thiết lập tài khoản này tự động đồng bộ hóa thư."</string>
<string name="manual_sync" msgid="6743983544685622800">"Đồng bộ hóa ngay bây giờ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b45e491..28a251f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"文件夹设置"</string>
<string name="menu_settings" msgid="6007027046949837282">"设置"</string>
<string name="menu_search" msgid="5297197523031943248">"搜索"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"导航"</string>
<string name="mark_important" msgid="6904096897104265870">"标记为重要"</string>
<string name="mark_not_important" msgid="4550967327747977068">"标记为不重要"</string>
<string name="add_cc_label" msgid="504861315425773180">"添加抄送/密送地址"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"已移至“<xliff:g id="FOLDERNAME">%1$s</xliff:g>”"</string>
<string name="search_results_header" msgid="4669917471897026269">"结果"</string>
<string name="search_unsupported" msgid="4654227193354052607">"此帐户不支持搜索。"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"正在搜索..."</string>
<string name="add_label" msgid="6060201715848652940">"添加文件夹"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"显示来自<xliff:g id="SENDER">%s</xliff:g>的新邮件。"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"为文件夹快捷方式命名"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"正在等待同步"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"您的电子邮件很快就会显示。"</string>
<string name="not_synced_title" msgid="794279749170198599">"帐户未同步"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"此帐户未设置为自动同步。您可以\n触摸"<b>"立即同步"</b>"同步邮件一次，或者触摸"<b>"更改同步设置"</b>"，将此帐户设置为自动同步邮件。"</string>
<string name="manual_sync" msgid="6743983544685622800">"立即同步"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 7bfdd9a..4c55885 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"資料夾設定"</string>
<string name="menu_settings" msgid="6007027046949837282">"設定"</string>
<string name="menu_search" msgid="5297197523031943248">"搜尋"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"瀏覽"</string>
<string name="mark_important" msgid="6904096897104265870">"標示為重要"</string>
<string name="mark_not_important" msgid="4550967327747977068">"標示為不重要"</string>
<string name="add_cc_label" msgid="504861315425773180">"新增副本/密件副本"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"已移至「<xliff:g id="FOLDERNAME">%1$s</xliff:g>」"</string>
<string name="search_results_header" msgid="4669917471897026269">"結果"</string>
<string name="search_unsupported" msgid="4654227193354052607">"這個帳戶不支援搜尋功能。"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"正在搜尋..."</string>
<string name="add_label" msgid="6060201715848652940">"新增資料夾"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"顯示來自<xliff:g id="SENDER">%s</xliff:g>的新郵件。"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"為資料夾捷徑命名"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"正在等待同步處理"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"您的電子郵件即將顯示。"</string>
<string name="not_synced_title" msgid="794279749170198599">"帳戶未同步"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"這個帳戶尚未設定為自動保持同步。\n請輕觸 [立即同步]"<b></b>"，將您的郵件進行同步處理一次，或者輕觸 [更改同步設定]"<b></b>"，將帳戶設定為自動保持郵件同步。"</string>
<string name="manual_sync" msgid="6743983544685622800">"立即同步"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 52b7808..4e5285f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"資料夾設定"</string>
<string name="menu_settings" msgid="6007027046949837282">"設定"</string>
<string name="menu_search" msgid="5297197523031943248">"搜尋"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"導覽"</string>
<string name="mark_important" msgid="6904096897104265870">"標示為重要"</string>
<string name="mark_not_important" msgid="4550967327747977068">"標示為不重要"</string>
<string name="add_cc_label" msgid="504861315425773180">"新增副本/密件副本"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"已移至「<xliff:g id="FOLDERNAME">%1$s</xliff:g>」"</string>
<string name="search_results_header" msgid="4669917471897026269">"搜尋結果"</string>
<string name="search_unsupported" msgid="4654227193354052607">"這個帳戶不支援搜尋功能。"</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"搜尋中…"</string>
<string name="add_label" msgid="6060201715848652940">"新增資料夾"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"顯示來自<xliff:g id="SENDER">%s</xliff:g>的新郵件。"</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"名稱資料夾捷徑"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"正在等待同步處理"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"即將顯示您的電子郵件。"</string>
<string name="not_synced_title" msgid="794279749170198599">"帳戶尚未同步處理"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"這個帳戶尚未設成自動同步處理。\n請輕觸 [立即同步處理]"<b></b>"，將您的郵件同步處理一次，或者輕觸 [變更同步處理設定]"<b></b>"，將帳戶設定成自動同步處理郵件。"</string>
<string name="manual_sync" msgid="6743983544685622800">"立即同步處理"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 4438016..86c0772 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -78,6 +78,7 @@
<string name="menu_folder_options" msgid="8897520487430647932">"Izilungiselelo zefolda"</string>
<string name="menu_settings" msgid="6007027046949837282">"Izilungiselelo"</string>
<string name="menu_search" msgid="5297197523031943248">"Sesha"</string>
+ <string name="drawer_title" msgid="5888199203222498840">"Ukuzulazula"</string>
<string name="mark_important" msgid="6904096897104265870">"Maka njengokubalulekile"</string>
<string name="mark_not_important" msgid="4550967327747977068">"Maka njengokungabalulekile"</string>
<string name="add_cc_label" msgid="504861315425773180">"Engeza Cc/Bcc"</string>
@@ -213,7 +214,6 @@
<string name="conversation_folder_moved" msgid="297469098857964678">"Kuhanjiswe ku-<xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Imiphumela"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Usesho alusekelwe kule akhawunti."</string>
- <string name="search_results_searching_header" msgid="3821361153909466819">"Iyasesha..."</string>
<string name="add_label" msgid="6060201715848652940">"Engeza ifolda"</string>
<string name="new_incoming_messages_one" msgid="827152289636155810">"Bonisa umlayezo omusha osuka ku-<xliff:g id="SENDER">%s</xliff:g>."</string>
<plurals name="new_incoming_messages_many">
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Isinqamuleli sefolda yegama"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Ilinde ukuvumelanisa"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"I-imeyli yakho izovela maduze."</string>
<string name="not_synced_title" msgid="794279749170198599">"I-akhawunti ayivumelanisiwe"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Le akhawunti ayisethiwe kufika ekuvumelaniseni kokuzenzakalela.\nThinta u-"<b>"Vumelanisa manje"</b>" ukuze uvumelanise imeyila kanye, noma "<b>"shintsha izilungiselelo zokuvumelanisa"</b>" ukuze usethe le akhawunti ukuze ivumelanise imeyili ngokuzenzakalela."</string>
<string name="manual_sync" msgid="6743983544685622800">"Vumelanisa manje"</string>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 49ed945..c59c8f5 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -49,16 +49,21 @@
<dimen name="conversation_folder_padding_extra_width">14dip</dimen>
<dimen name="conversation_folder_padding_before">8dip</dimen>
<dimen name="conversation_folder_padding_above">4dip</dimen>
- <dimen name="message_details_header_padding_start">16dip</dimen>
- <dimen name="message_details_header_padding_start_collapsed">68dip</dimen>
- <dimen name="message_details_header_padding_end">10dip</dimen>
+ <dimen name="message_attachment_header_padding_start">16dip</dimen>
+ <dimen name="message_details_extra_content_padding_start">68dip</dimen>
+ <dimen name="message_details_header_margin_start">6dp</dimen>
+ <dimen name="message_details_header_margin_end">22dp</dimen>
+ <dimen name="message_details_header_padding">4dp</dimen>
<dimen name="message_details_header_vertical_padding">7dp</dimen>
+ <dimen name="message_details_header_margin_top">-3dp</dimen>
+ <dimen name="message_details_header_padding_bottom">2dp</dimen>
<dimen name="message_show_pics_header_padding_end">14dip</dimen>
<dimen name="message_border_height">8dp</dimen>
<dimen name="message_border_height_collapsed">1dp</dimen>
<dimen name="message_header_presence_top_margin">-4dp</dimen>
<dimen name="message_header_action_button_width">48dp</dimen>
<dimen name="message_header_action_button_height">48dp</dimen>
+ <dimen name="message_header_action_button_height_condensed">48dp</dimen>
<dimen name="message_header_padding_start">
@dimen/conversation_message_content_margin_side</dimen>
<dimen name="message_header_title_container_margin_end_collapsed">10dp</dimen>
@@ -67,8 +72,8 @@
<dimen name="super_collapsed_height">30sp</dimen>
<dimen name="super_collapsed_text_size">14sp</dimen>
<dimen name="notification_view_height">36dip</dimen>
- <dimen name="message_header_contact_photo_width">48sp</dimen>
- <dimen name="message_header_contact_photo_height">48sp</dimen>
+ <dimen name="message_header_contact_photo_width">48dp</dimen>
+ <dimen name="message_header_contact_photo_height">48dp</dimen>
<dimen name="message_header_inner_side_padding">10dp</dimen>
<dimen name="attachment_toast_yoffset">-100dip</dimen>
<dimen name="spinner_frame_width">196dip</dimen>
@@ -129,8 +134,8 @@
<dimen name="dismiss_separator_padding">16dip</dimen>
<dimen name="teaser_text_padding">16dip</dimen>
<dimen name="attachment_margin_side">16dip</dimen>
- <dimen name="attachment_icon_padding">5dip</dimen>
- <dimen name="recipient_summary_margin">16dip</dimen>
+ <dimen name="attachment_icon_padding">10dip</dimen>
+ <dimen name="upper_date_margin">1dp</dimen>
<!-- Minimum width of the folder teaser count TextView -->
<dimen name="folder_teaser_count_textview_minwidth">68dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index de07fd8..8c75234 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -167,6 +167,8 @@
<string name="menu_settings">Settings</string>
<!-- Menu item: search through the Gmail inbox -->
<string name="menu_search">Search</string>
+ <!-- Title of the drawer, indicating what it is used for, which is navigation of the app -->
+ <string name="drawer_title">Navigation</string>
<!-- Menu item: shown in conversation menu. Tap this to move to mark conversation as important [CHAR LIMIT=30] -->
<string name="mark_important">Mark important</string>
@@ -456,10 +458,12 @@
</plurals>
<!-- Conversation message header strings -->
- <!-- Icon name for expanding recipient details in a message when viewing it. [CHAR LIMIT=40] -->
- <string name="expand_recipient_details">Expand recipient details</string>
- <!-- Icon name for collapsing recipient details in a message when viewing it. [CHAR LIMIT=40] -->
- <string name="collapse_recipient_details">Collapse recipient details</string>
+ <!-- Text for expanding recipient details in a message when viewing it. [CHAR LIMIT=40] -->
+ <string name="details">Details</string>
+ <!-- Text for collapsing recipient details in a message when viewing it. [CHAR LIMIT=40] -->
+ <string name="hide_details">Hide details</string>
+ <!-- Shown to display the recipient(s) of the message [CHAR LIMIT=10] -->
+ <string name="to_message_header">to <xliff:g id="recipients">%1$s</xliff:g></string>
<!-- Icon name for showing sender contact information. [CHAR LIMIT=100] -->
<string name="contact_info_string">Show contact information for <xliff:g id="name">%1$s</xliff:g></string>
<!-- Icon name for showing sender contact information when we cannot get sender info. [CHAR LIMIT=100] -->
@@ -479,7 +483,7 @@
<string name="cc_heading">Cc:\u0020</string>
<!-- Shown to display the bcc recipient(s) of the message [CHAR LIMIT=10] -->
<string name="bcc_heading">Bcc:\u0020</string>
- <!-- Shown to display the recipient(s) of the message [CHAR LIMIT=10] -->
+ <!-- Shown to display the date of the message [CHAR LIMIT=10] -->
<string name="date_heading">Date:\u0020</string>
<!-- Displayed above an HTML message to show the images in that message [CHAR LIMIT=40] -->
<string name="show_images">Show pictures</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e73beff..c4d762e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Compose Styles -->
<style name="RecipientEditTextViewStyle" parent="@style/RecipientEditTextView">
<item name="android:minHeight">42dip</item>
@@ -117,12 +117,6 @@
<item name="android:textSize">12sp</item>
</style>
- <style name="AttachmentThumbnail">
- <item name="android:layout_marginLeft">8dip</item>
- <item name="android:layout_width">wrap_content</item>
- <item name="android:layout_height">wrap_content</item>
- </style>
-
<style name="RespondInlineButtonStyle">
<item name="android:textColor">@color/quotedTextColor</item>
<item name="android:textStyle">bold</item>
@@ -224,35 +218,31 @@
<item name="android:layout_marginTop">@dimen/message_header_presence_top_margin</item>
</style>
- <style name="AbstractMessageSenderNameStyle">
+ <style name="MessageSenderNameStyle">
<item name="android:singleLine">true</item>
+ <item name="android:textAlignment" tools:ignore="NewApi">viewStart</item>
+ <item name="android:textColor">@color/conv_header_text_dark</item>
<item name="android:textSize">@dimen/message_sender_name_text_size</item>
- <item name="android:textColor">@color/conv_header_text_dark</item>
</style>
- <style name="MessageSenderNameStyle" parent="AbstractMessageSenderNameStyle">
- <item name="android:layout_alignParentLeft">true</item>
- </style>
-
- <style name="AbstractMessageHeaderSubtitleStyle">
+ <style name="MessageHeaderSubtitleStyle">
<item name="android:singleLine">true</item>
- <item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
+ <item name="android:textAlignment" tools:ignore="NewApi">viewStart</item>
<item name="android:textColor">@color/conv_header_text_dark</item>
- </style>
-
- <style name="MessageHeaderSubtitleStyle" parent="AbstractMessageHeaderSubtitleStyle">
- <item name="android:layout_alignParentLeft">true</item>
+ <item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
</style>
<style name="MessageHeaderSnippetStyle">
<item name="android:lines">2</item>
- <item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
+ <item name="android:textAlignment" tools:ignore="NewApi">viewStart</item>
<item name="android:textColor">@color/conv_header_text_light</item>
+ <item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
</style>
<style name="MessageHeaderSmallStyle">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
+ <item name="android:textAlignment" tools:ignore="NewApi">viewStart</item>
<item name="android:textColor">@color/conv_header_text_dark</item>
<item name="android:textSize">@dimen/message_header_subtitle_text_size</item>
</style>
@@ -266,27 +256,18 @@
</style>
<style name="MessageHeaderShowPicsStyle" parent="AbstractMessageHeaderShowPicsStyle">
- <item name="android:paddingLeft">@dimen/message_details_header_padding_start_collapsed
- </item>
+ <item name="android:paddingLeft">@dimen/message_details_extra_content_padding_start</item>
<item name="android:paddingRight">@dimen/message_show_pics_header_padding_end</item>
<item name="android:drawableLeft">@drawable/ic_show_images_holo_light</item>
</style>
- <style name="AbstractMessageHeaderUpperDateStyle" parent="MessageHeaderSmallStyle">
- <item name="android:minHeight">24dp</item>
- </style>
-
- <style name="MessageHeaderUpperDateStyle" parent="AbstractMessageHeaderUpperDateStyle">
- <item name="android:layout_alignParentRight">true</item>
- </style>
-
<style name="AbstractMessageAttachmentsHeaderStyle" parent="MessageHeaderSmallStyle">
<item name="android:textStyle">bold</item>
<item name="android:textAllCaps">true</item>
</style>
<style name="MessageAttachmentsHeaderStyle" parent="AbstractMessageAttachmentsHeaderStyle">
- <item name="android:paddingLeft">@dimen/message_details_header_padding_start</item>
+ <item name="android:paddingLeft">@dimen/message_attachment_header_padding_start</item>
</style>
<style name="MessageDetailsValueStyle" parent="MessageHeaderSmallStyle">
@@ -538,9 +519,10 @@
</style>
<style name="MessageDetailsHeaderStyle">
- <item name="android:paddingLeft">@dimen/message_details_header_padding_start_collapsed
- </item>
- <item name="android:paddingRight">@dimen/message_details_header_padding_end</item>
+ <item name="android:layout_marginLeft">@dimen/message_details_header_margin_start</item>
+ <item name="android:layout_marginRight">@dimen/message_details_header_margin_end</item>
+ <item name="android:paddingLeft">@dimen/message_details_header_padding</item>
+ <item name="android:paddingRight">@dimen/message_details_header_padding</item>
</style>
<style name="MessageUpperHeaderTextStyle">
@@ -607,10 +589,6 @@
<item name="android:layout_marginLeft">@dimen/teaser_text_padding</item>
</style>
- <style name="DetailsExpanderStyle">
- <item name="android:layout_marginLeft">@dimen/message_header_inner_side_padding</item>
- </style>
-
<style name="AttachmentMarginStyle">
<item name="android:layout_marginLeft">@dimen/attachment_margin_side</item>
<item name="android:layout_marginRight">@dimen/attachment_margin_side</item>
@@ -620,10 +598,6 @@
<item name="android:layout_marginLeft">@dimen/message_header_padding_start</item>
</style>
- <style name="AttachmentIconStyle">
- <item name="android:layout_marginLeft">@dimen/attachment_icon_padding</item>
- </style>
-
<style name="ConversationHeaderSideMarginStyle">
<item name="android:layout_marginLeft">@dimen/conversation_header_margin_side</item>
<item name="android:layout_marginRight">@dimen/conversation_header_margin_side</item>
@@ -642,10 +616,6 @@
<item name="android:layout_marginRight">@dimen/folder_list_item_end_margin</item>
</style>
- <style name="RecipientSummaryStyle" parent="MessageHeaderSmallStyle">
- <item name="android:layout_marginRight">@dimen/recipient_summary_margin</item>
- </style>
-
<style name="ToastBarDescriptionIconStyle">
<item name="android:paddingLeft">@dimen/toast_bar_description_icon_padding_start</item>
<item name="android:paddingRight">@dimen/toast_bar_description_icon_padding_end</item>
diff --git a/src/com/android/emailcommon/internet/MimeHeader.java b/src/com/android/emailcommon/internet/MimeHeader.java
index 45ae318..c578bad 100644
--- a/src/com/android/emailcommon/internet/MimeHeader.java
+++ b/src/com/android/emailcommon/internet/MimeHeader.java
@@ -33,10 +33,6 @@
* into the MIME data by LocalStore.fetch.
*/
public static final String HEADER_ANDROID_ATTACHMENT_STORE_DATA = "X-Android-Attachment-StoreData";
- /**
- * Application specific header that is used to tag body parts for quoted/forwarded messages.
- */
- public static final String HEADER_ANDROID_BODY_QUOTED_PART = "X-Android-Body-Quoted-Part";
public static final String HEADER_CONTENT_TYPE = "Content-Type";
public static final String HEADER_CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
diff --git a/src/com/android/emailcommon/utility/ConversionUtilities.java b/src/com/android/emailcommon/utility/ConversionUtilities.java
index 0dbb520..7bfe7d9 100644
--- a/src/com/android/emailcommon/utility/ConversionUtilities.java
+++ b/src/com/android/emailcommon/utility/ConversionUtilities.java
@@ -27,13 +27,6 @@
public class ConversionUtilities {
/**
- * Values for HEADER_ANDROID_BODY_QUOTED_PART to tag body parts
- */
- public static final String BODY_QUOTED_PART_REPLY = "quoted-reply";
- public static final String BODY_QUOTED_PART_FORWARD = "quoted-forward";
- public static final String BODY_QUOTED_PART_INTRO = "quoted-intro";
-
- /**
* Helper function to append text to a StringBuffer, creating it if necessary.
* Optimization: The majority of the time we are *not* appending - we should have a path
* that deals with single strings.
@@ -60,9 +53,6 @@
public static class BodyFieldData {
public String textContent;
public String htmlContent;
- public String textReply;
- public String htmlReply;
- public String introText;
public String snippet;
public boolean isQuotedReply;
public boolean isQuotedForward;
@@ -76,39 +66,12 @@
final BodyFieldData data = new BodyFieldData();
StringBuffer sbHtml = null;
StringBuffer sbText = null;
- StringBuffer sbHtmlReply = null;
- StringBuffer sbTextReply = null;
- StringBuffer sbIntroText = null;
for (Part viewable : viewables) {
String text = MimeUtility.getTextFromPart(viewable);
- String[] replyTags = viewable.getHeader(MimeHeader.HEADER_ANDROID_BODY_QUOTED_PART);
- String replyTag = null;
- if (replyTags != null && replyTags.length > 0) {
- replyTag = replyTags[0];
- }
// Deploy text as marked by the various tags
boolean isHtml = "text/html".equalsIgnoreCase(viewable.getMimeType());
- if (replyTag != null) {
- data.isQuotedReply = BODY_QUOTED_PART_REPLY.equalsIgnoreCase(replyTag);
- data.isQuotedForward = BODY_QUOTED_PART_FORWARD.equalsIgnoreCase(replyTag);
- boolean isQuotedIntro = BODY_QUOTED_PART_INTRO.equalsIgnoreCase(replyTag);
-
- if (data.isQuotedReply || data.isQuotedForward) {
- if (isHtml) {
- sbHtmlReply = appendTextPart(sbHtmlReply, text);
- } else {
- sbTextReply = appendTextPart(sbTextReply, text);
- }
- continue;
- }
- if (isQuotedIntro) {
- sbIntroText = appendTextPart(sbIntroText, text);
- continue;
- }
- }
-
// Most of the time, just process regular body parts
if (isHtml) {
sbHtml = appendTextPart(sbHtml, text);
@@ -130,15 +93,6 @@
data.snippet = TextUtilities.makeSnippetFromHtmlText(text);
}
}
- if (sbHtmlReply != null && sbHtmlReply.length() != 0) {
- data.htmlReply = sbHtmlReply.toString();
- }
- if (sbTextReply != null && sbTextReply.length() != 0) {
- data.textReply = sbTextReply.toString();
- }
- if (sbIntroText != null && sbIntroText.length() != 0) {
- data.introText = sbIntroText.toString();
- }
return data;
}
}
diff --git a/src/com/android/mail/browse/ConversationContainer.java b/src/com/android/mail/browse/ConversationContainer.java
index 19380ea..eff4430 100644
--- a/src/com/android/mail/browse/ConversationContainer.java
+++ b/src/com/android/mail/browse/ConversationContainer.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.content.res.Configuration;
import android.database.DataSetObserver;
-import android.graphics.Canvas;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.util.SparseArray;
@@ -63,8 +62,14 @@
* sandwich has unique characteristics: the list items are scrolled based on an external controller,
* and we happen to know all of the overlay positions up front. So it didn't make sense to shoehorn
* a ListView in and instead, we rolled our own view recycler by borrowing key details from
- * ListView and AbsListView.
+ * ListView and AbsListView.<br/><br/>
*
+ * There is one additional constraint with the recycling: since scroll
+ * notifications happen during the WebView's draw, we do not remove and re-add views for recycling.
+ * Instead, we simply move the views off-screen and add them to our recycle cache. When the views
+ * are reused, they are simply moved back on screen instead of added. This practice
+ * circumvents the issues found when views are added or removed during draw (which results in
+ * elements not being drawn and other visual oddities). See b/10994303 for more details.
*/
public class ConversationContainer extends ViewGroup implements ScrollListener {
private static final String TAG = ConversationViewFragment.LAYOUT_TAG;
@@ -89,20 +94,6 @@
private OverlayPosition[] mOverlayPositions;
private ConversationWebView mWebView;
private SnapHeader mSnapHeader;
- private View mTopMostOverlay;
-
- /**
- * This is a hack.
- *
- * <p>Without this hack enabled, very fast scrolling can sometimes cause the top-most layers
- * to skip being drawn for a frame or two. It happens specifically when overlay views are
- * attached or added, and WebView happens to draw (on its own) immediately afterwards.
- *
- * <p>The workaround is to force an additional draw of the top-most overlay. Since the problem
- * only occurs when scrolling overlays are added, restrict the additional draw to only occur
- * if scrolling overlays were added since the last draw.
- */
- private boolean mAttachedOverlaySinceLastDraw;
private final List<View> mNonScrollingChildren = Lists.newArrayList();
@@ -178,7 +169,7 @@
/**
* The adapter index of the lowest overlay item that is above the top of the screen and reports
* {@link ConversationOverlayItem#canPushSnapHeader()}. We calculate this after a pass through
- * {@link #positionOverlays(int, int)}.
+ * {@link #positionOverlays}.
*
*/
private int mSnapIndex;
@@ -262,8 +253,6 @@
mWebView = (ConversationWebView) findViewById(R.id.webview);
mWebView.addScrollListener(this);
- mTopMostOverlay = findViewById(R.id.conversation_topmost_overlay);
-
for (int id : BOTTOM_LAYER_VIEW_IDS) {
mNonScrollingChildren.add(findViewById(id));
}
@@ -345,7 +334,7 @@
private void clearOverlays() {
for (int i = 0, len = mOverlayViews.size(); i < len; i++) {
- detachOverlay(mOverlayViews.valueAt(i));
+ detachOverlay(mOverlayViews.valueAt(i), true /* removeFromContainer */);
}
mOverlayViews.clear();
}
@@ -366,7 +355,7 @@
mAdditionalBottomBorderAdded = false;
mSnapEnabled = isSnapEnabled();
- positionOverlays(0, mOffsetY);
+ positionOverlays(mOffsetY, false /* postAddView */);
}
private void forwardFakeMotionEvent(MotionEvent original, int newAction) {
@@ -449,14 +438,23 @@
}
@Override
- public void onNotifierScroll(final int x, final int y) {
+ public void onNotifierScroll(final int y) {
mVelocityTracker.onInput(y);
mDisableLayoutTracing = true;
- positionOverlays(x, y);
+ positionOverlays(y, true /* postAddView */); // post the addView since we're in draw code
mDisableLayoutTracing = false;
}
- private void positionOverlays(int x, int y) {
+ /**
+ * Positions the overlays given an updated y position for the container.
+ * @param y the current top position on screen
+ * @param postAddView If {@code true}, posts all calls to
+ * {@link #addViewInLayoutWrapper(android.view.View, boolean)}
+ * to the UI thread rather than adding it immediately. If {@code false},
+ * calls {@link #addViewInLayoutWrapper(android.view.View, boolean)}
+ * immediately.
+ */
+ private void positionOverlays(int y, boolean postAddView) {
mOffsetY = y;
/*
@@ -524,7 +522,7 @@
traceLayout("in loop, spacer=%d overlay=%d t/b=%d/%d (%s)", spacerIndex, adapterIndex,
itemPos.top, itemPos.bottom, adapterItem);
- positionOverlay(adapterIndex, itemPos.top, itemPos.bottom);
+ positionOverlay(adapterIndex, itemPos.top, itemPos.bottom, postAddView);
// and keep stacking overlays unconditionally if we are on the first spacer, or as long
// as overlays are contiguous
@@ -544,21 +542,21 @@
traceLayout("in contig loop, spacer=%d overlay=%d t/b=%d/%d (%s)", spacerIndex,
adapterIndex, itemPos.top, itemPos.bottom, adapterItem);
- positionOverlay(adapterIndex, itemPos.top, itemPos.bottom);
+ positionOverlay(adapterIndex, itemPos.top, itemPos.bottom, postAddView);
}
spacerIndex--;
}
positionSnapHeader(mSnapIndex);
- positionAdditionalBottomBorder();
+ positionAdditionalBottomBorder(postAddView);
}
/**
* Adds an additional bottom border to the overlay views in case
* the overlays do not fill the entire screen.
*/
- private void positionAdditionalBottomBorder() {
+ private void positionAdditionalBottomBorder(boolean postAddView) {
final int lastBottom = mAdditionalBottomBorderOverlayTop;
final int containerHeight = webPxToScreenPx(mWebView.getContentHeight());
final int speculativeHeight = containerHeight - lastBottom;
@@ -571,7 +569,7 @@
setAdditionalBottomBorderHeight(speculativeHeight);
if (!mAdditionalBottomBorderAdded) {
- addViewInLayoutWrapper(mAdditionalBottomBorder);
+ addViewInLayoutWrapper(mAdditionalBottomBorder, postAddView);
mAdditionalBottomBorderAdded = true;
}
@@ -648,18 +646,11 @@
private void onOverlayScrolledOff(final int adapterIndex, final OverlayView overlay,
int overlayTop, int overlayBottom) {
- // detach the view asynchronously, as scroll notification can happen during a draw, when
- // it's not safe to remove children
-
- // but immediately remove this view from the view set so future lookups don't find it
+ // immediately remove this view from the view set so future lookups don't find it
mOverlayViews.remove(adapterIndex);
- post(new Runnable() {
- @Override
- public void run() {
- detachOverlay(overlay);
- }
- });
+ // detach but don't actually remove from the view
+ detachOverlay(overlay, false /* removeFromContainer */);
// push it out of view immediately
// otherwise this scrolled-off header will continue to draw until the runnable runs
@@ -677,12 +668,15 @@
public void addScrapView(int type, View v) {
mScrapViews.add(type, v);
+ addViewInLayoutWrapper(v, false /* postAddView */);
}
- private void detachOverlay(OverlayView overlay) {
+ private void detachOverlay(OverlayView overlay, boolean removeFromContainer) {
// Prefer removeViewInLayout over removeView. The typical followup layout pass is unneeded
// because removing overlay views doesn't affect overall layout.
- removeViewInLayout(overlay.view);
+ if (removeFromContainer) {
+ removeViewInLayout(overlay.view);
+ }
mScrapViews.add(overlay.itemType, overlay.view);
if (overlay.view instanceof DetachListener) {
((DetachListener) overlay.view).onDetachedFromParent();
@@ -736,17 +730,7 @@
}
}
- positionOverlays(0, mOffsetY);
- }
-
- @Override
- protected void dispatchDraw(Canvas canvas) {
- super.dispatchDraw(canvas);
-
- if (mAttachedOverlaySinceLastDraw) {
- drawChild(canvas, mTopMostOverlay, getDrawingTime());
- mAttachedOverlaySinceLastDraw = false;
- }
+ positionOverlays(mOffsetY, false /* postAddView */);
}
@Override
@@ -783,7 +767,8 @@
return (int) (webPx * mScale);
}
- private void positionOverlay(int adapterIndex, int overlayTopY, int overlayBottomY) {
+ private void positionOverlay(
+ int adapterIndex, int overlayTopY, int overlayBottomY, boolean postAddView) {
final OverlayView overlay = mOverlayViews.get(adapterIndex);
final ConversationOverlayItem item = mOverlayAdapter.getItem(adapterIndex);
@@ -796,7 +781,7 @@
View overlayView = overlay != null ? overlay.view : null;
// show and/or move overlay
if (overlayView == null) {
- overlayView = addOverlayView(adapterIndex);
+ overlayView = addOverlayView(adapterIndex, postAddView);
ViewCompat.setLayoutDirection(overlayView, ViewCompat.getLayoutDirection(this));
measureOverlayView(overlayView);
item.markMeasurementValid();
@@ -851,7 +836,7 @@
child.layout(childLeft, top, childLeft + child.getMeasuredWidth(), bottom);
}
- private View addOverlayView(int adapterIndex) {
+ private View addOverlayView(int adapterIndex, boolean postAddView) {
final int itemType = mOverlayAdapter.getItemViewType(adapterIndex);
final View convertView = mScrapViews.poll(itemType);
@@ -864,17 +849,41 @@
LogUtils.d(TAG, "want to CREATE scrolled-in view: index=%d obj=%s", adapterIndex, view);
}
- addViewInLayoutWrapper(view);
+ if (view.getParent() == null) {
+ addViewInLayoutWrapper(view, postAddView);
+ } else {
+ // Need to call postInvalidate since the view is being moved back on
+ // screen and we want to force it to draw the view. Without doing this,
+ // the view may not draw itself when it comes back on screen.
+ view.postInvalidate();
+ }
return view;
}
- private void addViewInLayoutWrapper(View view) {
- final int index = BOTTOM_LAYER_VIEW_IDS.length;
- addViewInLayout(view, index, view.getLayoutParams(), true /* preventRequestLayout */);
- mAttachedOverlaySinceLastDraw = true;
+ private void addViewInLayoutWrapper(View view, boolean postAddView) {
+ final AddViewRunnable addviewRunnable = new AddViewRunnable(view);
+ if (postAddView) {
+ post(addviewRunnable);
+ } else {
+ addviewRunnable.run();
+ }
}
+ private class AddViewRunnable implements Runnable {
+ public final View mView;
+
+ public AddViewRunnable(View view) {
+ mView = view;
+ }
+
+ @Override
+ public void run() {
+ final int index = BOTTOM_LAYER_VIEW_IDS.length;
+ addViewInLayout(mView, index, mView.getLayoutParams(), true /* preventRequestLayout */);
+ }
+ };
+
private boolean isSnapEnabled() {
if (mAccountController == null || mAccountController.getAccount() == null
|| mAccountController.getAccount().settings == null) {
@@ -935,19 +944,6 @@
}
/**
- * Return a collection of all currently visible overlay views, in no particular order.
- * Please don't mess with them too badly (e.g. remove from parent).
- *
- */
- public List<View> getOverlayViews() {
- final List<View> views = Lists.newArrayList();
- for (int i = 0, len = mOverlayViews.size(); i < len; i++) {
- views.add(mOverlayViews.valueAt(i).view);
- }
- return views;
- }
-
- /**
* Prevents any layouts from happening until the next time
* {@link #onGeometryChange(OverlayPosition[])} is
* called. Useful when you know the HTML spacer coordinates are inconsistent with adapter items.
@@ -968,7 +964,7 @@
}
mOverlayPositions = overlayPositions;
- positionOverlays(0, mOffsetY);
+ positionOverlays(mOffsetY, false /* postAddView */);
}
private void traceLayout(String msg, Object... params) {
diff --git a/src/com/android/mail/browse/ConversationWebView.java b/src/com/android/mail/browse/ConversationWebView.java
index a5d3a14..506674c 100644
--- a/src/com/android/mail/browse/ConversationWebView.java
+++ b/src/com/android/mail/browse/ConversationWebView.java
@@ -180,7 +180,7 @@
super.onScrollChanged(l, t, oldl, oldt);
for (ScrollListener listener : mScrollListeners) {
- listener.onNotifierScroll(l, t);
+ listener.onNotifierScroll(t);
}
}
diff --git a/src/com/android/mail/browse/EmlMessageViewFragment.java b/src/com/android/mail/browse/EmlMessageViewFragment.java
index eb56bf9..3ab9885 100644
--- a/src/com/android/mail/browse/EmlMessageViewFragment.java
+++ b/src/com/android/mail/browse/EmlMessageViewFragment.java
@@ -33,6 +33,7 @@
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import android.widget.Toast;
@@ -99,6 +100,18 @@
}
@Override
+ public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
+ // try to load the url assuming it is a cid url
+ final Uri uri = Uri.parse(url);
+ final WebResourceResponse response = loadCIDUri(uri, mViewController.getMessage());
+ if (response != null) {
+ return response;
+ }
+
+ return super.shouldInterceptRequest(view, url);
+ }
+
+ @Override
public void onPageFinished(WebView view, String url) {
// Ignore unsafe calls made after a fragment is detached from an activity.
// This method needs to, for example, get at the loader manager, which needs
diff --git a/src/com/android/mail/browse/MessageFooterView.java b/src/com/android/mail/browse/MessageFooterView.java
index cfec4e3..24bc5f8 100644
--- a/src/com/android/mail/browse/MessageFooterView.java
+++ b/src/com/android/mail/browse/MessageFooterView.java
@@ -89,6 +89,12 @@
MessageFooterView getViewForItem(MessageFooterItem item);
int getUpdatedHeight(MessageFooterItem item);
+
+ /**
+ * @return <tt>true</tt> if this footer is contained within a SecureConversationViewFragment
+ * and cannot assume the content is <strong>not</strong> malicious
+ */
+ boolean isSecure();
}
public MessageFooterView(Context context) {
@@ -222,13 +228,15 @@
final List<Attachment> barAttachments = new ArrayList<Attachment>(maxSize);
for (Attachment attachment : attachments) {
- if (attachment.isInlineAttachment()) {
- // skip non-standard (aka inline) attachments
- continue;
- } else if (AttachmentTile.isTiledAttachment(attachment)) {
- tiledAttachments.add(attachment);
- } else {
- barAttachments.add(attachment);
+ // attachments in secure views are displayed in the footer so the user may interact with
+ // them; for normal views there is no need to show inline attachments in the footer
+ // since users can interact with them in place
+ if (!attachment.isInlineAttachment() || mCallbacks.isSecure()) {
+ if (AttachmentTile.isTiledAttachment(attachment)) {
+ tiledAttachments.add(attachment);
+ } else {
+ barAttachments.add(attachment);
+ }
}
}
@@ -367,7 +375,7 @@
}
public void collapseAboveBarAttachmentsView() {
- int heightBefore = measureHeight();
+ measureHeight();
mAboveAttachmentBarListLayout.setVisibility(View.GONE);
updateSpacerHeight();
}
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 9575f8a..7330338 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -23,13 +23,10 @@
import android.content.res.Resources;
import android.database.DataSetObserver;
import android.graphics.Bitmap;
-import android.graphics.Typeface;
import android.support.v4.text.BidiFormatter;
import android.text.Spannable;
-import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
-import android.text.style.StyleSpan;
import android.text.style.URLSpan;
import android.util.AttributeSet;
import android.view.LayoutInflater;
@@ -87,15 +84,10 @@
private static final int SHOW_IMAGE_PROMPT_ONCE = 1;
private static final int SHOW_IMAGE_PROMPT_ALWAYS = 2;
- private static final String HEADER_INFLATE_TAG = "message header inflate";
- private static final String HEADER_ADDVIEW_TAG = "message header addView";
private static final String HEADER_RENDER_TAG = "message header render";
- private static final String PREMEASURE_TAG = "message header pre-measure";
private static final String LAYOUT_TAG = "message header layout";
private static final String MEASURE_TAG = "message header measure";
- private static final String RECIPIENT_HEADING_DELIMITER = " ";
-
private static final String LOG_TAG = LogTag.getLogTag();
// This is a debug only feature
@@ -103,18 +95,19 @@
private MessageHeaderViewCallbacks mCallbacks;
- private ViewGroup mUpperHeaderView;
private View mSnapHeaderBottomBorder;
private TextView mSenderNameView;
- private TextView mSenderEmailView;
private TextView mDateView;
private TextView mSnippetView;
private QuickContactBadge mPhotoView;
private ImageView mStarView;
private ViewGroup mTitleContainerView;
+ private ViewGroup mActionsAndDetailsView;
private ViewGroup mExtraContentView;
- private ViewGroup mCollapsedDetailsView;
- private ViewGroup mExpandedDetailsView;
+ private View mCollapsedDetailsView;
+ private TextView mCollapsedRecipientSummary;
+ private View mExpandedDetailsView;
+ private TextView mExpandedRecipientSummary;
private SpamWarningView mSpamWarningView;
private TextView mImagePromptView;
private MessageInviteView mInviteView;
@@ -161,6 +154,8 @@
*/
private boolean mCollapsedStarVisible;
private boolean mStarShown;
+ private int mStarHeight;
+ private int mStarHeightCollapsed;
/**
* End margin of the text when collapsed. When expanded, the margin is 0.
@@ -172,7 +167,7 @@
private MessageHeaderItem mMessageHeaderItem;
private ConversationMessage mMessage;
- private boolean mCollapsedDetailsValid;
+ private boolean mRecipientSummaryValid;
private boolean mExpandedDetailsValid;
private final LayoutInflater mInflater;
@@ -230,6 +225,12 @@
String getMessageTransforms(Message msg);
FragmentManager getFragmentManager();
+
+ /**
+ * @return <tt>true</tt> if this header is contained within a SecureConversationViewFragment
+ * and cannot assume the content is <strong>not</strong> malicious
+ */
+ boolean isSecure();
}
public MessageHeaderView(Context context) {
@@ -258,10 +259,8 @@
@Override
protected void onFinishInflate() {
super.onFinishInflate();
- mUpperHeaderView = (ViewGroup) findViewById(R.id.upper_header);
mSnapHeaderBottomBorder = findViewById(R.id.snap_header_bottom_border);
mSenderNameView = (TextView) findViewById(R.id.sender_name);
- mSenderEmailView = (TextView) findViewById(R.id.sender_email);
mDateView = (TextView) findViewById(R.id.send_date);
mSnippetView = (TextView) findViewById(R.id.email_snippet);
mPhotoView = (QuickContactBadge) findViewById(R.id.photo);
@@ -270,6 +269,7 @@
mForwardButton = findViewById(R.id.forward);
mStarView = (ImageView) findViewById(R.id.star);
mTitleContainerView = (ViewGroup) findViewById(R.id.title_container);
+ mActionsAndDetailsView = (ViewGroup) findViewById(R.id.actions_and_details);
mOverflowButton = findViewById(R.id.overflow);
mDraftIcon = findViewById(R.id.draft);
mEditDraftButton = findViewById(R.id.edit_draft);
@@ -281,20 +281,22 @@
final Resources resources = getResources();
mTitleContainerCollapsedMarginEnd = resources.getDimensionPixelSize(
R.dimen.message_header_title_container_margin_end_collapsed);
+ mStarHeight = resources.getDimensionPixelSize(R.dimen.message_header_action_button_height);
+ mStarHeightCollapsed = resources.getDimensionPixelSize(
+ R.dimen.message_header_action_button_height_condensed);
setExpanded(true);
- registerMessageClickTargets(R.id.reply, R.id.reply_all, R.id.forward, R.id.star,
- R.id.edit_draft, R.id.overflow, R.id.upper_header);
+ registerMessageClickTargets(mReplyButton, mReplyAllButton, mForwardButton, mStarView,
+ mEditDraftButton, mOverflowButton, mTitleContainerView);
- mUpperHeaderView.setOnCreateContextMenuListener(mEmailCopyMenu);
+ mTitleContainerView.setOnCreateContextMenuListener(mEmailCopyMenu);
}
- private void registerMessageClickTargets(int... ids) {
- for (int id : ids) {
- View v = findViewById(id);
- if (v != null) {
- v.setOnClickListener(this);
+ private void registerMessageClickTargets(View... views) {
+ for (View view : views) {
+ if (view != null) {
+ view.setOnClickListener(this);
}
}
}
@@ -412,15 +414,27 @@
Timer t = new Timer();
t.start(HEADER_RENDER_TAG);
- mCollapsedDetailsValid = false;
+ mRecipientSummaryValid = false;
mExpandedDetailsValid = false;
mMessage = mMessageHeaderItem.getMessage();
final Account account = getAccount();
- final boolean alwaysShowImages = (account != null) &&
+ final boolean alwaysShowImagesForAccount = (account != null) &&
(account.settings.showImages == Settings.ShowImages.ALWAYS);
- mShowImagePrompt = mMessage.shouldShowImagePrompt() && !alwaysShowImages;
+
+ final boolean alwaysShowImagesForMessage = mMessage.shouldShowImagePrompt();
+
+ if (!alwaysShowImagesForMessage) {
+ // we don't need the "Show picture" prompt if the user allows images for this message
+ mShowImagePrompt = false;
+ } else if (mCallbacks.isSecure()) {
+ // in a secure view we always display the "Show picture" prompt
+ mShowImagePrompt = true;
+ } else {
+ // otherwise honor the account setting for automatically showing pictures
+ mShowImagePrompt = !alwaysShowImagesForAccount;
+ }
setExpanded(mMessageHeaderItem.isExpanded());
@@ -445,11 +459,11 @@
// 2. the account has no custom froms, fromAddress will be empty, and we
// can safely fall back and show the account name as sender since it's
// the only possible fromAddress.
- String from = mMessage.getFrom();
- if (TextUtils.isEmpty(from)) {
- from = (account != null) ? account.getEmailAddress() : "";
+ String fromAddress = mMessage.getFrom();
+ if (TextUtils.isEmpty(fromAddress)) {
+ fromAddress = (account != null) ? account.getEmailAddress() : "";
}
- mSender = getAddress(from);
+ mSender = getAddress(fromAddress);
mStarView.setSelected(mMessage.starred);
mStarView.setContentDescription(getResources().getString(
@@ -468,16 +482,13 @@
updateChildVisibility();
- final String snippet;
if (mIsDraft || mIsSending) {
- snippet = makeSnippet(mMessage.snippet);
+ mSnippet = makeSnippet(mMessage.snippet);
} else {
- snippet = mMessage.snippet;
+ mSnippet = mMessage.snippet;
}
- mSnippet = snippet == null ? null : getBidiFormatter().unicodeWrap(snippet);
mSenderNameView.setText(getHeaderTitle());
- mSenderEmailView.setText(getHeaderSubtitle());
mDateView.setText(mMessageHeaderItem.getTimestampLong());
mSnippetView.setText(mSnippet);
setAddressOnContextMenu();
@@ -548,32 +559,12 @@
} else if (mIsSending) {
title = getResources().getString(R.string.sending);
} else {
- title = getBidiFormatter().unicodeWrap(
- getSenderName(mSender));
+ title = getSenderName(mSender);
}
return title;
}
- private CharSequence getHeaderSubtitle() {
- CharSequence sub;
- if (mIsSending) {
- sub = null;
- } else {
- if (isExpanded()) {
- if (mMessage.viaDomain != null) {
- sub = getResources().getString(
- R.string.via_domain, mMessage.viaDomain);
- } else {
- sub = getSenderAddress(mSender);
- }
- } else {
- sub = mSnippet;
- }
- }
- return sub;
- }
-
/**
* Return the name, if known, or just the address.
*/
@@ -585,13 +576,6 @@
return TextUtils.isEmpty(displayName) ? sender.getAddress() : displayName;
}
- /**
- * Return the address, if a name is present, or null if not.
- */
- private static CharSequence getSenderAddress(Address sender) {
- return (sender != null) ? sender.getAddress() : "";
- }
-
private static void setChildVisibility(int visibility, View... children) {
for (View v : children) {
if (v != null) {
@@ -613,25 +597,23 @@
* Update the visibility of the many child views based on expanded/collapsed
* and draft/normal state.
*/
+ @SuppressLint("NewApi")
private void updateChildVisibility() {
// Too bad this can't be done with an XML state list...
if (mIsViewOnlyMode) {
- setMessageDetailsVisibility(VISIBLE);
- setChildVisibility(GONE, mSnapHeaderBottomBorder);
+ updateChildVisibilityForSnappyViews();
setChildVisibility(GONE, mReplyButton, mReplyAllButton, mForwardButton,
- mOverflowButton, mDraftIcon, mEditDraftButton, mStarView,
- mAttachmentIcon, mUpperDateView, mSnippetView);
- setChildVisibility(VISIBLE, mPhotoView, mSenderEmailView, mDateView);
+ mOverflowButton, mDraftIcon, mEditDraftButton,
+ mStarView, mUpperDateView, mSnippetView);
+ setChildVisibility(VISIBLE, mPhotoView, mDateView);
setChildMarginEnd(mTitleContainerView, 0);
} else if (isExpanded()) {
int normalVis, draftVis;
- final boolean isSnappy = isSnappy();
- setMessageDetailsVisibility((isSnappy) ? GONE : VISIBLE);
- setChildVisibility(isSnappy ? VISIBLE : GONE, mSnapHeaderBottomBorder);
+ updateChildVisibilityForSnappyViews();
if (mIsDraft) {
normalVis = GONE;
@@ -644,9 +626,13 @@
setReplyOrReplyAllVisible();
setChildVisibility(normalVis, mPhotoView, mForwardButton, mOverflowButton);
setChildVisibility(draftVis, mDraftIcon, mEditDraftButton);
- setChildVisibility(VISIBLE, mSenderEmailView, mDateView);
+ setChildVisibility(VISIBLE, mDateView);
setChildVisibility(GONE, mAttachmentIcon, mUpperDateView, mSnippetView);
+
setChildVisibility(mStarShown ? VISIBLE : GONE, mStarView);
+ if (mStarShown) {
+ setChildHeight(mStarHeight, mStarView);
+ }
setChildMarginEnd(mTitleContainerView, 0);
@@ -657,12 +643,15 @@
setChildVisibility(VISIBLE, mSnippetView, mUpperDateView);
setChildVisibility(GONE, mEditDraftButton, mReplyButton, mReplyAllButton,
- mForwardButton, mOverflowButton, mSenderEmailView, mDateView);
+ mForwardButton, mOverflowButton, mDateView);
- setChildVisibility(mMessage.hasAttachments ? VISIBLE : GONE,
- mAttachmentIcon);
+ setChildVisibility(mMessage.hasAttachments ? VISIBLE : GONE, mAttachmentIcon);
- setChildVisibility(mCollapsedStarVisible && mStarShown ? VISIBLE : GONE, mStarView);
+ final boolean showStar = mCollapsedStarVisible && mStarShown;
+ setChildVisibility(showStar ? VISIBLE : GONE, mStarView);
+ if (showStar) {
+ setChildHeight(mStarHeightCollapsed, mStarView);
+ }
setChildMarginEnd(mTitleContainerView, mTitleContainerCollapsedMarginEnd);
@@ -680,6 +669,29 @@
}
}
+ private static void setChildHeight(int height, View view) {
+ final ViewGroup.LayoutParams params = view.getLayoutParams();
+ params.height = height;
+ view.setLayoutParams(params);
+ }
+
+ /**
+ * Uses the snappy state of the view to appropriately
+ * enable/disable some of the details views.
+ * Specifically, if snappy, {@link #setMessageDetailsVisibleForSnapHeader()}
+ * is called instead of {@link #setMessageDetailsVisibility(int)}.
+ * Also controls visibility of the snap header border gradient.
+ */
+ private void updateChildVisibilityForSnappyViews() {
+ final boolean isSnappy = isSnappy();
+ if (isSnappy) {
+ setMessageDetailsVisibleForSnapHeader();
+ } else {
+ setMessageDetailsVisibility(VISIBLE);
+ }
+ setChildVisibility(isSnappy ? VISIBLE : GONE, mSnapHeaderBottomBorder);
+ }
+
/**
* If an overflow menu is present in this header's layout, set the
* visibility of "Reply" and "Reply All" actions based on a user preference.
@@ -719,55 +731,52 @@
*/
private static class RecipientListsBuilder {
private final Context mContext;
- private final String mMe;
+ private final String mMeEmailAddress;
private final String mMyName;
- private final SpannableStringBuilder mBuilder = new SpannableStringBuilder();
+ private final StringBuilder mBuilder = new StringBuilder();
private final CharSequence mComma;
private final Map<String, Address> mAddressCache;
private final VeiledAddressMatcher mMatcher;
+ private final BidiFormatter mBidiFormatter;
int mRecipientCount = 0;
boolean mFirst = true;
- public RecipientListsBuilder(Context context, String me, String myName,
- Map<String, Address> addressCache, VeiledAddressMatcher matcher) {
+ public RecipientListsBuilder(Context context, String meEmailAddress, String myName,
+ Map<String, Address> addressCache, VeiledAddressMatcher matcher,
+ BidiFormatter bidiFormatter) {
mContext = context;
- mMe = me;
+ mMeEmailAddress = meEmailAddress;
mMyName = myName;
mComma = mContext.getText(R.string.enumeration_comma);
mAddressCache = addressCache;
mMatcher = matcher;
+ mBidiFormatter = bidiFormatter;
}
- public void append(String[] recipients, int headingRes) {
- int addLimit = SUMMARY_MAX_RECIPIENTS - mRecipientCount;
- CharSequence recipientList = getSummaryTextForHeading(headingRes, recipients, addLimit);
- if (recipientList != null) {
- // duplicate TextUtils.join() logic to minimize temporary
- // allocations, and because we need to support spans
- if (mFirst) {
- mFirst = false;
- } else {
- mBuilder.append(RECIPIENT_HEADING_DELIMITER);
- }
- mBuilder.append(recipientList);
+ public void append(String[] recipients) {
+ final int addLimit = SUMMARY_MAX_RECIPIENTS - mRecipientCount;
+ final boolean hasRecipients = appendRecipients(recipients, addLimit);
+ if (hasRecipients) {
mRecipientCount += Math.min(addLimit, recipients.length);
}
}
- private CharSequence getSummaryTextForHeading(int headingStrRes, String[] rawAddrs,
+ /**
+ * Appends formatted recipients of the message to the recipient list,
+ * as long as there are recipients left to append and the maximum number
+ * of addresses limit has not been reached.
+ * @param rawAddrs The addresses to append.
+ * @param maxToCopy The maximum number of addresses to append.
+ * @return {@code true} if a recipient has been appended. {@code false}, otherwise.
+ */
+ private boolean appendRecipients(String[] rawAddrs,
int maxToCopy) {
if (rawAddrs == null || rawAddrs.length == 0 || maxToCopy == 0) {
- return null;
+ return false;
}
- SpannableStringBuilder ssb = new SpannableStringBuilder(
- mContext.getString(headingStrRes));
- ssb.setSpan(new StyleSpan(Typeface.NORMAL), 0, ssb.length(),
- Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
final int len = Math.min(maxToCopy, rawAddrs.length);
- boolean first = true;
for (int i = 0; i < len; i++) {
final Address email = Utils.getAddress(mAddressCache, rawAddrs[i]);
final String emailAddress = email.getAddress();
@@ -781,38 +790,53 @@
}
} else {
// Not a veiled address, show first part of email, or "me".
- name = mMe.equals(emailAddress) ? mMyName : email.getSimplifiedName();
+ name = mMeEmailAddress.equals(emailAddress) ?
+ mMyName : email.getSimplifiedName();
}
- // duplicate TextUtils.join() logic to minimize temporary
- // allocations, and because we need to support spans
- if (first) {
- first = false;
+ // duplicate TextUtils.join() logic to minimize temporary allocations
+ if (mFirst) {
+ mFirst = false;
} else {
- ssb.append(mComma);
+ mBuilder.append(mComma);
}
- ssb.append(name);
+ mBuilder.append(mBidiFormatter.unicodeWrap(name));
}
- return ssb;
+ return true;
}
public CharSequence build() {
- return mBuilder;
+ return mContext.getString(R.string.to_message_header, mBuilder);
}
}
- @VisibleForTesting
- static CharSequence getRecipientSummaryText(Context context, String me, String myName,
- String[] to, String[] cc, String[] bcc, Map<String, Address> addressCache,
- VeiledAddressMatcher matcher) {
+ private CharSequence getRecipientSummary() {
+ if (!mRecipientSummaryValid) {
+ if (mMessageHeaderItem == null) {
+ return "";
+ }
- final RecipientListsBuilder builder =
- new RecipientListsBuilder(context, me, myName, addressCache, matcher);
+ if (mMessageHeaderItem.recipientSummaryText == null) {
+ final Account account = getAccount();
+ final String meEmailAddress = (account != null) ? account.getEmailAddress() : "";
+ mMessageHeaderItem.recipientSummaryText =
+ getRecipientSummaryText(getContext(), meEmailAddress);
+ }
- builder.append(to, R.string.to_heading);
- builder.append(cc, R.string.cc_heading);
- builder.append(bcc, R.string.bcc_heading);
+ mRecipientSummaryValid = true;
+ }
+
+ return mMessageHeaderItem.recipientSummaryText;
+ }
+
+ private CharSequence getRecipientSummaryText(Context context, String meEmailAddress) {
+ final RecipientListsBuilder builder = new RecipientListsBuilder(context,
+ meEmailAddress, mMyName, mAddressCache, mVeiledMatcher, getBidiFormatter());
+
+ builder.append(mTo);
+ builder.append(mCc);
+ builder.append(mBcc);
return builder.build();
}
@@ -836,7 +860,9 @@
boolean photoSet = false;
final String email = mSender.getAddress();
final ContactInfo info = mContactInfoSource.getContactInfo(email);
- if (info != null) {
+ // Need to also check if we have a contactUri because we put empty
+ // results in the ContactInfoSource if no result was found but a query happened.
+ if (info != null && info.contactUri != null) {
mPhotoView.assignContactUri(info.contactUri);
if (info.photo != null) {
mPhotoView.setImageBitmap(info.photo);
@@ -928,10 +954,9 @@
m.findItem(R.id.report_rendering_problem).setVisible(reportRendering);
mPopup.show();
- } else if (id == R.id.details_collapsed_content
- || id == R.id.details_expanded_content) {
- toggleMessageDetails(v);
- } else if (id == R.id.upper_header) {
+ } else if (id == R.id.details_collapsed_content || id == R.id.details_expanded_content) {
+ toggleMessageDetails();
+ } else if (id == R.id.title_container) {
toggleExpanded();
} else if (id == R.id.show_pictures_text) {
handleShowImagePromptClick(v);
@@ -983,7 +1008,6 @@
// The snappy header will disappear; no reason to update text.
if (!isSnappy()) {
mSenderNameView.setText(getHeaderTitle());
- mSenderEmailView.setText(getHeaderSubtitle());
mDateView.setText(mMessageHeaderItem.getTimestampLong());
mSnippetView.setText(mSnippet);
}
@@ -1001,6 +1025,8 @@
mCallbacks.setMessageExpanded(mMessageHeaderItem, h,
borderHeights.topHeight, borderHeights.bottomHeight);
}
+
+ requestLayout();
}
/**
@@ -1063,23 +1089,23 @@
public int bottomHeight = -1;
}
- private boolean isValidPosition(int position, int size) {
+ private static boolean isValidPosition(int position, int size) {
return position >= 0 && position < size;
}
@Override
public void setSnappy() {
mIsSnappy = true;
- hideMessageDetails();
+ setMessageDetailsVisibleForSnapHeader();
}
private boolean isSnappy() {
return mIsSnappy;
}
- private void toggleMessageDetails(View visibleDetailsView) {
+ private void toggleMessageDetails() {
int heightBefore = measureHeight();
- final boolean detailsExpanded = (visibleDetailsView == mCollapsedDetailsView);
+ final boolean detailsExpanded = !mMessageHeaderItem.detailsExpanded;
Analytics.getInstance().sendEvent(
"message_header", "toggle_details", detailsExpanded ? "expand" : "collapse", 0);
setMessageDetailsExpanded(detailsExpanded);
@@ -1087,6 +1113,8 @@
if (mCallbacks != null) {
mCallbacks.setMessageDetailsExpanded(mMessageHeaderItem, detailsExpanded, heightBefore);
}
+
+ requestLayout();
}
private void setMessageDetailsExpanded(boolean expand) {
@@ -1103,14 +1131,28 @@
}
}
- public void setMessageDetailsVisibility(int vis) {
+ /**
+ * Sets the visibility of the various message details when in snap header mode.
+ * Hides all of the views except for part of the collapsed details.
+ * The collapsed details shows its recipient summary in snap header mode.
+ */
+ private void setMessageDetailsVisibleForSnapHeader() {
+ showCollapsedDetails(true /* isSnappy */);
+ hideExpandedDetails();
+ hideSpamWarning();
+ hideShowImagePrompt();
+ hideInvite();
+ mTitleContainerView.setOnCreateContextMenuListener(null);
+ }
+
+ private void setMessageDetailsVisibility(int vis) {
if (vis == GONE) {
hideCollapsedDetails();
hideExpandedDetails();
hideSpamWarning();
hideShowImagePrompt();
hideInvite();
- mUpperHeaderView.setOnCreateContextMenuListener(null);
+ mTitleContainerView.setOnCreateContextMenuListener(null);
} else {
setMessageDetailsExpanded(mMessageHeaderItem.detailsExpanded);
if (mMessage.spamWarningString == null) {
@@ -1132,14 +1174,10 @@
} else {
hideInvite();
}
- mUpperHeaderView.setOnCreateContextMenuListener(mEmailCopyMenu);
+ mTitleContainerView.setOnCreateContextMenuListener(mEmailCopyMenu);
}
}
- private void hideMessageDetails() {
- setMessageDetailsVisibility(GONE);
- }
-
private void hideCollapsedDetails() {
if (mCollapsedDetailsView != null) {
mCollapsedDetailsView.setVisibility(GONE);
@@ -1269,27 +1307,36 @@
/**
* Makes collapsed details visible. If necessary, will inflate details
* layout and render using saved-off state (senders, timestamp, etc).
+ * Note: this method assumes that the collapsed details is being shown for
+ * non-snap headers.
*/
private void showCollapsedDetails() {
- if (mCollapsedDetailsView == null) {
- mCollapsedDetailsView = (ViewGroup) mInflater.inflate(
- R.layout.conversation_message_details_header, this, false);
- mExtraContentView.addView(mCollapsedDetailsView, 0);
- mCollapsedDetailsView.setOnClickListener(this);
- }
- if (!mCollapsedDetailsValid) {
- if (mMessageHeaderItem.recipientSummaryText == null) {
- final Account account = getAccount();
- final String name = (account != null) ? account.getEmailAddress() : "";
- mMessageHeaderItem.recipientSummaryText = getRecipientSummaryText(getContext(),
- name, mMyName, mTo, mCc, mBcc, mAddressCache, mVeiledMatcher);
- }
- ((TextView) findViewById(R.id.recipients_summary))
- .setText(mMessageHeaderItem.recipientSummaryText);
+ showCollapsedDetails(false /* isSnapHeader */);
+ }
- mCollapsedDetailsValid = true;
+ /**
+ * Makes collapsed details visible. If necessary, will inflate details
+ * layout and render using saved-off state (senders, timestamp, etc).
+ * @param isSnapHeader If {@code true}, hides the "Details" text. If {@code false},
+ * shows the "Details" text and sets an onClickListener.
+ */
+ private void showCollapsedDetails(boolean isSnapHeader) {
+ if (mCollapsedDetailsView == null) {
+ mCollapsedDetailsView = mInflater.inflate(
+ R.layout.conversation_message_details_header, mActionsAndDetailsView, false);
+ mCollapsedRecipientSummary = (TextView)
+ mCollapsedDetailsView.findViewById(R.id.recipients_summary_collapsed);
+ mActionsAndDetailsView.addView(mCollapsedDetailsView);
+ if (!isSnapHeader) {
+ mCollapsedDetailsView.setOnClickListener(this);
+ }
}
+
+ mCollapsedRecipientSummary.setText(getRecipientSummary());
mCollapsedDetailsView.setVisibility(VISIBLE);
+ if (isSnapHeader) {
+ mCollapsedDetailsView.findViewById(R.id.details_text).setVisibility(GONE);
+ }
}
/**
@@ -1301,18 +1348,22 @@
// lazily create expanded details view
final boolean expandedViewCreated = ensureExpandedDetailsView();
if (expandedViewCreated) {
- mExtraContentView.addView(mExpandedDetailsView, 0);
+ mActionsAndDetailsView.addView(mExpandedDetailsView);
+ mExpandedRecipientSummary =
+ (TextView) mExpandedDetailsView.findViewById(R.id.recipients_summary_expanded);
+ mExpandedDetailsView.setOnClickListener(this);
}
+
+ mExpandedRecipientSummary.setText(getRecipientSummary());
mExpandedDetailsView.setVisibility(VISIBLE);
}
private boolean ensureExpandedDetailsView() {
boolean viewCreated = false;
if (mExpandedDetailsView == null) {
- View v = inflateExpandedDetails(mInflater);
- v.setOnClickListener(this);
-
- mExpandedDetailsView = (ViewGroup) v;
+ mExpandedDetailsView = mInflater.inflate(
+ R.layout.conversation_message_details_header_expanded,
+ mActionsAndDetailsView, false);
viewCreated = true;
}
if (!mExpandedDetailsValid) {
@@ -1326,11 +1377,6 @@
return viewCreated;
}
- public static View inflateExpandedDetails(LayoutInflater inflater) {
- return inflater.inflate(R.layout.conversation_message_details_header_expanded, null,
- false);
- }
-
public static void renderExpandedDetails(Resources res, View detailsView,
String viaDomain, Map<String, Address> addressCache, Account account,
VeiledAddressMatcher veiledMatcher, String[] from, String[] replyTo,
diff --git a/src/com/android/mail/browse/MessageScrollView.java b/src/com/android/mail/browse/MessageScrollView.java
index d3182ae..91e7ca2 100644
--- a/src/com/android/mail/browse/MessageScrollView.java
+++ b/src/com/android/mail/browse/MessageScrollView.java
@@ -258,7 +258,7 @@
protected void onScrollChanged(int l, int t, int oldl, int oldt) {
super.onScrollChanged(l, t, oldl, oldt);
for (ScrollListener listener : mScrollListeners) {
- listener.onNotifierScroll(l, t);
+ listener.onNotifierScroll(t);
}
}
diff --git a/src/com/android/mail/browse/ScrollIndicatorsView.java b/src/com/android/mail/browse/ScrollIndicatorsView.java
index 4656644..3a3055b 100644
--- a/src/com/android/mail/browse/ScrollIndicatorsView.java
+++ b/src/com/android/mail/browse/ScrollIndicatorsView.java
@@ -77,7 +77,7 @@
}
@Override
- public void onNotifierScroll(int left, int top) {
+ public void onNotifierScroll(int top) {
awakenScrollBars();
}
}
diff --git a/src/com/android/mail/browse/ScrollNotifier.java b/src/com/android/mail/browse/ScrollNotifier.java
index 0d0b60e..f73b9d0 100644
--- a/src/com/android/mail/browse/ScrollNotifier.java
+++ b/src/com/android/mail/browse/ScrollNotifier.java
@@ -19,7 +19,7 @@
public interface ScrollNotifier {
public interface ScrollListener {
- void onNotifierScroll(int x, int y);
+ void onNotifierScroll(int y);
}
void addScrollListener(ScrollListener l);
diff --git a/src/com/android/mail/compose/AttachmentComposeView.java b/src/com/android/mail/compose/AttachmentComposeView.java
index 2c4198c..32a247f 100644
--- a/src/com/android/mail/compose/AttachmentComposeView.java
+++ b/src/com/android/mail/compose/AttachmentComposeView.java
@@ -54,7 +54,7 @@
LayoutInflater factory = LayoutInflater.from(getContext());
- factory.inflate(R.layout.attachment, this);
+ factory.inflate(R.layout.compose_attachment_bar, this);
populateAttachmentData(c);
}
diff --git a/src/com/android/mail/providers/Attachment.java b/src/com/android/mail/providers/Attachment.java
index 569d1ed..b8e86ed 100644
--- a/src/com/android/mail/providers/Attachment.java
+++ b/src/com/android/mail/providers/Attachment.java
@@ -233,7 +233,8 @@
/**
* Constructor for use when creating attachments in eml files.
*/
- public Attachment(Context context, Part part, Uri emlFileUri, String messageId, String partId) {
+ public Attachment(Context context, Part part, Uri emlFileUri, String messageId, String cid,
+ boolean inline) {
try {
// Transfer fields from mime format to provider format
final String contentTypeHeader = MimeUtility.unfoldAndDecode(part.getContentType());
@@ -245,7 +246,7 @@
}
contentType = MimeType.inferMimeType(name, part.getMimeType());
- uri = EmlAttachmentProvider.getAttachmentUri(emlFileUri, messageId, partId);
+ uri = EmlAttachmentProvider.getAttachmentUri(emlFileUri, messageId, cid);
contentUri = uri;
thumbnailUri = uri;
previewIntentUri = null;
@@ -253,7 +254,8 @@
providerData = null;
supportsDownloadAgain = false;
destination = AttachmentDestination.CACHE;
- type = AttachmentType.STANDARD;
+ type = inline ? AttachmentType.INLINE_CURRENT_MESSAGE : AttachmentType.STANDARD;
+ partId = cid;
flags = 0;
// insert attachment into content provider so that we can open the file
@@ -300,6 +302,7 @@
supportsDownloadAgain = values.getAsBoolean(AttachmentColumns.SUPPORTS_DOWNLOAD_AGAIN);
type = values.getAsInteger(AttachmentColumns.TYPE);
flags = values.getAsInteger(AttachmentColumns.FLAGS);
+ partId = values.getAsString(AttachmentColumns.CONTENT_ID);
}
/**
@@ -324,6 +327,7 @@
values.put(AttachmentColumns.SUPPORTS_DOWNLOAD_AGAIN, supportsDownloadAgain);
values.put(AttachmentColumns.TYPE, type);
values.put(AttachmentColumns.FLAGS, flags);
+ values.put(AttachmentColumns.CONTENT_ID, partId);
return values;
}
diff --git a/src/com/android/mail/providers/EmlAttachmentProvider.java b/src/com/android/mail/providers/EmlAttachmentProvider.java
index 901fec3..f1c360b 100644
--- a/src/com/android/mail/providers/EmlAttachmentProvider.java
+++ b/src/com/android/mail/providers/EmlAttachmentProvider.java
@@ -19,6 +19,7 @@
import android.app.DownloadManager;
import android.content.ContentProvider;
+import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
@@ -29,6 +30,7 @@
import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.os.SystemClock;
+import android.text.TextUtils;
import com.android.ex.photo.provider.PhotoContract;
import com.android.mail.R;
@@ -66,6 +68,7 @@
private static final int ATTACHMENT_LIST = 0;
private static final int ATTACHMENT = 1;
+ private static final int ATTACHMENT_BY_CID = 2;
/**
* The buffer size used to copy data from cache to sd card.
@@ -98,8 +101,9 @@
if (!sUrisAddedToMatcher) {
sUrisAddedToMatcher = true;
- sUriMatcher.addURI(authority, "*/*", ATTACHMENT_LIST);
- sUriMatcher.addURI(authority, "*/*/#", ATTACHMENT);
+ sUriMatcher.addURI(authority, "attachments/*/*", ATTACHMENT_LIST);
+ sUriMatcher.addURI(authority, "attachment/*/*/#", ATTACHMENT);
+ sUriMatcher.addURI(authority, "attachmentByCid/*/*/*", ATTACHMENT_BY_CID);
}
mDownloadManager =
@@ -116,9 +120,10 @@
final int match = sUriMatcher.match(uri);
// ignore other projections
final MatrixCursor cursor = new MatrixCursor(UIProvider.ATTACHMENT_PROJECTION);
+ final ContentResolver cr = getContext().getContentResolver();
switch (match) {
- case ATTACHMENT_LIST:
+ case ATTACHMENT_LIST: {
final List<String> contentTypeQueryParameters =
uri.getQueryParameters(PhotoContract.ContentTypeParameters.CONTENT_TYPE);
uri = uri.buildUpon().clearQuery().build();
@@ -126,13 +131,35 @@
for (final Uri attachmentUri : attachmentUris) {
addRow(cursor, attachmentUri, contentTypeQueryParameters);
}
- cursor.setNotificationUri(getContext().getContentResolver(), uri);
+ cursor.setNotificationUri(cr, uri);
break;
- case ATTACHMENT:
+ }
+ case ATTACHMENT: {
addRow(cursor, mUriAttachmentMap.get(uri));
- cursor.setNotificationUri(
- getContext().getContentResolver(), getListUriFromAttachmentUri(uri));
+ cursor.setNotificationUri(cr, getListUriFromAttachmentUri(uri));
break;
+ }
+ case ATTACHMENT_BY_CID: {
+ // form the attachment lists uri by clipping off the cid from the given uri
+ final Uri attachmentsListUri = getListUriFromAttachmentUri(uri);
+ final String cid = uri.getPathSegments().get(3);
+
+ // find all uris for the parent message
+ final List<Uri> attachmentUris = mUriListMap.get(attachmentsListUri);
+
+ if (attachmentUris != null) {
+ // find the attachment that contains the given cid
+ for (Uri attachmentsUri : attachmentUris) {
+ final Attachment attachment = mUriAttachmentMap.get(attachmentsUri);
+ if (TextUtils.equals(cid, attachment.partId)) {
+ addRow(cursor, attachment);
+ cursor.setNotificationUri(cr, attachmentsListUri);
+ break;
+ }
+ }
+ }
+ break;
+ }
default:
break;
}
@@ -244,7 +271,8 @@
.add(attachment.providerData) // providerData
.add(attachment.supportsDownloadAgain() ? 1 : 0) // supportsDownloadAgain
.add(attachment.type) // type
- .add(attachment.flags); // flags
+ .add(attachment.flags) // flags
+ .add(attachment.partId); // partId (same as RFC822 cid)
}
/**
@@ -389,21 +417,38 @@
}
/**
- * Returns an attachment list uri for an eml file at the given uri
- * with the given message id.
+ * Returns an attachment list uri for the specific attachment uri passed.
*/
- public static Uri getAttachmentsListUri(Uri emlFileUri, String messageId) {
- return BASE_URI.buildUpon().appendPath(Integer.toString(emlFileUri.hashCode()))
- .appendPath(messageId).build();
+ private static Uri getListUriFromAttachmentUri(Uri uri) {
+ final List<String> segments = uri.getPathSegments();
+ return BASE_URI.buildUpon()
+ .appendPath("attachments")
+ .appendPath(segments.get(1))
+ .appendPath(segments.get(2))
+ .build();
}
/**
- * Returns an attachment list uri for the specific attachment uri passed.
+ * Returns an attachment list uri for an eml file at the given uri with the given message id.
*/
- public static Uri getListUriFromAttachmentUri(Uri uri) {
- final List<String> segments = uri.getPathSegments();
+ public static Uri getAttachmentsListUri(Uri emlFileUri, String messageId) {
return BASE_URI.buildUpon()
- .appendPath(segments.get(0)).appendPath(segments.get(1)).build();
+ .appendPath("attachments")
+ .appendPath(Integer.toString(emlFileUri.hashCode()))
+ .appendPath(messageId)
+ .build();
+ }
+
+ /**
+ * Returns an attachment uri for an eml file at the given uri with the given message id.
+ * The consumer of this uri must append a specific CID to it to complete the uri.
+ */
+ public static Uri getAttachmentByCidUri(Uri emlFileUri, String messageId) {
+ return BASE_URI.buildUpon()
+ .appendPath("attachmentByCid")
+ .appendPath(Integer.toString(emlFileUri.hashCode()))
+ .appendPath(messageId)
+ .build();
}
/**
@@ -411,8 +456,12 @@
* the given message id and part id.
*/
public static Uri getAttachmentUri(Uri emlFileUri, String messageId, String partId) {
- return BASE_URI.buildUpon().appendPath(Integer.toString(emlFileUri.hashCode()))
- .appendPath(messageId).appendPath(partId).build();
+ return BASE_URI.buildUpon()
+ .appendPath("attachment")
+ .appendPath(Integer.toString(emlFileUri.hashCode()))
+ .appendPath(messageId)
+ .appendPath(partId)
+ .build();
}
/**
@@ -441,7 +490,7 @@
* Returns the root directory for the attachments for the specific uri.
*/
private String getCacheFileDirectory(Uri uri) {
- return getCacheDir() + "/" + Uri.encode(uri.getPathSegments().get(0));
+ return getCacheDir() + "/" + Uri.encode(uri.getPathSegments().get(1));
}
/**
diff --git a/src/com/android/mail/providers/Message.java b/src/com/android/mail/providers/Message.java
index 2bd9d02..7fd3b41 100644
--- a/src/com/android/mail/providers/Message.java
+++ b/src/com/android/mail/providers/Message.java
@@ -31,9 +31,10 @@
import android.text.util.Rfc822Token;
import android.text.util.Rfc822Tokenizer;
-import com.android.emailcommon.mail.Address;
+import com.android.emailcommon.internet.MimeHeader;
import com.android.emailcommon.internet.MimeMessage;
import com.android.emailcommon.internet.MimeUtility;
+import com.android.emailcommon.mail.Address;
import com.android.emailcommon.mail.MessagingException;
import com.android.emailcommon.mail.Part;
import com.android.emailcommon.utility.ConversionUtilities;
@@ -60,6 +61,9 @@
private static Pattern INLINE_IMAGE_PATTERN = Pattern.compile("<img\\s+[^>]*src=",
Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+ // regex that matches content id surrounded by "<>" optionally.
+ private static final Pattern REMOVE_OPTIONAL_BRACKETS = Pattern.compile("^<?([^>]+)>?$");
+
/**
* @see BaseColumns#_ID
*/
@@ -141,6 +145,10 @@
*/
public Uri attachmentListUri;
/**
+ * @see UIProvider.MessageColumns#ATTACHMENT_BY_CID_URI
+ */
+ public Uri attachmentByCidUri;
+ /**
* @see UIProvider.MessageColumns#MESSAGE_FLAGS
*/
public long messageFlags;
@@ -379,6 +387,10 @@
.getString(UIProvider.MESSAGE_ATTACHMENT_LIST_URI_COLUMN);
attachmentListUri = hasAttachments && !TextUtils.isEmpty(attachmentsUri) ? Uri
.parse(attachmentsUri) : null;
+ final String attachmentsByCidUri = cursor
+ .getString(UIProvider.MESSAGE_ATTACHMENT_BY_CID_URI_COLUMN);
+ attachmentByCidUri = hasAttachments && !TextUtils.isEmpty(attachmentsByCidUri) ?
+ Uri.parse(attachmentsByCidUri) : null;
messageFlags = cursor.getLong(UIProvider.MESSAGE_FLAGS_COLUMN);
alwaysShowImages = cursor.getInt(UIProvider.MESSAGE_ALWAYS_SHOW_IMAGES_COLUMN) != 0;
read = cursor.getInt(UIProvider.MESSAGE_READ_COLUMN) != 0;
@@ -442,8 +454,7 @@
ArrayList<Part> attachments = new ArrayList<Part>();
MimeUtility.collectParts(mimeMessage, viewables, attachments);
- ConversionUtilities.BodyFieldData data =
- ConversionUtilities.parseBodyFields(viewables);
+ ConversionUtilities.BodyFieldData data = ConversionUtilities.parseBodyFields(viewables);
snippet = data.snippet;
bodyText = data.textContent;
@@ -452,17 +463,31 @@
// populate mAttachments
mAttachments = Lists.newArrayList();
- int partId = 0;
final String messageId = mimeMessage.getMessageId();
+
+ int partId = 0;
for (final Part attachmentPart : attachments) {
mAttachments.add(new Attachment(context, attachmentPart,
- emlFileUri, messageId, Integer.toString(partId++)));
+ emlFileUri, messageId, Integer.toString(partId++), false /* inline */));
+ }
+
+ // instantiating an Attachment for each viewable will cause it to be registered within the
+ // EmlAttachmentProvider for later access when displaying inline attachments
+ for (final Part viewablePart : viewables) {
+ final String[] cids = viewablePart.getHeader(MimeHeader.HEADER_CONTENT_ID);
+ if (cids != null && cids.length == 1) {
+ final String cid = REMOVE_OPTIONAL_BRACKETS.matcher(cids[0]).replaceAll("$1");
+ mAttachments.add(new Attachment(context, viewablePart, emlFileUri, messageId, cid,
+ true /* inline */));
+ }
}
hasAttachments = !mAttachments.isEmpty();
- attachmentListUri = hasAttachments ?
+ attachmentListUri = hasAttachments ?
EmlAttachmentProvider.getAttachmentsListUri(emlFileUri, messageId) : null;
+
+ attachmentByCidUri = EmlAttachmentProvider.getAttachmentByCidUri(emlFileUri, messageId);
}
public boolean isFlaggedReplied() {
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 9215fba..154166d 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -1545,6 +1545,7 @@
MessageColumns.APPEND_REF_MESSAGE_CONTENT,
MessageColumns.HAS_ATTACHMENTS,
MessageColumns.ATTACHMENT_LIST_URI,
+ MessageColumns.ATTACHMENT_BY_CID_URI,
MessageColumns.MESSAGE_FLAGS,
MessageColumns.ALWAYS_SHOW_IMAGES,
MessageColumns.READ,
@@ -1592,23 +1593,24 @@
public static final int MESSAGE_APPEND_REF_MESSAGE_CONTENT_COLUMN = 17;
public static final int MESSAGE_HAS_ATTACHMENTS_COLUMN = 18;
public static final int MESSAGE_ATTACHMENT_LIST_URI_COLUMN = 19;
- public static final int MESSAGE_FLAGS_COLUMN = 20;
- public static final int MESSAGE_ALWAYS_SHOW_IMAGES_COLUMN = 21;
- public static final int MESSAGE_READ_COLUMN = 22;
- public static final int MESSAGE_SEEN_COLUMN = 23;
- public static final int MESSAGE_STARRED_COLUMN = 24;
- public static final int QUOTED_TEXT_OFFSET_COLUMN = 25;
- public static final int MESSAGE_ATTACHMENTS_COLUMN = 26;
- public static final int MESSAGE_CUSTOM_FROM_ADDRESS_COLUMN = 27;
- public static final int MESSAGE_ACCOUNT_URI_COLUMN = 28;
- public static final int MESSAGE_EVENT_INTENT_COLUMN = 29;
- public static final int MESSAGE_SPAM_WARNING_STRING_ID_COLUMN = 30;
- public static final int MESSAGE_SPAM_WARNING_LEVEL_COLUMN = 31;
- public static final int MESSAGE_SPAM_WARNING_LINK_TYPE_COLUMN = 32;
- public static final int MESSAGE_VIA_DOMAIN_COLUMN = 33;
- public static final int MESSAGE_IS_SENDING_COLUMN = 34;
- public static final int MESSAGE_CLIPPED_COLUMN = 35;
- public static final int MESSAGE_PERMALINK_COLUMN = 36;
+ public static final int MESSAGE_ATTACHMENT_BY_CID_URI_COLUMN = 20;
+ public static final int MESSAGE_FLAGS_COLUMN = 21;
+ public static final int MESSAGE_ALWAYS_SHOW_IMAGES_COLUMN = 22;
+ public static final int MESSAGE_READ_COLUMN = 23;
+ public static final int MESSAGE_SEEN_COLUMN = 24;
+ public static final int MESSAGE_STARRED_COLUMN = 25;
+ public static final int QUOTED_TEXT_OFFSET_COLUMN = 26;
+ public static final int MESSAGE_ATTACHMENTS_COLUMN = 27;
+ public static final int MESSAGE_CUSTOM_FROM_ADDRESS_COLUMN = 28;
+ public static final int MESSAGE_ACCOUNT_URI_COLUMN = 29;
+ public static final int MESSAGE_EVENT_INTENT_COLUMN = 30;
+ public static final int MESSAGE_SPAM_WARNING_STRING_ID_COLUMN = 31;
+ public static final int MESSAGE_SPAM_WARNING_LEVEL_COLUMN = 32;
+ public static final int MESSAGE_SPAM_WARNING_LINK_TYPE_COLUMN = 33;
+ public static final int MESSAGE_VIA_DOMAIN_COLUMN = 34;
+ public static final int MESSAGE_IS_SENDING_COLUMN = 35;
+ public static final int MESSAGE_CLIPPED_COLUMN = 36;
+ public static final int MESSAGE_PERMALINK_COLUMN = 37;
public static final class CursorStatus {
// The cursor is actively loading more data
@@ -1749,6 +1751,11 @@
*/
public static final String ATTACHMENT_LIST_URI = "attachmentListUri";
/**
+ * This string column contains the content provider URI for the details of an attachment
+ * associated with this message. (CID to be appended at the time the URI is used)
+ */
+ public static final String ATTACHMENT_BY_CID_URI = "attachmentByCidUri";
+ /**
* This long column is a bit field of flags defined in {@link MessageFlags}.
*/
public static final String MESSAGE_FLAGS = "messageFlags";
@@ -1887,7 +1894,8 @@
AttachmentColumns.PROVIDER_DATA,
AttachmentColumns.SUPPORTS_DOWNLOAD_AGAIN,
AttachmentColumns.TYPE,
- AttachmentColumns.FLAGS
+ AttachmentColumns.FLAGS,
+ AttachmentColumns.CONTENT_ID
};
public static final int ATTACHMENT_NAME_COLUMN = 0;
public static final int ATTACHMENT_SIZE_COLUMN = 1;
@@ -1902,6 +1910,7 @@
public static final int ATTACHMENT_SUPPORTS_DOWNLOAD_AGAIN_COLUMN = 10;
public static final int ATTACHMENT_TYPE_COLUMN = 11;
public static final int ATTACHMENT_FLAGS_COLUMN = 12;
+ public static final int ATTACHMENT_CONTENT_ID_COLUMN = 13;
/** Separates attachment info parts in strings in the database. */
public static final String ATTACHMENT_INFO_SEPARATOR = "\n"; // use to join
@@ -2082,6 +2091,12 @@
*/
public static final String FLAGS = "flags";
+ /**
+ * This column holds the RFC 2392 content id of the email part for this attachment, if
+ * possible; otherwise it holds an identifier unique to the parent message.
+ */
+ public static final String CONTENT_ID = "contentId";
+
private AttachmentColumns() {}
}
diff --git a/src/com/android/mail/ui/AbstractConversationWebViewClient.java b/src/com/android/mail/ui/AbstractConversationWebViewClient.java
index 8c1bd95..2a52d36 100644
--- a/src/com/android/mail/ui/AbstractConversationWebViewClient.java
+++ b/src/com/android/mail/ui/AbstractConversationWebViewClient.java
@@ -19,22 +19,31 @@
import android.app.Activity;
import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.database.Cursor;
import android.net.Uri;
+import android.os.ParcelFileDescriptor;
import android.provider.Browser;
+import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import android.webkit.WebViewClient;
+import com.android.mail.browse.ConversationMessage;
import com.android.mail.providers.Account;
+import com.android.mail.providers.Attachment;
import com.android.mail.providers.UIProvider;
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
import com.android.mail.utils.Utils;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
import java.util.List;
/**
@@ -64,6 +73,66 @@
return mActivity;
}
+ /**
+ * Translates Content ID urls (CID urls) into provider queries for the associated attachment.
+ * With the attachment in hand, it's trivial to open a stream to the file containing the content
+ * of the attachment.
+ *
+ * @param uri the raw URI from the HTML document in the Webview
+ * @param message the message containing the HTML that is being rendered
+ * @return a response if a stream to the attachment file can be created from the CID URL;
+ * <tt>null</tt> if it cannot for any reason
+ */
+ protected final WebResourceResponse loadCIDUri(Uri uri, ConversationMessage message) {
+ // if the url is not a CID url, we do nothing
+ if (!"cid".equals(uri.getScheme())) {
+ return null;
+ }
+
+ // cid urls can be translated to content urls
+ final String cid = uri.getSchemeSpecificPart();
+ if (cid == null) {
+ return null;
+ }
+
+ if (message.attachmentByCidUri == null) {
+ return null;
+ }
+
+ final Uri queryUri = Uri.withAppendedPath(message.attachmentByCidUri, cid);
+ if (queryUri == null) {
+ return null;
+ }
+
+ // query for the attachment using its cid
+ final ContentResolver cr = getActivity().getContentResolver();
+ final Cursor c = cr.query(queryUri, UIProvider.ATTACHMENT_PROJECTION, null, null, null);
+ if (c == null) {
+ return null;
+ }
+
+ // create the attachment from the cursor, if one was found
+ final Attachment target;
+ try {
+ if (!c.moveToFirst()) {
+ return null;
+ }
+ target = new Attachment(c);
+ } finally {
+ c.close();
+ }
+
+ // try to return a response that includes a stream to the attachment data
+ try {
+ final ParcelFileDescriptor fd = cr.openFileDescriptor(target.contentUri, "r");
+ final InputStream stream = new FileInputStream(fd.getFileDescriptor());
+ return new WebResourceResponse(target.getContentType(), null, stream);
+ } catch (FileNotFoundException e) {
+ // if no attachment file was found return null to let webview handle it
+ return null;
+ }
+ }
+
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
if (mActivity == null) {
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 7d6b812..03f87bf 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -28,7 +28,6 @@
import android.os.Handler;
import android.os.Parcelable;
import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener;
-import android.text.format.DateUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -98,8 +97,6 @@
*/
private static int TIMESTAMP_UPDATE_INTERVAL = 0;
- private static long NO_NEW_MESSAGE_DURATION = 1 * DateUtils.SECOND_IN_MILLIS;
-
private ControllableActivity mActivity;
// Control state.
@@ -159,8 +156,6 @@
/** Duration, in milliseconds, of the CAB mode (peek icon) animation. */
private static long sSelectionModeAnimationDuration = -1;
- /** The time at which we last exited CAB mode. */
- private long mSelectionModeExitedTimestamp = -1;
// Let's ensure that we are only showing one out of the three views at once
private void showListView() {
@@ -1024,6 +1019,7 @@
mConversationCursorHash = newCursorHash;
updateAnalyticsData(newCursor);
+ updateSearchResultHeader(newCursor.getCount());
if (newCursor != null && newCursor.getCount() > 0) {
newCursor.markContentsSeen();
@@ -1088,7 +1084,6 @@
@Override
public void onSetEmpty() {
- mSelectionModeExitedTimestamp = System.currentTimeMillis();
mSwipeRefreshWidget.setEnabled(true);
}
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 0972dd1..bd027f6 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -1041,6 +1041,11 @@
return (domId == null) ? null : mMessageTransforms.get(domId);
}
+ @Override
+ public boolean isSecure() {
+ return false;
+ }
+
// END message header callbacks
@Override
diff --git a/src/com/android/mail/ui/HierarchicalFolderSelectorAdapter.java b/src/com/android/mail/ui/HierarchicalFolderSelectorAdapter.java
index bd21c79..49fd81a 100644
--- a/src/com/android/mail/ui/HierarchicalFolderSelectorAdapter.java
+++ b/src/com/android/mail/ui/HierarchicalFolderSelectorAdapter.java
@@ -38,6 +38,7 @@
private Context mContext;
+ @VisibleForTesting
public HierarchicalFolderSelectorAdapter(Context context, Cursor folders,
Set<String> initiallySelected, int layout, String header) {
super(context, folders, initiallySelected, layout, header);
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 0801bee..2d16f1b 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -25,6 +25,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.widget.DrawerLayout;
+import android.view.Gravity;
import android.widget.ListView;
import com.android.mail.ConversationListContext;
@@ -129,6 +130,8 @@
public boolean onCreate(Bundle savedInstanceState) {
mActivity.setContentView(R.layout.one_pane_activity);
mDrawerContainer = (DrawerLayout) mActivity.findViewById(R.id.drawer_container);
+ mDrawerContainer.setDrawerTitle(Gravity.START,
+ mActivity.getActivityContext().getString(R.string.drawer_title));
final String drawerPulloutTag = mActivity.getString(R.string.drawer_pullout_tag);
mDrawerPullout = mDrawerContainer.findViewWithTag(drawerPulloutTag);
mDrawerPullout.setBackgroundResource(R.color.list_background_color);
diff --git a/src/com/android/mail/ui/ScrollNotifyingListView.java b/src/com/android/mail/ui/ScrollNotifyingListView.java
index 467e498..d4e65d1 100644
--- a/src/com/android/mail/ui/ScrollNotifyingListView.java
+++ b/src/com/android/mail/ui/ScrollNotifyingListView.java
@@ -91,7 +91,7 @@
@SuppressWarnings("unused")
public void onScrollChanged(int l, int t, int oldl, int oldt) {
for (ScrollListener sl : mObservers) {
- sl.onNotifierScroll(l, t);
+ sl.onNotifierScroll(t);
}
}
diff --git a/src/com/android/mail/ui/SecureConversationViewController.java b/src/com/android/mail/ui/SecureConversationViewController.java
index 180c935..1fed820 100644
--- a/src/com/android/mail/ui/SecureConversationViewController.java
+++ b/src/com/android/mail/ui/SecureConversationViewController.java
@@ -99,7 +99,7 @@
final int color = rootView.getResources().getColor(
R.color.message_header_background_color);
mMessageHeaderView.setBackgroundColor(color);
- mSnapHeaderView.setBackgroundColor(color);
+ mSnapHeaderView.findViewById(R.id.upper_header).setBackgroundColor(color);
mMessageFooterView.setBackgroundColor(color);
((BorderView) rootView.findViewById(R.id.top_border)).disableCardBottomBorder();
@@ -177,7 +177,7 @@
}
@Override
- public void onNotifierScroll(final int x, final int y) {
+ public void onNotifierScroll(final int y) {
// We need to decide whether or not to display the snap header.
// Get the location of the moveable message header inside the scroll view.
Rect rect = new Rect();
@@ -293,6 +293,11 @@
}
@Override
+ public boolean isSecure() {
+ return true;
+ }
+
+ @Override
public FragmentManager getFragmentManager() {
return mCallbacks.getFragment().getFragmentManager();
}
diff --git a/src/com/android/mail/ui/SecureConversationViewFragment.java b/src/com/android/mail/ui/SecureConversationViewFragment.java
index d96ff67..b9682b6 100644
--- a/src/com/android/mail/ui/SecureConversationViewFragment.java
+++ b/src/com/android/mail/ui/SecureConversationViewFragment.java
@@ -24,6 +24,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import com.android.emailcommon.mail.Address;
@@ -57,6 +58,19 @@
}
@Override
+ public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
+ // try to load the url assuming it is a cid url
+ final Uri uri = Uri.parse(url);
+ final WebResourceResponse response = loadCIDUri(uri, mViewController.getMessage());
+ if (response != null) {
+ return response;
+ }
+
+ // otherwise, attempt the default handling
+ return super.shouldInterceptRequest(view, url);
+ }
+
+ @Override
public void onPageFinished(WebView view, String url) {
// Ignore unsafe calls made after a fragment is detached from an activity.
// This method needs to, for example, get at the loader manager, which needs
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 18ad970..ef4dfa3 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -121,6 +121,8 @@
public boolean onCreate(Bundle savedState) {
mActivity.setContentView(R.layout.two_pane_activity);
mDrawerContainer = (DrawerLayout) mActivity.findViewById(R.id.drawer_container);
+ mDrawerContainer.setDrawerTitle(Gravity.START,
+ mActivity.getActivityContext().getString(R.string.drawer_title));
mDrawerPullout = mDrawerContainer.findViewById(R.id.content_pane);
mLayout = (TwoPaneLayout) mActivity.findViewById(R.id.two_pane_activity);
if (mLayout == null) {
diff --git a/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java b/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
index 29cd006..a2efbe7 100644
--- a/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
+++ b/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
@@ -17,16 +17,12 @@
package com.android.mail.widget;
import android.content.Context;
-import android.content.res.Resources;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
import android.graphics.Typeface;
import android.support.v4.text.BidiFormatter;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
-import android.text.style.AbsoluteSizeSpan;
-import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan;
import android.view.View;
import android.widget.RemoteViews;
@@ -38,17 +34,6 @@
import com.android.mail.utils.FolderUri;
public class WidgetConversationListItemViewBuilder {
- // Static font sizes
- private static int DATE_FONT_SIZE;
- private static int SUBJECT_FONT_SIZE;
-
- // Static colors
- private static int SUBJECT_TEXT_COLOR_READ;
- private static int SUBJECT_TEXT_COLOR_UNREAD;
- private static int DATE_TEXT_COLOR;
-
- // Static bitmap
- private static Bitmap ATTACHMENT;
private final Context mContext;
@@ -117,33 +102,6 @@
*/
public WidgetConversationListItemViewBuilder(Context context) {
mContext = context;
- Resources res = context.getResources();
-
- // Initialize font sizes
- DATE_FONT_SIZE = res.getDimensionPixelSize(R.dimen.widget_date_font_size);
- SUBJECT_FONT_SIZE = res.getDimensionPixelSize(R.dimen.widget_subject_font_size);
-
- // Initialize colors
- SUBJECT_TEXT_COLOR_READ = res.getColor(R.color.subject_text_color_read);
- SUBJECT_TEXT_COLOR_UNREAD = res.getColor(R.color.subject_text_color_unread);
- DATE_TEXT_COLOR = res.getColor(R.color.date_text_color);
-
- // Initialize Bitmap
- ATTACHMENT = BitmapFactory.decodeResource(res, R.drawable.ic_attachment_holo_light);
- }
-
- /*
- * Add size, color and style to a given text
- */
- private static CharSequence addStyle(CharSequence text, int size, int color) {
- SpannableStringBuilder builder = new SpannableStringBuilder(text);
- builder.setSpan(
- new AbsoluteSizeSpan(size), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- if (color != 0) {
- builder.setSpan(new ForegroundColorSpan(color), 0, text.length(),
- Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- }
- return builder;
}
/*
@@ -157,11 +115,7 @@
final String snippet = conversation.getSnippet();
final boolean hasAttachments = conversation.hasAttachments;
- // Add style to date
- final CharSequence styledDate = addStyle(date, DATE_FONT_SIZE, DATE_TEXT_COLOR);
-
// Add style to subject
- final int subjectColor = isUnread ? SUBJECT_TEXT_COLOR_UNREAD : SUBJECT_TEXT_COLOR_READ;
final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
final String filteredSubject =
TextUtils.isEmpty(subject) ? "" : bidiFormatter.unicodeWrap(subject);
@@ -173,28 +127,15 @@
subjectAndSnippet.setSpan(new StyleSpan(Typeface.BOLD), 0, filteredSubject.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
}
- subjectAndSnippet.setSpan(new ForegroundColorSpan(subjectColor), 0, subjectAndSnippet
- .length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- final CharSequence styledSubject = addStyle(subjectAndSnippet, SUBJECT_FONT_SIZE, 0);
-
- // Paper clip for attachment
- Bitmap paperclipBitmap = null;
- if (hasAttachments) {
- paperclipBitmap = ATTACHMENT;
- }
// Inflate and fill out the remote view
final RemoteViews remoteViews = new RemoteViews(
mContext.getPackageName(), R.layout.widget_conversation_list_item);
remoteViews.setTextViewText(R.id.widget_senders, senders);
- remoteViews.setTextViewText(R.id.widget_date, styledDate);
- remoteViews.setTextViewText(R.id.widget_subject, styledSubject);
- if (paperclipBitmap != null) {
- remoteViews.setViewVisibility(R.id.widget_attachment, View.VISIBLE);
- remoteViews.setImageViewBitmap(R.id.widget_attachment, paperclipBitmap);
- } else {
- remoteViews.setViewVisibility(R.id.widget_attachment, View.GONE);
- }
+ remoteViews.setTextViewText(R.id.widget_date, date);
+ remoteViews.setTextViewText(R.id.widget_subject, subjectAndSnippet);
+ remoteViews.setViewVisibility(R.id.widget_attachment,
+ hasAttachments ? View.VISIBLE : View.GONE);
if (isUnread) {
remoteViews.setViewVisibility(R.id.widget_unread_background, View.VISIBLE);
remoteViews.setViewVisibility(R.id.widget_read_background, View.GONE);
diff --git a/tests/src/com/android/mail/browse/MessageHeaderViewTest.java b/tests/src/com/android/mail/browse/MessageHeaderViewTest.java
index 1cadb73..0ba04f5 100644
--- a/tests/src/com/android/mail/browse/MessageHeaderViewTest.java
+++ b/tests/src/com/android/mail/browse/MessageHeaderViewTest.java
@@ -27,43 +27,6 @@
public class MessageHeaderViewTest extends AndroidTestCase {
@SmallTest
- public void testRecipientSummaryLongTo() {
- String[] to = makeRecipientArray("TO", 60);
- String[] cc = makeRecipientArray("CC", 60);
- String summary = MessageHeaderView.getRecipientSummaryText(getContext(), "", "", to, cc,
- null, new HashMap<String, Address>(), null).toString();
-
- assertTrue(summary.contains("TO00"));
- assertTrue(summary.contains("TO49"));
- assertFalse(summary.contains("TO50"));
- }
-
- @SmallTest
- public void testRecipientSummaryLongMultipleLists() {
- String[] to = makeRecipientArray("TO", 20);
- String[] cc = makeRecipientArray("CC", 10);
- String[] bcc = makeRecipientArray("BB", 60);
- String summary = MessageHeaderView.getRecipientSummaryText(getContext(), "", "", to, cc,
- bcc, new HashMap<String, Address>(), null).toString();
-
- assertTrue(summary.contains("TO00"));
- assertTrue(summary.contains("TO19"));
- assertTrue(summary.contains("CC00"));
- assertTrue(summary.contains("CC09"));
- assertTrue(summary.contains("BB00"));
- assertTrue(summary.contains("BB19"));
- assertFalse(summary.contains("BB20"));
- }
-
- private static String[] makeRecipientArray(String prefix, int len) {
- String[] arr = new String[len];
- for (int i=0; i < arr.length; i++) {
- arr[i] = String.format("\"%s%02d\" <foo@bar.com>", prefix, i);
- }
- return arr;
- }
-
- @SmallTest
public void testMakeSnippet() {
assertSnippetEquals("Hello, world!",
"Hello, world!");
