Merge "Add a test for EmlMessageLoader that loads an empty message" into ub-mail-master
diff --git a/res/layout-sw600dp/compose.xml b/res/layout-sw600dp/compose.xml
index cf66774..44fa5cb 100644
--- a/res/layout-sw600dp/compose.xml
+++ b/res/layout-sw600dp/compose.xml
@@ -38,12 +38,11 @@
android:paddingTop="8dip"
android:background="@android:color/white"
android:layout_gravity="center_horizontal"
- android:paddingLeft="@dimen/compose_area_left_padding"
android:animateLayoutChanges="true">
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<FrameLayout
style="@style/FillRowStyle">
<include layout="@layout/compose_from"/>
@@ -77,16 +76,17 @@
<View style="@style/RecipientComposeFieldSpacer"/>
</LinearLayout>
<RelativeLayout
- android:layout_width="@dimen/compose_area_right_padding"
+ android:layout_width="@dimen/compose_area_end_padding"
android:layout_height="wrap_content"
android:layout_column="2"
- android:layout_gravity="bottom|left"
- android:gravity="bottom|left">
+ android:layout_gravity="bottom|left|start"
+ android:gravity="bottom|left|start">
<Button android:id="@+id/add_cc_bcc"
android:text="@string/add_cc_label"
style="@style/ComposeButton"
android:layout_marginBottom="6dip"
android:paddingLeft="8dip"
+ android:paddingRight="8dip"
android:focusable="true"
android:clickable="true"/>
</RelativeLayout>
@@ -94,7 +94,7 @@
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<com.android.mail.compose.CcBccView
android:id="@+id/cc_bcc_wrapper"
style="@style/FillRowStyle"/>
@@ -108,7 +108,8 @@
android:layout_column="1"
android:layout_weight="1"
android:layout_width="0dip">
- <!-- Subject: localization cannot control what field pressing tab will bring the user to. This is controlled at runtime. -->
+ <!-- Subject: localization cannot control what field
+ pressing tab will bring the user to. This is controlled at runtime. -->
<com.android.mail.compose.EnterSubject android:id="@+id/subject"
style="@style/ComposeSubjectView" />
</RelativeLayout>
@@ -123,13 +124,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="4dip"
+ android:paddingRight="4dip"
android:clickable="false"/>
</RelativeLayout>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<!-- Compose Area -->
<FrameLayout
android:id="@+id/compose_wrapper"
@@ -140,7 +142,7 @@
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<!-- Attachments -->
<com.android.mail.compose.AttachmentsView android:id="@+id/attachments"
android:orientation="vertical"
@@ -148,7 +150,6 @@
android:animateLayoutChanges="true"
android:paddingTop="2dip"
android:paddingBottom="0dip"
- android:paddingLeft="0dip"
android:visibility="gone"
style="@style/FillRowStyle">
<include layout="@layout/compose_attachments" />
@@ -157,7 +158,7 @@
<TableRow
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingRight="@dimen/compose_area_right_padding">
+ style="@style/ComposeRowStyle" >
<!-- Quoted text -->
<com.android.mail.compose.QuotedTextView android:id="@+id/quoted_text_view"
android:layout_height="wrap_content"
diff --git a/res/layout/custom_from_dropdown_item.xml b/res/layout/custom_from_dropdown_item.xml
index 684dadf..e13843f 100644
--- a/res/layout/custom_from_dropdown_item.xml
+++ b/res/layout/custom_from_dropdown_item.xml
@@ -21,6 +21,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:paddingLeft="24dip"
+ android:paddingRight="24dip"
android:layout_gravity="center_vertical"
android:paddingTop="10dip"
android:paddingBottom="10dip">
diff --git a/res/layout/custom_from_item.xml b/res/layout/custom_from_item.xml
index ccffd48..e7dcd9d 100644
--- a/res/layout/custom_from_item.xml
+++ b/res/layout/custom_from_item.xml
@@ -17,14 +17,15 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
android:layout_height="wrap_content"
- android:layout_width="match_parent">
+ android:layout_width="match_parent"
+ android:orientation="horizontal"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip">
<TextView android:id="@+id/spinner_account_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="6dip"
android:singleLine="true"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceMedium"/>
@@ -32,8 +33,8 @@
<TextView android:id="@+id/spinner_account_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="6dip"
android:singleLine="true"
- android:ellipsize="end"/>
+ android:ellipsize="end"
+ style="@style/SpinnerAccountAddressStyle" />
</LinearLayout>
diff --git a/res/layout/folder_teaser_item.xml b/res/layout/folder_teaser_item.xml
index 63c2abc..0eb0e41 100644
--- a/res/layout/folder_teaser_item.xml
+++ b/res/layout/folder_teaser_item.xml
@@ -13,38 +13,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/folder_teaser_item_background"
- android:paddingTop="8dp" >
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp" >
<ImageView
android:id="@+id/folder_imageView"
android:layout_width="48dp"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="12dp"
- android:layout_marginBottom="8dp"
+ android:layout_gravity="center_vertical"
android:background="@color/folder_teaser_icon_background"
- android:baselineAlignBottom="true"
android:duplicateParentState="true" />
- <View
- android:id="@+id/frame_height_spacer"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_below="@id/folder_imageView" />
-
<LinearLayout
android:id="@+id/text_layout"
- android:layout_width="match_parent"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toLeftOf="@+id/count_textView"
- android:layout_toRightOf="@id/folder_imageView"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
android:duplicateParentState="true"
android:orientation="vertical" >
@@ -75,13 +68,10 @@
</LinearLayout>
<TextView
- android:id="@id/count_textView"
+ android:id="@+id/count_textView"
android:layout_width="wrap_content"
android:layout_height="24sp"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="16dp"
+ android:layout_gravity="center_vertical"
android:minWidth="@dimen/folder_teaser_count_textview_minwidth"
android:paddingLeft="16dp"
android:paddingRight="16dp"
@@ -89,4 +79,4 @@
android:textColor="@color/folder_teaser_count_text"
android:textSize="16sp" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/from_dropdown_item.xml b/res/layout/from_dropdown_item.xml
index 892ee14..f445127 100644
--- a/res/layout/from_dropdown_item.xml
+++ b/res/layout/from_dropdown_item.xml
@@ -29,6 +29,7 @@
android:layout_weight="1"
android:ellipsize="end"
android:paddingLeft="8dip"
+ android:paddingRight="8dip"
android:gravity="center_vertical" />
</LinearLayout>
diff --git a/res/layout/from_item.xml b/res/layout/from_item.xml
index 62ed7f4..9c90d14 100644
--- a/res/layout/from_item.xml
+++ b/res/layout/from_item.xml
@@ -23,4 +23,5 @@
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingLeft="8dip"
- android:gravity="center_vertical"/>
\ No newline at end of file
+ android:paddingRight="8dip"
+ android:gravity="center_vertical"/>
diff --git a/res/layout/quoted_text.xml b/res/layout/quoted_text.xml
index 8a9f1b8..0accc29 100644
--- a/res/layout/quoted_text.xml
+++ b/res/layout/quoted_text.xml
@@ -15,54 +15,38 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/quoted_text_area"
android:layout_height="wrap_content"
- android:layout_width="match_parent">
+ android:layout_width="match_parent"
+ android:orientation="vertical">
- <View
+ <View android:id="@+id/upper_quotedtext_divider_bar"
android:layout_width="match_parent"
android:layout_height="2dip"
android:background="#babebe"
- android:id="@+id/upper_quotedtext_divider_bar"
android:visibility="gone" />
- <LinearLayout android:layout_width="match_parent"
- android:layout_height="48dip"
- android:id="@+id/quoted_text_button_bar"
- android:layout_below="@id/upper_quotedtext_divider_bar"
- android:layout_alignWithParentIfMissing="true"
- android:layout_alignParentTop="true">
+ <LinearLayout android:id="@+id/quoted_text_button_bar"
+ android:layout_width="match_parent"
+ android:layout_height="48dip" >
- <RelativeLayout android:layout_width="0dip"
- android:layout_weight="1"
+ <CheckBox android:id="@+id/hide_quoted_text"
+ android:layout_width="0dip"
android:layout_height="match_parent"
- android:id="@+id/quoted_text_row">
+ android:layout_weight="1"
+ android:contentDescription="@string/quoted_text"
+ android:drawablePadding="@dimen/quoted_text_header_padding"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:text="@string/quoted_text_label"
+ android:textAllCaps="true"
+ android:textColor="@color/quoted_text_color"
+ android:textSize="12sp" />
- <CheckBox android:id="@+id/hide_quoted_text"
- android:layout_height="match_parent"
- android:layout_width="wrap_content"
- android:layout_alignParentLeft="true"
- android:gravity="center_vertical"
- android:contentDescription="@string/quoted_text"/>
-
- <TextView
- android:id="@+id/hide_quoted_text_label"
- android:text="@string/quoted_text_label"
- android:textAllCaps="true"
- android:layout_height="match_parent"
- android:layout_width="wrap_content"
- android:layout_marginLeft="8dip"
- style="@style/QuotedTextHeaderStyle"
- android:layout_toRightOf="@+id/hide_quoted_text"
- android:gravity="center_vertical|left"
- android:ellipsize="end"
- android:clickable="true" />
- </RelativeLayout>
-
- <View android:layout_height="match_parent"
+ <View
android:layout_width="2dip"
- android:layout_marginRight="16dip"
+ android:layout_height="match_parent"
android:background="#babebe"
android:layout_marginTop="12dip"
android:layout_marginBottom="12dip"
@@ -75,7 +59,7 @@
android:textAllCaps="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@null"/>
+ android:background="?android:attr/selectableItemBackground"/>
</LinearLayout>
@@ -83,14 +67,12 @@
android:layout_width="match_parent"
android:layout_height="2dip"
android:background="#babebe"
- android:layout_below="@id/quoted_text_button_bar"
android:id="@+id/divider_bar" />
<WebView android:id="@+id/quoted_text_web_view"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_below="@id/divider_bar"
android:focusableInTouchMode="false"
android:focusable="false" />
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a5ee6ad..4eb7ea7 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"gesprek ongelees"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Konsep"</item>
<item quantity="other" msgid="6961049507579977505">"Konsepte"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index be5e014..0e629d7 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"ያልተነበበ ውይይት"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"ረቂቅ"</item>
<item quantity="other" msgid="6961049507579977505">"ረቂቆች"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fc0cc99..edaaf9e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -26,7 +26,7 @@
<string name="add_file_attachment" msgid="2203398371671979481">"إرفاق ملف"</string>
<string name="add_photo_attachment" msgid="3738882100645552858">"إرفاق صورة"</string>
<string name="save_draft" msgid="5555744208032445632">"حفظ كمسودة"</string>
- <string name="discard" msgid="1714960202994370243">"إلغاء"</string>
+ <string name="discard" msgid="1714960202994370243">"تجاهل"</string>
<string name="compose" msgid="1473559896062432878">"إنشاء"</string>
<string-array name="compose_modes">
<item msgid="8631190144210933782">"رد"</item>
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"لم تتم قراءة المحادثة"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"مسودة"</item>
<item quantity="other" msgid="6961049507579977505">"مسودات"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 16712eb..eac5f71 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"кореспонденцията не е прочетена"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Чернова"</item>
<item quantity="other" msgid="6961049507579977505">"Чернови"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2712935..c9450c7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversa per llegir"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Esborrany"</item>
<item quantity="other" msgid="6961049507579977505">"Esborranys"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3a843ae..79f0ac9 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"Konverzace nebyla přečtena."</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Koncept"</item>
<item quantity="other" msgid="6961049507579977505">"Koncepty"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2500d8e..860c252 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"samtalen er ulæst"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Kladde"</item>
<item quantity="other" msgid="6961049507579977505">"Kladder"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6724f76..ea95727 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -60,7 +60,7 @@
<string name="remove_folder" msgid="4906542720439865413">"Aus <xliff:g id="FOLDERNAME">%1$s</xliff:g> entfernen"</string>
<string name="archive" msgid="847250094775910499">"Archivieren"</string>
<string name="report_spam" msgid="6467567747975393907">"Spam melden"</string>
- <string name="mark_not_spam" msgid="694891665407228160">"Nicht als Spam melden"</string>
+ <string name="mark_not_spam" msgid="694891665407228160">"Kein Spam"</string>
<string name="report_phishing" msgid="5714205737453138338">"Phishing melden"</string>
<string name="delete" msgid="844871204175957681">"Löschen"</string>
<string name="discard_drafts" msgid="6862272443470085375">"Entwürfe löschen"</string>
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"Konversation ungelesen"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Entwurf"</item>
<item quantity="other" msgid="6961049507579977505">"Entwürfe"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 6b8f70b..265dd5c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"μη αναγνωσμένη συνομιλία"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Πρόχειρο"</item>
<item quantity="other" msgid="6961049507579977505">"Πρόχειρα"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 66df3e4..5e9ac46 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversation unread"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Draft"</item>
<item quantity="other" msgid="6961049507579977505">"Drafts"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 66df3e4..5e9ac46 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversation unread"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Draft"</item>
<item quantity="other" msgid="6961049507579977505">"Drafts"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6be45e7..eb48ed9 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversación no leída"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Borrador"</item>
<item quantity="other" msgid="6961049507579977505">"Borradores"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 24e2066..510faaf 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversación no leída"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Borrador"</item>
<item quantity="other" msgid="6961049507579977505">"Borradores"</item>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 7fc8599..93813c0 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"lugemata vestlus"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Mustand"</item>
<item quantity="other" msgid="6961049507579977505">"Mustandid"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index bbf8afd..b151b58 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"مکالمه خوانده نشده است"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"پیشنویس"</item>
<item quantity="other" msgid="6961049507579977505">"پیشنویسها"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c9d1ddf..bb694c9 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"keskustelua ei ole luettu"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>–<xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Luonnos"</item>
<item quantity="other" msgid="6961049507579977505">"Luonnokset"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 90fe776..b770e06 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversation non lue"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Version préliminaire"</item>
<item quantity="other" msgid="6961049507579977505">"Brouillons"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f780fd1..59e2b92 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversation non lue"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Brouillon"</item>
<item quantity="other" msgid="6961049507579977505">"Brouillons"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 1035a87..df2e211 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"वार्तालाप नहीं पढ़ा गया"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"ड्रॉफ़्ट"</item>
<item quantity="other" msgid="6961049507579977505">"अधूरा ईमेल"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 63f66ca..043186e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"razgovor nije pročitan"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Skica"</item>
<item quantity="other" msgid="6961049507579977505">"Skice"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 891d713..2490e1b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"a beszélgetés nincs elolvasva"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> -- <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Piszkozat"</item>
<item quantity="other" msgid="6961049507579977505">"Piszkozatok"</item>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index f46da78..a613534 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"զրույցը չընթերցված է"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Սևագիր"</item>
<item quantity="other" msgid="6961049507579977505">"Սևագրություններ"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2d5134e..fdd44c6 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"percakapan belum dibaca"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Draf"</item>
<item quantity="other" msgid="6961049507579977505">"Draf"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f0b5afc..cdc06da 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversazione da leggere"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Bozza"</item>
<item quantity="other" msgid="6961049507579977505">"Bozze"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d740a25..300cc0b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"השיחה לא נקראה"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"טיוטה"</item>
<item quantity="other" msgid="6961049507579977505">"טיוטות"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d55a889..2ca6d70 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"未読のスレッド"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"下書き"</item>
<item quantity="other" msgid="6961049507579977505">"下書き"</item>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 957126c..d06ce65 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"წასაკითხი მიმოწერა"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"მონახაზი"</item>
<item quantity="other" msgid="6961049507579977505">"მონახაზები"</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index d0cd47e..c3b1829 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"ការសន្ទនាមិនទាន់អាន"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"សេចក្ដីព្រាង"</item>
<item quantity="other" msgid="6961049507579977505">"សេចក្ដីព្រាង"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d47c8bc..a0c0dd2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"대화 읽지 않음"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"임시보관"</item>
<item quantity="other" msgid="6961049507579977505">"임시보관함"</item>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index bd3a08d..2f279d7 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -263,6 +263,7 @@
</style>
<style name="RecipientComposeHeading" parent="@style/AbstractRecipientComposeHeading">
+ <item name="android:paddingStart">0dip</item>
<item name="android:layout_marginEnd">@dimen/compose_recipient_heading_margin_end</item>
</style>
@@ -377,4 +378,15 @@
</style>
<!-- END Conversation list styles -->
+ <style name="SpinnerAccountAddressStyle">
+ <item name="android:paddingStart">@dimen/custom_from_inner_padding</item>
+ </style>
+
+ <style name="AbstractComposeArea">
+ <item name="android:paddingStart">@dimen/compose_area_start_padding</item>
+ </style>
+
+ <style name="ComposeRowStyle">
+ <item name="android:paddingEnd">@dimen/compose_area_end_padding</item>
+ </style>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 358bb1a..0e3cbde 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"ການສົນທະນາທີ່ຍັງບໍ່ໄດ້ອ່ານ"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"ສະບັບຮ່າງ"</item>
<item quantity="other" msgid="6961049507579977505">"ສະບັບຮ່າງ"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 7a33305..2b939f5 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"pokalbis neskaitytas"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g>–<xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Juodraštis"</item>
<item quantity="other" msgid="6961049507579977505">"Juodrašč."</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6c9aebe..a08366e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"saruna nav izlasīta"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Melnraksts"</item>
<item quantity="other" msgid="6961049507579977505">"Melnraksti"</item>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index ad33bbf..0508c7f 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"харилцаа уншигдаагүй"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Ноорог"</item>
<item quantity="other" msgid="6961049507579977505">"Ноорог"</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index e2a5ceb..e3223f0 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"perbualan belum dibaca"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Draf"</item>
<item quantity="other" msgid="6961049507579977505">"Draf"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 617e084..7e88cd8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"samtalen er ulest"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Utkast"</item>
<item quantity="other" msgid="6961049507579977505">"Utkast"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4e0d07f..11cc3de 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversatie ongelezen"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Concept"</item>
<item quantity="other" msgid="6961049507579977505">"Concepten"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 1e43578..7e12a56 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"wątek nie został przeczytany"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Wersja robocza"</item>
<item quantity="other" msgid="6961049507579977505">"Wersje robocze"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 88d8375..d99cd6a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversa não lida"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Rascunho"</item>
<item quantity="other" msgid="6961049507579977505">"Rascunhos"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 04ca48e..2ce6cc8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversa não lida"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Rascunho"</item>
<item quantity="other" msgid="6961049507579977505">"Rascunhos"</item>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 1922546..1d83acd 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -247,6 +247,8 @@
<skip />
<!-- no translation found for subject_and_snippet (7884124651812798896) -->
<skip />
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<!-- no translation found for draft:one (333591132893648383) -->
<!-- no translation found for draft:other (6961049507579977505) -->
<!-- no translation found for sending (8214361929125649771) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 715cb58..ed72d38 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"conversație necitită"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Mesaj nefinalizat"</item>
<item quantity="other" msgid="6961049507579977505">"Mesaje nefinalizate"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a45ab14..32381bd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"не прочитано"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Черновик"</item>
<item quantity="other" msgid="6961049507579977505">"Черновики"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8764004..f866924 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"konverzácia nebola prečítaná"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Koncept"</item>
<item quantity="other" msgid="6961049507579977505">"Koncepty"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8ccc326..7c9d5f6 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"pogovor ni bil prebran"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Osnutek"</item>
<item quantity="other" msgid="6961049507579977505">"Osnutki"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 260a2c0..a7903cd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"преписка није прочитана"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Недовршена порука"</item>
<item quantity="other" msgid="6961049507579977505">"Недовршене поруке"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f06c60f..9e1a25e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"konversationen är oläst"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Utkast"</item>
<item quantity="other" msgid="6961049507579977505">"Utkast"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2aef28b..d46d21c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"mazungumzo hayajasomwa"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Rasimu"</item>
<item quantity="other" msgid="6961049507579977505">"Rasimu"</item>
diff --git a/res/values-sw600dp-land/dimen.xml b/res/values-sw600dp-land/dimen.xml
index 6471b1c..6e4a066 100644
--- a/res/values-sw600dp-land/dimen.xml
+++ b/res/values-sw600dp-land/dimen.xml
@@ -17,8 +17,8 @@
-->
<resources>
<dimen name="compose_scrollview_width">800dip</dimen>
- <dimen name="compose_area_left_padding">100dip</dimen>
- <dimen name="compose_area_right_padding">100dip</dimen>
+ <dimen name="compose_area_start_padding">100dip</dimen>
+ <dimen name="compose_area_end_padding">100dip</dimen>
<dimen name="search_view_width">500dip</dimen>
<dimen name="spinner_frame_width">196dp</dimen>
</resources>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 14958c0..a3574db 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<resources>
- <style name="ComposeArea">
+ <style name="ComposeArea" parent="AbstractComposeArea">
<item name="android:layout_width">@dimen/compose_scrollview_width</item>
</style>
</resources>
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 3e316bc..024e700 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -40,8 +40,8 @@
<dimen name="attachment_tile_max_size">254dp</dimen>
<dimen name="wait_padding">32dp</dimen>
- <dimen name="compose_area_left_padding">80dip</dimen>
- <dimen name="compose_area_right_padding">80dip</dimen>
+ <dimen name="compose_area_start_padding">80dip</dimen>
+ <dimen name="compose_area_end_padding">80dip</dimen>
<dimen name="search_view_width">400dip</dimen>
<dimen name="spinner_frame_width">170dp</dimen>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 2ff5eb3..c0bc401 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -23,7 +23,7 @@
<item name="android:layout_width">@dimen/spinner_frame_width</item>
</style>
- <style name="ComposeArea">
+ <style name="ComposeArea" parent="AbstractComposeArea">
<item name="android:layout_width">match_parent</item>
</style>
diff --git a/res/values-sw800dp-land/dimen.xml b/res/values-sw800dp-land/dimen.xml
index 749da16..29544f9 100644
--- a/res/values-sw800dp-land/dimen.xml
+++ b/res/values-sw800dp-land/dimen.xml
@@ -18,6 +18,6 @@
<resources>
<!--Manta b/7382467-->
<dimen name="compose_scrollview_width">848dip</dimen>
- <dimen name="compose_area_left_padding">104dip</dimen>
- <dimen name="compose_area_right_padding">104dip</dimen>
+ <dimen name="compose_area_start_padding">104dip</dimen>
+ <dimen name="compose_area_end_padding">104dip</dimen>
</resources>
\ No newline at end of file
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f01d376..cd02bdf 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"ยังไม่ได้อ่านการสนทนา"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"ร่างจดหมาย"</item>
<item quantity="other" msgid="6961049507579977505">"ร่างจดหมาย"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6d20b81..32183af 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"hindi pa nababasang pag-uusap"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Draft"</item>
<item quantity="other" msgid="6961049507579977505">"Mga Draft"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 71e901a..6f8d1ee 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -140,6 +140,8 @@
<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>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Taslak"</item>
<item quantity="other" msgid="6961049507579977505">"Taslaklar"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 179b954..9648acd 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"бесіду не прочитано"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Чернетка"</item>
<item quantity="other" msgid="6961049507579977505">"Чернетки"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 74075be..fdfa55b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"cuộc trò chuyện chưa đọc"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Bản nháp"</item>
<item quantity="other" msgid="6961049507579977505">"Bản nháp"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 88ad0fa..c3e45f5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"未读会话"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> - <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"草稿"</item>
<item quantity="other" msgid="6961049507579977505">"草稿"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 945ac3e..dfe684f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"未讀取對話群組"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"草稿"</item>
<item quantity="other" msgid="6961049507579977505">"草稿"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f39268e..fd413b0 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"未閱讀的會話群組"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"草稿"</item>
<item quantity="other" msgid="6961049507579977505">"草稿"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8b84292..909ffba 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -140,6 +140,8 @@
<string name="unread_string" msgid="588180203444398297">"inkulumo engafundiwe"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
+ <!-- no translation found for badge_subject_and_snippet (1261901365444812399) -->
+ <skip />
<plurals name="draft">
<item quantity="one" msgid="333591132893648383">"Okusalungiswa"</item>
<item quantity="other" msgid="6961049507579977505">"Okusalungiswa"</item>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index d121151..da0f96d 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -187,4 +187,7 @@
<dimen name="badge_padding_extra_width">6dip</dimen>
<dimen name="badge_rounded_corner_radius">2dip</dimen>
+ <dimen name="custom_from_inner_padding">6dip</dimen>
+
+ <dimen name="quoted_text_header_padding">8dip</dimen>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3445a96..7fb1b37 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -60,10 +60,10 @@
<style name="AbstractRecipientComposeHeading" parent="@style/ComposeHeading">
<item name="android:layout_marginTop">4dip</item>
- <item name="android:paddingLeft">0dip</item>
</style>
<style name="RecipientComposeHeading" parent="@style/AbstractRecipientComposeHeading">
+ <item name="android:paddingLeft">0dip</item>
<item name="android:layout_marginRight">@dimen/compose_recipient_heading_margin_end</item>
</style>
@@ -123,15 +123,11 @@
<item name="android:layout_height">wrap_content</item>
</style>
- <style name="QuotedTextHeaderStyle">
- <item name="android:textColor">@color/quoted_text_color</item>
- <item name="android:textSize">12sp</item>
- </style>
-
<style name="RespondInlineButtonStyle">
<item name="android:textColor">@color/quotedTextColor</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">12sp</item>
+ <item name="android:paddingLeft">16dip</item>
<item name="android:paddingRight">16dip</item>
<item name="android:gravity">center_vertical|right</item>
</style>
@@ -462,8 +458,8 @@
<item name="android:layout_height">48dip</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:addStatesFromChildren">true</item>
- <item name="android:gravity">center|left</item>
- <item name="android:layout_gravity">center|left</item>
+ <item name="android:gravity">center|left|start</item>
+ <item name="android:layout_gravity">center|left|start</item>
</style>
<style name="FillRowStyle">
@@ -920,4 +916,15 @@
<item name="android:textStyle">bold</item>
</style>
+ <style name="SpinnerAccountAddressStyle">
+ <item name="android:paddingLeft">@dimen/custom_from_inner_padding</item>
+ </style>
+
+ <style name="AbstractComposeArea">
+ <item name="android:paddingLeft">@dimen/compose_area_start_padding</item>
+ </style>
+
+ <style name="ComposeRowStyle">
+ <item name="android:paddingRight">@dimen/compose_area_end_padding</item>
+ </style>
</resources>
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index fd82c98..b2bd5c1 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -45,6 +45,7 @@
import android.os.ParcelFileDescriptor;
import android.os.Parcelable;
import android.provider.BaseColumns;
+import android.support.v4.text.BidiFormatter;
import android.text.Editable;
import android.text.Html;
import android.text.SpannableString;
@@ -295,6 +296,8 @@
private boolean mRespondedInline;
private boolean mPerformedSendOrDiscard = false;
+ private final BidiFormatter mBidiFormatter = BidiFormatter.getInstance();
+
/**
* Can be called from a non-UI thread.
*/
@@ -770,7 +773,7 @@
// Update the from spinner as other accounts
// may now be available.
if (mFromSpinner != null && mAccount != null) {
- mFromSpinner.initialize(mComposeMode, mAccount, mAccounts, mRefMessage);
+ mFromSpinner.initialize(mComposeMode, mAccount, mAccounts, mRefMessage, mBidiFormatter);
}
}
@@ -982,7 +985,7 @@
if (action == EDIT_DRAFT && mDraft.draftType == UIProvider.DraftType.COMPOSE) {
action = COMPOSE;
}
- mFromSpinner.initialize(action, mAccount, mAccounts, mRefMessage);
+ mFromSpinner.initialize(action, mAccount, mAccounts, mRefMessage, mBidiFormatter);
if (bundle != null) {
if (bundle.containsKey(EXTRA_SELECTED_REPLY_FROM_ACCOUNT)) {
diff --git a/src/com/android/mail/compose/FromAddressSpinner.java b/src/com/android/mail/compose/FromAddressSpinner.java
index 7d82d1e..aeed90b 100644
--- a/src/com/android/mail/compose/FromAddressSpinner.java
+++ b/src/com/android/mail/compose/FromAddressSpinner.java
@@ -16,6 +16,7 @@
package com.android.mail.compose;
import android.content.Context;
+import android.support.v4.text.BidiFormatter;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
@@ -90,7 +91,7 @@
* @param syncingAccounts
*/
public void initialize(int action, Account currentAccount, Account[] syncingAccounts,
- Message refMessage) {
+ Message refMessage, BidiFormatter bidiFormatter) {
final List<Account> accounts = AccountUtils.mergeAccountLists(mAccounts,
syncingAccounts, true /* prioritizeAccountList */);
if (action == ComposeActivity.COMPOSE) {
@@ -111,11 +112,11 @@
}
mAccounts = ImmutableList.of(replyAccount);
}
- initFromSpinner();
+ initFromSpinner(bidiFormatter);
}
@VisibleForTesting
- protected void initFromSpinner() {
+ protected void initFromSpinner(BidiFormatter bidiFormatter) {
// If there are not yet any accounts in the cached synced accounts
// because this is the first time mail was opened, and it was opened
// directly to the compose activity, don't bother populating the reply
@@ -123,7 +124,8 @@
if (mAccounts == null || mAccounts.size() == 0) {
return;
}
- FromAddressSpinnerAdapter adapter = new FromAddressSpinnerAdapter(getContext());
+ FromAddressSpinnerAdapter adapter =
+ new FromAddressSpinnerAdapter(getContext(), bidiFormatter);
mReplyFromAccounts.clear();
for (Account account : mAccounts) {
diff --git a/src/com/android/mail/compose/FromAddressSpinnerAdapter.java b/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
index 88528fd..980d419 100644
--- a/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
+++ b/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
@@ -16,6 +16,7 @@
package com.android.mail.compose;
import android.content.Context;
+import android.support.v4.text.BidiFormatter;
import android.text.TextUtils;
import android.text.util.Rfc822Tokenizer;
import android.view.LayoutInflater;
@@ -46,11 +47,14 @@
public static int ACCOUNT_ADDRESS = 1;
+ private final BidiFormatter mBidiFormatter;
+
private LayoutInflater mInflater;
- public FromAddressSpinnerAdapter(Context context) {
+ public FromAddressSpinnerAdapter(Context context, BidiFormatter bidiFormatter) {
super(context, R.layout.from_item, R.id.spinner_account_address);
sFormatString = getContext().getString(R.string.formatted_email_address);
+ mBidiFormatter = bidiFormatter;
}
protected LayoutInflater getInflater() {
@@ -78,13 +82,14 @@
int res = fromItem.isCustomFrom ? R.layout.custom_from_item : R.layout.from_item;
View fromEntry = convertView == null ? getInflater().inflate(res, null) : convertView;
if (fromItem.isCustomFrom) {
- ((TextView) fromEntry.findViewById(R.id.spinner_account_name)).setText(fromItem.name);
+ ((TextView) fromEntry.findViewById(R.id.spinner_account_name)).setText(
+ mBidiFormatter.unicodeWrap(fromItem.name));
((TextView) fromEntry.findViewById(R.id.spinner_account_address))
.setText(formatAddress(fromItem.address));
} else {
((TextView) fromEntry.findViewById(R.id.spinner_account_address))
- .setText(fromItem.address);
+ .setText(mBidiFormatter.unicodeWrap(fromItem.address));
}
return fromEntry;
}
@@ -97,21 +102,22 @@
View fromEntry = getInflater().inflate(res, null);
if (fromItem.isCustomFrom) {
((TextView) fromEntry.findViewById(R.id.spinner_account_name))
- .setText(fromItem.name);
+ .setText(mBidiFormatter.unicodeWrap(fromItem.name));
((TextView) fromEntry.findViewById(R.id.spinner_account_address))
.setText(formatAddress(fromItem.address));
} else {
((TextView) fromEntry.findViewById(R.id.spinner_account_address))
- .setText(fromItem.address);
+ .setText(mBidiFormatter.unicodeWrap(fromItem.address));
}
return fromEntry;
}
- private static CharSequence formatAddress(String address) {
+ private CharSequence formatAddress(String address) {
if (TextUtils.isEmpty(address)) {
return "";
}
- return String.format(sFormatString, Rfc822Tokenizer.tokenize(address)[0].getAddress());
+ return String.format(sFormatString,
+ mBidiFormatter.unicodeWrap(Rfc822Tokenizer.tokenize(address)[0].getAddress()));
}
public void addAccounts(List<ReplyFromAccount> replyFromAccounts) {
diff --git a/src/com/android/mail/compose/QuotedTextView.java b/src/com/android/mail/compose/QuotedTextView.java
index 8ebac6f..2dd64d5 100644
--- a/src/com/android/mail/compose/QuotedTextView.java
+++ b/src/com/android/mail/compose/QuotedTextView.java
@@ -61,7 +61,7 @@
private CharSequence mQuotedText;
private WebView mQuotedTextWebView;
private ShowHideQuotedTextListener mShowHideListener;
- private CheckBox mShowHideCheckBox;
+ private CheckBox mQuotedTextCheckBox;
private boolean mIncludeText = true;
private Button mRespondInlineButton;
private RespondInlineListener mRespondInlineListener;
@@ -85,11 +85,10 @@
WebSettings settings = mQuotedTextWebView.getSettings();
settings.setBlockNetworkLoads(true);
- mShowHideCheckBox = (CheckBox) findViewById(R.id.hide_quoted_text);
- mShowHideCheckBox.setChecked(true);
- mShowHideCheckBox.setOnClickListener(this);
+ mQuotedTextCheckBox = (CheckBox) findViewById(R.id.hide_quoted_text);
+ mQuotedTextCheckBox.setChecked(true);
+ mQuotedTextCheckBox.setOnClickListener(this);
sQuoteBegin = context.getResources().getString(R.string.quote_begin);
- findViewById(R.id.hide_quoted_text_label).setOnClickListener(this);
mRespondInlineButton = (Button) findViewById(R.id.respond_inline_button);
@@ -109,9 +108,8 @@
* @param allow
*/
public void allowQuotedText(boolean allow) {
- View quotedTextRow = findViewById(R.id.quoted_text_row);
- if (quotedTextRow != null) {
- quotedTextRow.setVisibility(allow? View.VISIBLE: View.INVISIBLE);
+ if (mQuotedTextCheckBox != null) {
+ mQuotedTextCheckBox.setVisibility(allow ? View.VISIBLE : View.INVISIBLE);
}
}
@@ -166,9 +164,7 @@
if (id == R.id.respond_inline_button) {
respondInline();
} else if (id == R.id.hide_quoted_text) {
- updateCheckedState(mShowHideCheckBox.isChecked());
- } else if (id == R.id.hide_quoted_text_label) {
- updateCheckedState(!mShowHideCheckBox.isChecked());
+ updateCheckedState(mQuotedTextCheckBox.isChecked());
}
}
@@ -178,7 +174,7 @@
* @param checked Either true or false.
*/
public void updateCheckedState(boolean checked) {
- mShowHideCheckBox.setChecked(checked);
+ mQuotedTextCheckBox.setChecked(checked);
updateQuotedTextVisibility(checked);
if (mShowHideListener != null) {
mShowHideListener.onShowHideQuotedText(checked);
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 0ca0448..d622cc6 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -476,6 +476,8 @@
if (list.isEmpty()) {
// If we have no deleted items on screen, skip the animation
listener.onListItemsRemoved();
+ // If we have an action queued up, perform it
+ performAndSetNextAction(null);
} else {
performAndSetNextAction(listener);
}
diff --git a/tests/src/com/android/mail/compose/ComposeActivityTest.java b/tests/src/com/android/mail/compose/ComposeActivityTest.java
index d2cc308..52066e9 100644
--- a/tests/src/com/android/mail/compose/ComposeActivityTest.java
+++ b/tests/src/com/android/mail/compose/ComposeActivityTest.java
@@ -22,6 +22,7 @@
import android.database.Cursor;
import android.database.MatrixCursor;
import android.net.Uri;
+import android.support.v4.text.BidiFormatter;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
import android.text.Html;
@@ -149,7 +150,7 @@
activity.mFromSpinner.setCurrentAccount(currentAccount);
activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
- currentAccount.account, EMPTY_ACCOUNT_LIST, null);
+ currentAccount.account, EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
runTestOnUiThread(new Runnable() {
@Override
public void run() {
@@ -183,7 +184,7 @@
activity.mFromSpinner.setCurrentAccount(currentAccount);
activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
- currentAccount.account, EMPTY_ACCOUNT_LIST, null);
+ currentAccount.account, EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
runTestOnUiThread(new Runnable() {
@Override
public void run() {
@@ -222,7 +223,7 @@
activity.mFromSpinner.setCurrentAccount(currentAccount);
activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
- currentAccount.account, EMPTY_ACCOUNT_LIST, null);
+ currentAccount.account, EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
runTestOnUiThread(new Runnable() {
@Override
public void run() {
@@ -550,7 +551,7 @@
mAccount.name, mAccount.name, mAccount.name, true, false);
activity.mFromSpinner.setCurrentAccount(currentAccount);
activity.mFromSpinner.initialize(ComposeActivity.REPLY, currentAccount.account,
- EMPTY_ACCOUNT_LIST, null);
+ EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
runTestOnUiThread(new Runnable() {
@Override
@@ -590,7 +591,7 @@
mAccount.name, mAccount.name, mAccount.name, true, false);
activity.mFromSpinner.setCurrentAccount(currentAccount);
activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
- currentAccount.account, EMPTY_ACCOUNT_LIST, null);
+ currentAccount.account, EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
runTestOnUiThread(new Runnable() {
@Override
public void run() {
@@ -632,7 +633,7 @@
mAccount.name, mAccount.name, mAccount.name, true, false);
activity.mFromSpinner.setCurrentAccount(currentAccount);
activity.mFromSpinner.initialize(ComposeActivity.REPLY_ALL,
- currentAccount.account, EMPTY_ACCOUNT_LIST, null);
+ currentAccount.account, EMPTY_ACCOUNT_LIST, null, BidiFormatter.getInstance());
runTestOnUiThread(new Runnable() {
@Override
public void run() {
