Merge "Compose now shows images as tiled attachments." into jb-ub-mail
diff --git a/res/layout/actionbar_view.xml b/res/layout/actionbar_view.xml
index eae0e18..6ad47ca 100644
--- a/res/layout/actionbar_view.xml
+++ b/res/layout/actionbar_view.xml
@@ -20,8 +20,7 @@
The custom action bar view Gmail uses (containing drop down account spinner,
label, and subject).
-->
-<com.android.mail.ui.ActionBarView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:email="http://schemas.android.com/apk/res/com.android.mail"
+<com.android.mail.ui.MailActionBarView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" >
@@ -30,4 +29,4 @@
<include layout="@layout/actionbar_subject" />
-</com.android.mail.ui.ActionBarView>
+</com.android.mail.ui.MailActionBarView>
diff --git a/res/layout/search_actionbar_view.xml b/res/layout/search_actionbar_view.xml
new file mode 100644
index 0000000..4709ddd
--- /dev/null
+++ b/res/layout/search_actionbar_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2011 Google Inc.
+ Licensed to The Android Open Source Project.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ The custom action bar view for search mode (containing drop down account spinner,
+ label, and subject).
+-->
+<com.android.mail.ui.SearchMailActionBarView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal" >
+
+ <include layout="@layout/actionbar_label" />
+
+ <include layout="@layout/actionbar_subject" />
+
+</com.android.mail.ui.SearchMailActionBarView>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index fb6206d..fcc55e3 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Deel met"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Maak oop in blaaier"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopieer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index afcd5bb..2fc7a92 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"በዚህ በኩል አጋራ -"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"በአሳሽ ውስጥ ክፈት"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"ቅዳ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6ac1035..a969d65 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"مشاركة عبر"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"فتح في المتصفح"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"نسخ"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 565b010..53f0170 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Апублікаваць з дапамогай"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Адкрыць у браўзеры"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Капіраваць"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e0a00d7..4ea8dbe 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Споделяне чрез"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Отваряне в браузъра"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Копиране"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a9d0f6f..2e72c9f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -119,6 +119,7 @@
<string name="menu_photo_save_all" msgid="4295226099481995348">"Desa tot"</string>
<string name="menu_photo_share" msgid="2214772815165829079">"Comparteix"</string>
<string name="menu_photo_share_all" msgid="4577299400844129078">"Comp. tot"</string>
+ <string name="saving" msgid="925514721138014677">"S\'està desant…"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Compartició mitjançant"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Obre al navegador"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copia"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 54e896f..8e4b73d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Sdílet pomocí"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Otevřít v prohlížeči"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopírovat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fd7165e..66176ea 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Gemt,"</string>
<string name="download_failed" msgid="7860650496473302012">"Download slog fejl."</string>
<string name="attachments_header" msgid="6459475590011460229">"Vedhæftede filer"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <string name="menu_photo_save_all" msgid="4295226099481995348">"Gem alle"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"Del"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"Del alle"</string>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Del via"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Åbn i browser"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Indsætter foto..."</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"Flytning er ikke mulig, fordi markeringen indeholder flere konti."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d46c6ef..41f181b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Teilen über"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"In Browser öffnen"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e6231b2..aafdc9b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -122,6 +122,7 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <string name="saving" msgid="925514721138014677">"Αποθήκευση…"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Κοινή χρήση μέσω"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Άνοιγμα στο πρόγραμμα περιήγησης"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Αντιγραφή"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8c2d353..48b080d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -116,12 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Saved"</string>
<string name="download_failed" msgid="7860650496473302012">"Unable to download."</string>
<string name="attachments_header" msgid="6459475590011460229">"Attachments"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
- <skip />
+ <string name="menu_photo_save_all" msgid="4295226099481995348">"Save all"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"Shared"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"Share all"</string>
+ <string name="saving" msgid="925514721138014677">"Saving…"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Share via"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Open in Browser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copy"</string>
@@ -337,8 +335,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Inserting photo…"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"Can\'t move because selection contains multiple accounts."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b03db54..c2a5d68 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Compartir mediante"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Abrir en el navegador"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copiar"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8279df8..418a3a8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Guardado"</string>
<string name="download_failed" msgid="7860650496473302012">"Error al descargar"</string>
<string name="attachments_header" msgid="6459475590011460229">"Archivos adjuntos"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <string name="menu_photo_save_all" msgid="4295226099481995348">"Guardar todo"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"Compartir"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"Compartir todo"</string>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Compartir a través de"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Abrir en el navegador"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Insertando foto…"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"No se puede mover porque la selección contiene varias cuentas."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 62b1a6c..168a12d 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Jagamine:"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Ava brauseris"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopeeri"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ba0846c..c9a02bc 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"اشتراکگذاری از طریق"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"بازکردن در مرورگر"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"کپی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4ee8fbe..416ec0e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -119,6 +119,8 @@
<string name="menu_photo_save_all" msgid="4295226099481995348">"Tallenna kaikki"</string>
<string name="menu_photo_share" msgid="2214772815165829079">"Jaa"</string>
<string name="menu_photo_share_all" msgid="4577299400844129078">"Jaa kaikki"</string>
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Jaa sovelluksessa"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Avaa selaimessa"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopioi"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a769855..c8c2835 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Enregistré,"</string>
<string name="download_failed" msgid="7860650496473302012">"Téléch. impossible."</string>
<string name="attachments_header" msgid="6459475590011460229">"Pièces jointes"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <string name="menu_photo_save_all" msgid="4295226099481995348">"Tout enreg."</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"Partager"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"Tout partager"</string>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Partager via"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Ouvrir dans le navigateur"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Insertion de la photo en cours…"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"Impossible de déplacer les messages, car la sélection comprend plusieurs comptes."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 46b4cf1..00f9ab8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"इसके द्वारा साझा करें:"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"ब्राउज़र में खोलें"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"प्रतिलिपि बनाएं"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5887d27..cda7a4f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Dijeli putem"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Otvori u pregledniku"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopiraj"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9799659..e638187 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Megosztás a következőn:"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Megnyitás böngészőben"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Másolás"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a6b4f5e..5a3fad4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Berbagi melalui"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Buka di Browser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Salin"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6e7048d..9e98ee3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -119,6 +119,7 @@
<string name="menu_photo_save_all" msgid="4295226099481995348">"Salva tutti"</string>
<string name="menu_photo_share" msgid="2214772815165829079">"Condividi"</string>
<string name="menu_photo_share_all" msgid="4577299400844129078">"Cond. tutti"</string>
+ <string name="saving" msgid="925514721138014677">"Salvataggio…"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Condividi tramite"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Apri nel browser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copia"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 97d5ef0..382f62d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"שתף באמצעות"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"פתח בדפדפן"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"העתק"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 29b18f7..1b9122b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"保存済み、"</string>
<string name="download_failed" msgid="7860650496473302012">"ダウンロードエラー"</string>
<string name="attachments_header" msgid="6459475590011460229">"添付ファイル"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <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>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"共有方法"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"ブラウザで開く"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"画像を挿入中…"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"移動できません。複数のアカウントを選択しています。"</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 837eb4c..88149ed 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"공유 방법"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"브라우저에서 열기"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"복사"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a8ccf93..be78c07 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Bendrinti per"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Atidaryti naršyklėje"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopijuoti"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 09be7cf..386cd97 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Kopīgošanas veids"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Atvērt pārlūkprogrammā"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopēt"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 80e7f01..31b49e1 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -123,6 +123,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Kongsi melalui"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Buka dalam Penyemak Imbas"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Salin"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index af63788..f317d7c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Lagret"</string>
<string name="download_failed" msgid="7860650496473302012">"Kunne ikke laste ned."</string>
<string name="attachments_header" msgid="6459475590011460229">"Vedlegg"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <string name="menu_photo_save_all" msgid="4295226099481995348">"Lagre alle"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"Del"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"Del alle"</string>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Del på"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Åpne i nettleser"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Setter inn bildet …"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"Kan ikke flytte fordi utvalget inneholder flere kontoer."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0f3cc32..1ff29c4 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Delen via"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Openen in browser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopiëren"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index d62588c..faf99d1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Zapisano,"</string>
<string name="download_failed" msgid="7860650496473302012">"Nie można pobrać."</string>
<string name="attachments_header" msgid="6459475590011460229">"Załączniki"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <string name="menu_photo_save_all" msgid="4295226099481995348">"Zapisz"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"Udostępnij"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"Udostępnij"</string>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Udostępnij przez"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Otwórz w przeglądarce"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Wstawiam zdjęcie…"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"Nie można przenieść, ponieważ wybrane elementy pochodzą z wielu kont."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 166d39c..05437d9 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Partilhar através do"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Abrir no Navegador"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copiar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2c4b11f..6b6645f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Compartilhar via"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Abrir no navegador"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copiar"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3470f3c..8e37c49 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Distribuiţi prin"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Deschideţi în browser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Copiaţi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3492da7..750e3a7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Способ отправки"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Открыть в браузере"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Копировать"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index cdc8d3b..81f7485 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Zdieľať prostredníctvom"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Otvoriť v prehliadači"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopírovať"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index be236d6..2cc5c02 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Deli z drugimi prek"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Odpri v brskalniku"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopiraj"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c28e12f..fb8361e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Дељење преко"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Отвори у прегледачу"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Копирај"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 84f8672..3e9598c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Sparat,"</string>
<string name="download_failed" msgid="7860650496473302012">"Bilagan hämtades inte."</string>
<string name="attachments_header" msgid="6459475590011460229">"Bilagor"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <string name="menu_photo_save_all" msgid="4295226099481995348">"Spara alla"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"Dela"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"Dela alla"</string>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Dela via"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Öppna i webbläsaren"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Fotot infogas …"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"Det går inte att flytta meddelandena. De markerade objekten kommer från flera olika konton."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 6790fef..e9c3e90 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Shiriki kupitia"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Fungua katika Kivinjari"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Nakili"</string>
diff --git a/res/values-sw720dp-port/constants.xml b/res/values-sw720dp-port/constants.xml
index 1822f5d..577d926 100644
--- a/res/values-sw720dp-port/constants.xml
+++ b/res/values-sw720dp-port/constants.xml
@@ -19,6 +19,12 @@
<!-- Whether the list is collapsed in conversation view mode -->
<bool name="list_collapsed">true</bool>
+ <!-- Search results in portrait mode on 10" tablets should still show wide conversation
+ list items.
+ Note: this this value should be set with the same qualifiers where
+ show_two_pane_search_results is set to false -->
+ <integer name="conversation_list_search_header_mode">0</integer>
+
<!-- Whether to show single or 2 pane search results -->
<bool name="show_two_pane_search_results">false</bool>
</resources>
\ No newline at end of file
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 7b07b0b..6262da4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"บันทึกแล้ว"</string>
<string name="download_failed" msgid="7860650496473302012">"ไม่สามารถดาวน์โหลด"</string>
<string name="attachments_header" msgid="6459475590011460229">"ไฟล์แนบ"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <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>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"แบ่งปันผ่าน"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"เปิดในเบราว์เซอร์"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"กำลังแทรกรูปภาพ…"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"ย้ายไม่ได้เนื่องจากข้อความที่เลือกมาจากหลายบัญชี"</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 9790ec9..e018802 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Ibahagi sa pamamagitan ng"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Buksan sa Browser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopyahin"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 36ffea9..191b475 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Şunu kullanarak paylaş:"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Tarayıcıda Aç"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopyala"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1f88ce3..bd5ae2c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Збережено,"</string>
<string name="download_failed" msgid="7860650496473302012">"Помилка завантаження"</string>
<string name="attachments_header" msgid="6459475590011460229">"Вкладені файли"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <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>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Надіслати через"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Відкрити у веб-переглядачі"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Вставлення фотографії…"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"Неможливо перемістити, оскільки вибрано декілька облікових записів."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index dbfdc91..02ef8b1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -116,11 +116,10 @@
<string name="saved" msgid="6977782468220926548">"Đã lưu,"</string>
<string name="download_failed" msgid="7860650496473302012">"Không thể tải xuống."</string>
<string name="attachments_header" msgid="6459475590011460229">"Tệp đính kèm"</string>
- <!-- no translation found for menu_photo_save_all (4295226099481995348) -->
- <skip />
- <!-- no translation found for menu_photo_share (2214772815165829079) -->
- <skip />
- <!-- no translation found for menu_photo_share_all (4577299400844129078) -->
+ <string name="menu_photo_save_all" msgid="4295226099481995348">"Lưu tất cả"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"Chia sẻ"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"C.sẻ t.cả"</string>
+ <!-- no translation found for saving (925514721138014677) -->
<skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Chia sẻ qua"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Mở trong Trình duyệt"</string>
@@ -337,8 +336,6 @@
</plurals>
<string name="dialog_inserting_camera_photo" msgid="2711654208680211224">"Đang chèn ảnh…"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"Không thể di chuyển vì lựa chọn chứa nhiều tài khoản."</string>
- <!-- no translation found for multiple_new_message_notification_item (9125239830562919898) -->
- <skip />
- <!-- no translation found for single_new_message_notification_big_text (291800374285445488) -->
- <skip />
+ <string name="multiple_new_message_notification_item" msgid="9125239830562919898"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>" <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
+ <string name="single_new_message_notification_big_text" msgid="291800374285445488">"<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
</resources>
diff --git a/res/values-w1000dp/constants.xml b/res/values-w1000dp/constants.xml
new file mode 100644
index 0000000..35093e2
--- /dev/null
+++ b/res/values-w1000dp/constants.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2011 Google Inc.
+ Licensed to The Android Open Source Project.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources>
+ <integer name="conversation_list_header_mode">0</integer>
+ <integer name="conversation_list_search_header_mode">0</integer>
+</resources>
\ No newline at end of file
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 17e3a4d..cd7d4e3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"分享方式："</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"在浏览器中打开"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"复制"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d7c7499..5a4fbfd 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"分享方式"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"在瀏覽器中開啟"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"複製"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8bb7eae..2332538 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -122,6 +122,8 @@
<skip />
<!-- no translation found for menu_photo_share_all (4577299400844129078) -->
<skip />
+ <!-- no translation found for saving (925514721138014677) -->
+ <skip />
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Abelana nge"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"Vula kwisiphequluli"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Kopisha"</string>
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 9eeae8e..114c9e3 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -20,6 +20,7 @@
<integer name="use_tablet_ui">0</integer>
<integer name="conversation_list_header_mode">1</integer>
<integer name="conversation_header_mode">1</integer>
+ <integer name="conversation_list_search_header_mode">1</integer>
<!-- left/right conversations will auto-load if they have no more than this number of messages -->
<integer name="max_auto_load_messages">20</integer>
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 6da2274..55056b0 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -969,7 +969,7 @@
private void updateBackground(boolean isUnread) {
if (isUnread) {
- if (mTabletDevice && mViewMode.getMode() == ViewMode.CONVERSATION_LIST) {
+ if (mTabletDevice && mViewMode.isListMode()) {
if (mChecked) {
setBackgroundResource(R.drawable.list_conversation_wide_unread_selected_holo);
} else {
@@ -983,7 +983,7 @@
}
}
} else {
- if (mTabletDevice && mViewMode.getMode() == ViewMode.CONVERSATION_LIST) {
+ if (mTabletDevice && mViewMode.isListMode()) {
if (mChecked) {
setBackgroundResource(R.drawable.list_conversation_wide_read_selected_holo);
} else {
@@ -1294,9 +1294,9 @@
*/
public void toggleSelectionOrBeginDrag() {
// If we are in one pane mode, or we are looking at conversations, drag
- // and drop is
- // meaningless. Toggle checkmark and return early.
- if (!Utils.useTabletUI(mContext) || mViewMode.getMode() != ViewMode.CONVERSATION_LIST) {
+ // and drop is meaningless. Toggle checkmark and return early.
+ if (!Utils.useTabletUI(mContext)
+ || !mViewMode.isListMode()) {
toggleCheckMark();
return;
}
diff --git a/src/com/android/mail/browse/ConversationItemViewCoordinates.java b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
index bc5a95f..8e40874 100644
--- a/src/com/android/mail/browse/ConversationItemViewCoordinates.java
+++ b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
@@ -134,10 +134,17 @@
* Returns the mode of the header view (Wide/Normal/Narrow).
*/
public static int getMode(Context context, ViewMode viewMode) {
- Resources res = context.getResources();
- return viewMode.getMode() == ViewMode.CONVERSATION_LIST ? res
- .getInteger(R.integer.conversation_list_header_mode) : res
- .getInteger(R.integer.conversation_header_mode);
+ final Resources res = context.getResources();
+ switch (viewMode.getMode()) {
+ case ViewMode.CONVERSATION_LIST:
+ return res.getInteger(R.integer.conversation_list_header_mode);
+
+ case ViewMode.SEARCH_RESULTS_LIST:
+ return res.getInteger(R.integer.conversation_list_search_header_mode);
+
+ default:
+ return res.getInteger(R.integer.conversation_header_mode);
+ }
}
/**
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 9937923..bc501ad 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -119,7 +119,7 @@
protected Account mAccount;
private Folder mFolder;
- protected ActionBarView mActionBarView;
+ protected MailActionBarView mActionBarView;
protected final RestrictedActivity mActivity;
protected final Context mContext;
private final FragmentManager mFragmentManager;
@@ -304,7 +304,10 @@
// be sure to inherit from the ActionBar theme when inflating
final LayoutInflater inflater = LayoutInflater.from(actionBar.getThemedContext());
- mActionBarView = (ActionBarView) inflater.inflate(R.layout.actionbar_view, null);
+ final boolean isSearch = mActivity.getIntent() != null
+ && Intent.ACTION_SEARCH.equals(mActivity.getIntent().getAction());
+ mActionBarView = (MailActionBarView) inflater.inflate(
+ isSearch ? R.layout.search_actionbar_view : R.layout.actionbar_view, null);
// Why have a different variable for the same thing? We should apply
// the same actions
// on mActionBarView instead.
diff --git a/src/com/android/mail/ui/ActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
similarity index 91%
rename from src/com/android/mail/ui/ActionBarView.java
rename to src/com/android/mail/ui/MailActionBarView.java
index c8681cb..49e8061 100644
--- a/src/com/android/mail/ui/ActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -51,16 +51,17 @@
import com.android.mail.utils.Utils;
/**
- * View to manage the various states of the Mail Action Bar
+ * View to manage the various states of the Mail Action Bar.
+ * <p>
+ * This also happens to be the custom view we supply to ActionBar.
*
- * TODO(viki): Include ConversationSubjectDisplayer here as well.
*/
-public final class ActionBarView extends LinearLayout implements OnNavigationListener,
+public class MailActionBarView extends LinearLayout implements OnNavigationListener,
ViewMode.ModeChangeListener, OnQueryTextListener, OnSuggestionListener,
MenuItem.OnActionExpandListener, SubjectDisplayChanger {
- private ActionBar mActionBar;
- private RestrictedActivity mActivity;
- private ActivityController mController;
+ protected ActionBar mActionBar;
+ protected RestrictedActivity mActivity;
+ protected ActivityController mController;
private View mFolderView;
/**
* The current mode of the ActionBar. This references constants in {@link ViewMode}
@@ -103,15 +104,15 @@
private boolean mIgnoreFirstNavigation = true;
private final boolean mShowConversationSubject;
- public ActionBarView(Context context) {
+ public MailActionBarView(Context context) {
this(context, null);
}
- public ActionBarView(Context context, AttributeSet attrs) {
+ public MailActionBarView(Context context, AttributeSet attrs) {
this(context, attrs, 0);
}
- public ActionBarView(Context context, AttributeSet attrs, int defStyle) {
+ public MailActionBarView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
mShowConversationSubject = getResources().getBoolean(R.bool.show_conversation_subject);
@@ -133,6 +134,20 @@
}
}
+ /**
+ * Get the search menu item.
+ */
+ protected MenuItem getSearch() {
+ return mSearch;
+ }
+
+ /**
+ * Get whether to show the conversation subject in the action bar.
+ */
+ protected boolean showConversationSubject() {
+ return mShowConversationSubject;
+ }
+
public boolean onCreateOptionsMenu(Menu menu) {
// If the mode is valid, then set the initial menu
if (mMode == ViewMode.UNKNOWN) {
@@ -353,6 +368,10 @@
mActivity.invalidateOptionsMenu();
}
+ protected int getMode() {
+ return mMode;
+ }
+
public boolean onPrepareOptionsMenu(Menu menu) {
// We start out with every option enabled. Based on the current view, we disable actions
// that are possible.
@@ -408,23 +427,6 @@
setStandardMode();
}
break;
- case ViewMode.SEARCH_RESULTS_LIST:
- setStandardMode();
- setPopulatedSearchView();
- // Remove focus from the search action menu in search results mode so the IME and
- // the suggestions don't get in the way.
- if (mSearch != null) {
- mSearchWidget = (SearchView) mSearch.getActionView();
- mSearchWidget.clearFocus();
- }
- break;
- case ViewMode.SEARCH_RESULTS_CONVERSATION:
- mActionBar.setDisplayHomeAsUpEnabled(true);
- setStandardMode();
- if (!mShowConversationSubject) {
- setPopulatedSearchView();
- }
- break;
case ViewMode.FOLDER_LIST:
mActionBar.setDisplayHomeAsUpEnabled(true);
mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE,
@@ -448,23 +450,11 @@
/**
* Set the actionbar mode to standard mode: no list navigation.
*/
- private void setStandardMode() {
+ protected void setStandardMode() {
mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
}
- private void setPopulatedSearchView() {
- if (mSearch != null) {
- mSearch.expandActionView();
- String query = mActivity.getIntent().getStringExtra(
- ConversationListContext.EXTRA_SEARCH_QUERY);
- if (!TextUtils.isEmpty(query)) {
- mSearchWidget.setQuery(query, false);
- }
- mSearchWidget.clearFocus();
- }
- }
-
public void removeBackButton() {
if (mActionBar == null) {
return;
@@ -554,6 +544,7 @@
// un-populated, leading to a crash. So claim that we have handled the event.
return true;
}
+ collapseSearch();
final String query = c.getString(c.getColumnIndex(SearchManager.SUGGEST_COLUMN_QUERY));
mController.onSearchRequested(query);
return true;
@@ -578,15 +569,13 @@
@Override
public boolean onMenuItemActionCollapse(MenuItem item) {
- // Work around b/6664203 by manually forcing this view to be VISIBLE upon ActionView
- // collapse. DISPLAY_SHOW_CUSTOM will still control its final visibility.
+ // Work around b/6664203 by manually forcing this view to be VISIBLE
+ // upon ActionView collapse. DISPLAY_SHOW_CUSTOM will still control its final
+ // visibility.
setVisibility(VISIBLE);
-
- // When the action menu is collapsed, we have performed a search, pop the search fragment.
- mController.exitSearchMode();
- // Have to return true here. Unlike other callbacks, the return value here is whether
- // we want to suppress the action (rather than consume the action). We don't want to
- // suppress the action.
+ // Have to return true here. Unlike other callbacks, the return value
+ // here is whether we want to suppress the action (rather than consume the action). We
+ // don't want to suppress the action.
return true;
}
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index dc7a684..b1a0030 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -144,7 +144,7 @@
// When entering conversation list mode, hide and clean up any currently visible
// conversation.
// TODO: improve this transition
- if (newMode == ViewMode.CONVERSATION_LIST) {
+ if (newMode == ViewMode.CONVERSATION_LIST || newMode == ViewMode.SEARCH_RESULTS_LIST) {
mPagerController.hide();
}
}
@@ -316,7 +316,7 @@
}
} else if (mode == ViewMode.SEARCH_RESULTS_LIST) {
mActivity.finish();
- } else if (mode == ViewMode.CONVERSATION_LIST && !inInbox(mAccount, mConvListContext)) {
+ } else if (mViewMode.isListMode() && !inInbox(mAccount, mConvListContext)) {
if (mLastFolderListTransactionId != INVALID_ID) {
// If the user got here by navigating via the folder list, back
// should bring them back to the folder list.
@@ -398,7 +398,7 @@
final int mode = mViewMode.getMode();
if (mode == ViewMode.SEARCH_RESULTS_LIST) {
mActivity.finish();
- } else if ((!inInbox(mAccount, mConvListContext) && mode == ViewMode.CONVERSATION_LIST)
+ } else if ((!inInbox(mAccount, mConvListContext) && mViewMode.isListMode())
|| mode == ViewMode.CONVERSATION
|| mode == ViewMode.FOLDER_LIST
|| mode == ViewMode.SEARCH_RESULTS_CONVERSATION) {
@@ -448,10 +448,12 @@
if (op != null && mAccount.supportsCapability(UIProvider.AccountCapabilities.UNDO)) {
final int mode = mViewMode.getMode();
switch (mode) {
+ case ViewMode.SEARCH_RESULTS_CONVERSATION:
case ViewMode.CONVERSATION:
mUndoBarView.show(true, mActivity.getActivityContext(), op, mAccount,
null, null);
break;
+ case ViewMode.SEARCH_RESULTS_LIST:
case ViewMode.CONVERSATION_LIST:
final ConversationListFragment convList = getConversationListFragment();
if (convList != null) {
diff --git a/src/com/android/mail/ui/SearchMailActionBarView.java b/src/com/android/mail/ui/SearchMailActionBarView.java
new file mode 100644
index 0000000..934e35a
--- /dev/null
+++ b/src/com/android/mail/ui/SearchMailActionBarView.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2012 Google Inc.
+ * Licensed to The Android Open Source Project.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.mail.ui;
+
+import android.app.ActionBar;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.SearchView;
+
+import com.android.mail.ConversationListContext;
+import com.android.mail.R;
+import com.android.mail.providers.UIProvider.AccountCapabilities;
+import com.android.mail.providers.UIProvider.FolderCapabilities;
+import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
+
+public class SearchMailActionBarView extends MailActionBarView {
+
+ public SearchMailActionBarView(Context context) {
+ this(context, null);
+ }
+
+ public SearchMailActionBarView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public SearchMailActionBarView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ // We start out with every option enabled. Based on the current view, we disable actions
+ // that are possible.
+ super.onPrepareOptionsMenu(menu);
+ switch (getMode()) {
+ case ViewMode.SEARCH_RESULTS_LIST:
+ setStandardMode();
+ setPopulatedSearchView();
+ // Remove focus from the search action menu in search results mode so the IME and
+ // the suggestions don't get in the way.
+ MenuItem search = getSearch();
+ if (search != null) {
+ SearchView searchWidget = (SearchView) search.getActionView();
+ searchWidget.clearFocus();
+ }
+ break;
+ case ViewMode.SEARCH_RESULTS_CONVERSATION:
+ mActionBar.setDisplayHomeAsUpEnabled(true);
+ setStandardMode();
+ if (!showConversationSubject()) {
+ setPopulatedSearchView();
+ }
+ break;
+ }
+ return false;
+ }
+
+
+ private void setPopulatedSearchView() {
+ MenuItem search = getSearch();
+ if (search != null) {
+ search.expandActionView();
+ String query = mActivity.getIntent().getStringExtra(
+ ConversationListContext.EXTRA_SEARCH_QUERY);
+ SearchView searchWidget = (SearchView) search.getActionView();
+ if (!TextUtils.isEmpty(query)) {
+ searchWidget.setQuery(query, false);
+ }
+ searchWidget.clearFocus();
+ }
+ }
+
+ @Override
+ public boolean onMenuItemActionCollapse(MenuItem item) {
+ super.onMenuItemActionCollapse(item);
+ // Work around b/6664203 by manually forcing this view to be VISIBLE
+ // upon ActionView collapse. DISPLAY_SHOW_CUSTOM will still control its final
+ // visibility.
+ int mode = getMode();
+ if (mode == ViewMode.SEARCH_RESULTS_LIST
+ || (Utils.showTwoPaneSearchResults(getContext())
+ && mode == ViewMode.SEARCH_RESULTS_CONVERSATION)) {
+
+ // When the action menu is collapsed, we have performed a search,
+ // pop the search fragment.
+ mController.exitSearchMode();
+ }
+ // Have to return true here. Unlike other callbacks, the return value
+ // here is whether we want to suppress the action (rather than consume the action). We
+ // don't want to suppress the action.
+ return true;
+ }
+}
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 3ba5acb..e3d8deb 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -201,7 +201,7 @@
@Override
public void resetActionBarIcon() {
- if (mViewMode.getMode() == ViewMode.CONVERSATION_LIST) {
+ if (mViewMode.isListMode()) {
mActionBarView.removeBackButton();
} else {
mActionBarView.setBackButton();
@@ -361,6 +361,7 @@
final FrameLayout.LayoutParams params;
final ConversationListFragment convList = getConversationListFragment();
switch (mode) {
+ case ViewMode.SEARCH_RESULTS_LIST:
case ViewMode.CONVERSATION_LIST:
params = (FrameLayout.LayoutParams) mUndoBarView.getLayoutParams();
params.width = mLayout.computeConversationListWidth();
@@ -371,6 +372,7 @@
convList.getAnimatedAdapter(), mConversationListCursor);
}
break;
+ case ViewMode.SEARCH_RESULTS_CONVERSATION:
case ViewMode.CONVERSATION:
if (op.mBatch) {
// Show undo bar in the conversation list.
diff --git a/src/com/android/mail/ui/ViewMode.java b/src/com/android/mail/ui/ViewMode.java
index da93f31..8de4431 100644
--- a/src/com/android/mail/ui/ViewMode.java
+++ b/src/com/android/mail/ui/ViewMode.java
@@ -165,6 +165,13 @@
}
/**
+ * Return whether the current mode is considered a list mode.
+ */
+ public boolean isListMode() {
+ return mMode == ViewMode.CONVERSATION_LIST || mMode == ViewMode.SEARCH_RESULTS_LIST;
+ }
+
+ /**
* Restoring from a saved state restores only the mode. It does not restore the listeners of
* this object.
* @param inState