Merge "New content description string." into jb-ub-mail
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d395bdc..b5512be 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>&gt via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Boodskap as konsep gestoor."</string>
- <string name="sending_message" msgid="1498583163419122128">"Stuur tans boodskap…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Die adres <xliff:g id="WRONGEMAIL">%s</xliff:g> is ongeldig."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Wys aangehaalde teks"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Versteek aangehaalde teks"</string>
@@ -304,7 +305,7 @@
<item msgid="7109065688039971961">"Geen verbinding nie."</item>
<item msgid="8437496123716232060">"Kon nie aanmeld nie."</item>
<item msgid="1651266301325684887">"Sekuriteitsfout"</item>
- <item msgid="1461520171154288533">"Kon nie sinchroniseer nie."</item>
+ <item msgid="1461520171154288533">"Kon nie sinkroniseer nie."</item>
<item msgid="8749857841162829469">"Fout"</item>
</string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Raak om op te stel"</string>
@@ -351,8 +352,8 @@
<string name="signin" msgid="8958889809095796177">"Meld aan"</string>
<string name="info" msgid="6009817562073541204">"Inligting"</string>
<string name="report" msgid="5417082746232614958">"Gee aan"</string>
- <string name="sync_error" msgid="7368819509040597851">"Kon nie sinchroniseer nie."</string>
- <string name="sync_error_message" msgid="5367907194753034375">"Jou toestel het nie genoeg stoorplek om te sinchroniseer nie."</string>
+ <string name="sync_error" msgid="7368819509040597851">"Kon nie sinkroniseer nie."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Jou toestel het nie genoeg stoorplek om te sinkroniseer nie."</string>
<string name="storage" msgid="3262760336059073446">"Berging"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index faff476..d7e1c61 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> በ<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> በኩል"</string>
<string name="message_saved" msgid="7073947895562277576">"መልዕክት እንደረቂቅ ተቀምጧል።"</string>
- <string name="sending_message" msgid="1498583163419122128">"መልዕክት በመላክ ላይ…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> አድራሻ ልክ አይደለም።"</string>
<string name="show_elided" msgid="5255917904110437886">"▶ ትምህርተ ጥቅስ የተደረገባቸውን ፅሁፎች አሳይ"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ ትምህርተ ጥቅስ የተደረገባቸውን ፅሁፎች ደብቅ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 851de60..dbea69b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> عبر <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"تمّ حفظ الرسالة كمسودة."</string>
- <string name="sending_message" msgid="1498583163419122128">"جارٍ إرسال الرسالة…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"العنوان <xliff:g id="WRONGEMAIL">%s</xliff:g> غير صالح."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ عرض النص المقتبس"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ إخفاء النص المقتبس"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 17ac8fd..4a603b5 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> праз <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Паведамленне захавана як чарнавік."</string>
- <string name="sending_message" msgid="1498583163419122128">"Адпраўка паведамлення..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Адрас <xliff:g id="WRONGEMAIL">%s</xliff:g> несапраўдны."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Паказаць цытуемы тэкст"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Схаваць цытуемы тэкст"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index cbc2f56..31316ce 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> чрез <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Съобщението е запазено като чернова."</string>
- <string name="sending_message" msgid="1498583163419122128">"Съобщението се изпраща…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Адресът <xliff:g id="WRONGEMAIL">%s</xliff:g> е невалиден."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Показване на цитирания текст"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Скриване на цитирания текст"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 937f2ae..3507aba 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> a través de <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Missatge desat com a esborrany."</string>
- <string name="sending_message" msgid="1498583163419122128">"S\'està enviant el missatge…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"L\'adreça <xliff:g id="WRONGEMAIL">%s</xliff:g> no és vàlida."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Mostra el text citat"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Amaga el text citat"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0635c2c..33e9c86 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> prostřednictvím <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Zpráva byla uložena jako koncept."</string>
- <string name="sending_message" msgid="1498583163419122128">"Odesílání zprávy…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> je neplatná."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Zobrazit citovaný text"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Skrýt citovaný text"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8318965..b95901a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Meddelelsen er gemt som kladde."</string>
- <string name="sending_message" msgid="1498583163419122128">"Sender meddelelsen..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> er ugyldig."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Vis citeret tekst"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Skjul citeret tekst"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7f2109c..c026523 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> über <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Nachricht wurde als Entwurf gespeichert."</string>
- <string name="sending_message" msgid="1498583163419122128">"Nachricht wird gesendet…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Die Adresse <xliff:g id="WRONGEMAIL">%s</xliff:g> ist ungültig."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Zitierten Text anzeigen"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Zitierten Text ausblenden"</string>
@@ -349,7 +350,7 @@
<item msgid="3584541772344786752">"Alle Ordner"</item>
</string-array>
<string name="signin" msgid="8958889809095796177">"Anmelden"</string>
- <string name="info" msgid="6009817562073541204">"Informationen"</string>
+ <string name="info" msgid="6009817562073541204">"Details"</string>
<string name="report" msgid="5417082746232614958">"Feedback"</string>
<string name="sync_error" msgid="7368819509040597851">"Synchronisierung nicht möglich"</string>
<string name="sync_error_message" msgid="5367907194753034375">"Das Gerät verfügt nicht über genügend Speicherplatz für die Synchronisierung."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ebb1626..b418ef6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> μέσω <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Το μήνυμα αποθηκεύτηκε ως πρόχειρο."</string>
- <string name="sending_message" msgid="1498583163419122128">"Αποστολή μηνύματος..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Η διεύθυνση <xliff:g id="WRONGEMAIL">%s</xliff:g> δεν είναι έγκυρη."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Εμφάνιση αναφερόμενου κειμένου"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Απόκρυψη αναφερόμενου κειμένου"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index dafd8db..8492fe1 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Message saved as draft."</string>
- <string name="sending_message" msgid="1498583163419122128">"Sending message…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"The address <xliff:g id="WRONGEMAIL">%s</xliff:g> is invalid."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Show quoted text"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Hide quoted text"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 62c16b9..d49b7dd 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> por <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
- <string name="sending_message" msgid="1498583163419122128">"Enviando mensaje…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"La dirección <xliff:g id="WRONGEMAIL">%s</xliff:g> no es válida."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Mostrar el texto citado"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar el texto citado"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 587a232..fc1a796 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> vía <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
- <string name="sending_message" msgid="1498583163419122128">"Enviando mensaje..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"La dirección <xliff:g id="WRONGEMAIL">%s</xliff:g> no es válida."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Mostrar texto citado"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto citado"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 26125ea..9c3413a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>: <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Sõnum salvestati mustandina."</string>
- <string name="sending_message" msgid="1498583163419122128">"Sõnumi saatmine ..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Aadress <xliff:g id="WRONGEMAIL">%s</xliff:g> on kehtetu."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Kuva osundatud tekst"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Peida osundatud tekst"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5a0f0ed..f9f2845 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> از طریق <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"پیام بهعنوان پیشنویس ذخیره شد."</string>
- <string name="sending_message" msgid="1498583163419122128">"در حال ارسال پیام..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"آدرس <xliff:g id="WRONGEMAIL">%s</xliff:g> معتبر نیست."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ نمایش نوشتار نقل قول شده"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ پنهان کردن نوشتار نقل قول شده"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6aaf692..06e7097 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> toimialueelta <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Viesti tallennettu luonnokseksi."</string>
- <string name="sending_message" msgid="1498583163419122128">"Lähetetään viestiä…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Osoite <xliff:g id="WRONGEMAIL">%s</xliff:g> ei kelpaa."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Näytä lainattu teksti"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Piilota lainattu teksti"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8d902ce..1dd1e19 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Brouillon enregistré."</string>
- <string name="sending_message" msgid="1498583163419122128">"Envoi du message en cours…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"L\'adresse <xliff:g id="WRONGEMAIL">%s</xliff:g> est incorrecte."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Afficher le texte des messages précédents"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Masquer le texte des messages précédents"</string>
@@ -301,7 +302,7 @@
<string name="folders_activity_instructions" msgid="5237801615196958918">"Aucun dossier n\'a été défini pour ce compte."</string>
<string-array name="sync_status">
<item msgid="2446076619901049026">"Opération réussie."</item>
- <item msgid="7109065688039971961">"Aucune connexion."</item>
+ <item msgid="7109065688039971961">"Aucune connexion"</item>
<item msgid="8437496123716232060">"Connexion impossible."</item>
<item msgid="1651266301325684887">"Erreur de sécurité."</item>
<item msgid="1461520171154288533">"Synchronisation impossible."</item>
@@ -352,7 +353,7 @@
<string name="info" msgid="6009817562073541204">"Informations"</string>
<string name="report" msgid="5417082746232614958">"Signaler"</string>
<string name="sync_error" msgid="7368819509040597851">"Synchronisation impossible"</string>
- <string name="sync_error_message" msgid="5367907194753034375">"Synchronisation impossible, car l\'espace de stockage est insuffisant sur l\'appareil"</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"Synchronisation impossible, car l\'espace de stockage est insuffisant sur l\'appareil."</string>
<string name="storage" msgid="3262760336059073446">"Stockage"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4fe9311..7e23b82 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -99,7 +99,7 @@
<string name="bytes" msgid="8851050881674287386">"B"</string>
<string name="kilobytes" msgid="8506546136898321025">"KB"</string>
<string name="megabytes" msgid="1469217534120857347">"MB"</string>
- <string name="attachment_image" msgid="3832985223906528449">"छवि"</string>
+ <string name="attachment_image" msgid="3832985223906528449">"चित्र"</string>
<string name="attachment_video" msgid="7526134752988603154">"वीडियो"</string>
<string name="attachment_audio" msgid="135527133955622936">"ऑडियो"</string>
<string name="attachment_text" msgid="5544874374971562759">"पाठ"</string>
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> <xliff:g id="VIA_DOMAIN">%3$s</xliff:g> के माध्यम से"</string>
<string name="message_saved" msgid="7073947895562277576">"संदेश ड्राफ़्ट के रूप में सहेजा गया."</string>
- <string name="sending_message" msgid="1498583163419122128">"संदेश भेज रहा है..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> पता अमान्य है."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ उद्धृत पाठ दिखाएं"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ उद्धृत पाठ छिपाएं"</string>
@@ -337,7 +338,7 @@
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"यह खाता स्वचालित रूप से समन्वयित करने के लिए सेट नहीं है. "\n"एक बार मेल समन्वयित करने के लिए, "<b>"अभी समन्वयित करें"</b>" स्पर्श करें, या इस खाते को मेल स्वचालित रूप से समन्वयित करने के लिए सेट करने हेतु "<b>"समन्वयन सेटिंग बदलें"</b>" स्पर्श करें."</string>
<string name="manual_sync" msgid="6743983544685622800">"अभी समन्वयित करें"</string>
<string name="change_sync_settings" msgid="5514293926214426577">"समन्वयन सेटिंग बदलें"</string>
- <string name="photo_load_failed" msgid="8811324070219403896">"छवि लोड नहीं की जा सकी"</string>
+ <string name="photo_load_failed" msgid="8811324070219403896">"चित्र लोड नहीं की जा सकी"</string>
<string name="cant_move_or_change_labels" msgid="7997792014816166601">"चयन में एकाधिक खाते होने के कारण नहीं ले जाया जा सकता."</string>
<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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 4f7714a..cc6c4cc 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> preko <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Poruka je spremljena kao skica."</string>
- <string name="sending_message" msgid="1498583163419122128">"Slanje poruke…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> nije važeća."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Prikaži citirani tekst"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Sakrij citirani tekst"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 51efbc7..ae7035d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> -- <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Az üzenet mentve piszkozatként."</string>
- <string name="sending_message" msgid="1498583163419122128">"Üzenet küldése…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"A(z) <xliff:g id="WRONGEMAIL">%s</xliff:g> cím érvénytelen."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Idézett szöveg megjelenítése"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Idézett szöveg elrejtése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 7739e5e..3e05994 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Pesan disimpan sebagai draf."</string>
- <string name="sending_message" msgid="1498583163419122128">"Mengirim pesan…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak valid."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Tampilkan kutipan teks"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan kutipan teks"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a85c4bb..0f53b15 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> tramite <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Messaggio salvato come bozza."</string>
- <string name="sending_message" msgid="1498583163419122128">"Invio messaggio..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"L\'indirizzo <xliff:g id="WRONGEMAIL">%s</xliff:g> non è valido."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Mostra testo citato"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Nascondi testo citato"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 098db0e..46dd31b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> דרך <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"ההודעה נשמרה כטיוטה."</string>
- <string name="sending_message" msgid="1498583163419122128">"שולח הודעה…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"הכתובת <xliff:g id="WRONGEMAIL">%s</xliff:g> אינה חוקית."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ הצג טקסט מצוטט"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ הסתר טקסט מצוטט"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 93d493e..e9f21e5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>経由の<xliff:g id="NAME">%1$s</xliff:g><<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="message_saved" msgid="7073947895562277576">"メッセージを下書きとして保存しました。"</string>
- <string name="sending_message" msgid="1498583163419122128">"メールを送信中..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"アドレス<xliff:g id="WRONGEMAIL">%s</xliff:g>は無効です。"</string>
<string name="show_elided" msgid="5255917904110437886">"▶元のメッセージを表示"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼元のメッセージを隠す"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1fcc8ef..2c4081e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>(<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> 경유)"</string>
<string name="message_saved" msgid="7073947895562277576">"메일이 임시보관함에 저장되었습니다."</string>
- <string name="sending_message" msgid="1498583163419122128">"메일 보내는 중..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"주소(<xliff:g id="WRONGEMAIL">%s</xliff:g>)가 잘못되었습니다."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ 받은메일 표시"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ 받은메일 숨기기"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6f535a4..f5d72f0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> per <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Pranešimas išsaugotas kaip juodraštis."</string>
- <string name="sending_message" msgid="1498583163419122128">"Siunčiamas pranešimas…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adresas <xliff:g id="WRONGEMAIL">%s</xliff:g> yra neteisingas."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Rodyti citatą"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Slėpti citatą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index a8e62ff..9d8f391 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> caur <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Ziņojums ir saglabāts kā melnraksts."</string>
- <string name="sending_message" msgid="1498583163419122128">"Notiek ziņojuma sūtīšana…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adrese <xliff:g id="WRONGEMAIL">%s</xliff:g> nav derīga."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Rādīt citēto tekstu"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Paslēpt citēto tekstu"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index d1c05a3..14a0260 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> melalui <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Mesej disimpan sebagai draf."</string>
- <string name="sending_message" msgid="1498583163419122128">"Menghantar mesej..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak sah."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Tunjukkan teks yang dipetik"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan teks yang dipetik"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ce68f44..7c2110b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"E-posten er lagret som utkast."</string>
- <string name="sending_message" msgid="1498583163419122128">"Sender e-post …"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> er ugyldig."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Vis sitert tekst"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Skjul sitert tekst"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 707005c..6236e93 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Bericht opgeslagen als concept."</string>
- <string name="sending_message" msgid="1498583163419122128">"Bericht wordt verzonden…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Het adres \'<xliff:g id="WRONGEMAIL">%s</xliff:g>\' is ongeldig."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Tekst uit oorspronkelijk bericht weergeven"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Tekst uit oorspronkelijk bericht verbergen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8b1d0b0..d157b76 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -281,7 +281,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> przez <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Wiadomość została zapisana jako wersja robocza."</string>
- <string name="sending_message" msgid="1498583163419122128">"Wysyłanie wiadomości…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adres <xliff:g id="WRONGEMAIL">%s</xliff:g> jest nieprawidłowy."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Pokaż cytowany tekst"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ukryj cytowany tekst"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 576dd5b..42643ea 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Mensagem guardada como rascunho."</string>
- <string name="sending_message" msgid="1498583163419122128">"A enviar mensagem..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> não é válido."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Mostrar texto citado"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto citado"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 887c032..2d77da9 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> por <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Mensagem salva como rascunho."</string>
- <string name="sending_message" msgid="1498583163419122128">"Enviando mensagem…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> é inválido."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Exibir texto das mensagens anteriores"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar texto das mensagens anteriores"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index cea40fe..e262efb 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -397,7 +397,7 @@
<skip />
<!-- no translation found for message_saved (7073947895562277576) -->
<skip />
- <!-- no translation found for sending_message (1498583163419122128) -->
+ <!-- no translation found for sending_message (2822171587017313151) -->
<skip />
<!-- no translation found for invalid_recipient (2161317422860961623) -->
<skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bdc6a9c..85377f4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> prin <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Mesaj salvat ca mesaj nefinalizat."</string>
- <string name="sending_message" msgid="1498583163419122128">"Se trimite mesajul..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> este nevalidă."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Afişaţi textul citat"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ascundeţi textul citat"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ec3636b..11ff8b5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> из домена <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Черновик сообщения сохранен."</string>
- <string name="sending_message" msgid="1498583163419122128">"Отправка сообщения…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Недействительный адрес: <xliff:g id="WRONGEMAIL">%s</xliff:g>."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Показать цитируемый текст"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Скрыть цитируемый текст"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 04a6560..01e6a0b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> cez <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Správa bola uložená ako koncept."</string>
- <string name="sending_message" msgid="1498583163419122128">"Prebieha odosielanie správy..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> je neplatná."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Zobraziť citovaný text"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Skryť citovaný text"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d0aef6d..8242a15 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> prek <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Sporočilo shranjeno kot osnutek."</string>
- <string name="sending_message" msgid="1498583163419122128">"Pošiljanje sporočila ..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Naslov <xliff:g id="WRONGEMAIL">%s</xliff:g> je neveljaven."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Pokaži citirano besedilo"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Skrij citirano besedilo"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index eeb6a69..b3d82c6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> преко <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Порука је сачувана као недовршена."</string>
- <string name="sending_message" msgid="1498583163419122128">"Слање поруке…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> је неважећа."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Прикажи наведени текст"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Сакриј наведени текст"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a195024..1dd7498 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Meddelande sparat som utkast."</string>
- <string name="sending_message" msgid="1498583163419122128">"Skickar meddelande …"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> är ogiltig."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Visa citerad text"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Dölj citerad text"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7dbd17e..a51ebbd 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> < <xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> kupitia <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Ujumbe umehifadhiwa kama rasimu."</string>
- <string name="sending_message" msgid="1498583163419122128">"Inatuma ujumbe…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Anwani <xliff:g id="WRONGEMAIL">%s</xliff:g> ni batili."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Onyesha maandishi yaliyonukuliwa"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ficha maandishi yaliyonukuliwa"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 36395e9..5cfd9b8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> ผ่าน <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"บันทึกข้อความเป็นร่างจดหมาย"</string>
- <string name="sending_message" msgid="1498583163419122128">"กำลังส่งข้อความ…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"ที่อยู่ <xliff:g id="WRONGEMAIL">%s</xliff:g> ไม่ถูกต้อง"</string>
<string name="show_elided" msgid="5255917904110437886">"▶ แสดงข้อความที่ยกมา"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ ซ่อนข้อความที่ยกมา"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6900ca1..55139c6 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> gmit <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Na-save ang mensahe bilang draft."</string>
- <string name="sending_message" msgid="1498583163419122128">"Ipinapadala ang mensahe…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Ang address na <xliff:g id="WRONGEMAIL">%s</xliff:g> ay di-wasto."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Ipakita ang kasamang teksto"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Itago ang kasamang teksto"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 84daa4a..f5c7d98 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>, <xliff:g id="VIA_DOMAIN">%3$s</xliff:g> üzerinden"</string>
<string name="message_saved" msgid="7073947895562277576">"İleti taslak olarak kaydedildi."</string>
- <string name="sending_message" msgid="1498583163419122128">"İleti gönderiliyor..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> adresi geçersiz."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Alıntılanan metni göster"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Alıntılanan metni gizle"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4bb5dfc..e2bcded 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> через <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Повідомлення збережено як чернетку."</string>
- <string name="sending_message" msgid="1498583163419122128">"Надсилання повідомлення…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> не дійсна."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Показати цитований текст"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Сховати цитований текст"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 096b21f..126f33c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> qua <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
- <string name="sending_message" msgid="1498583163419122128">"Đang gửi tin nhắn…"</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Địa chỉ <xliff:g id="WRONGEMAIL">%s</xliff:g> không hợp lệ."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Hiển thị văn bản được trích dẫn"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ẩn văn bản được trích dẫn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a092b09..c663430 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> 来自 <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"邮件已另存为草稿。"</string>
- <string name="sending_message" msgid="1498583163419122128">"正在发送邮件..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 无效。"</string>
<string name="show_elided" msgid="5255917904110437886">"▶ 显示引用文字"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ 隐藏引用文字"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fe6e57a..6efdb9a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g>，<<xliff:g id="EMAIL">%2$s</xliff:g>>，來源網域：<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"已儲存郵件草稿。"</string>
- <string name="sending_message" msgid="1498583163419122128">"正在傳送郵件..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 無效。"</string>
<string name="show_elided" msgid="5255917904110437886">"▶ 顯示引用文字"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ 隱藏引用文字"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 760b1d8..d76c407 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -283,7 +283,8 @@
<string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
<string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> nge-<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
<string name="message_saved" msgid="7073947895562277576">"Umlayezo ulondolozwe njengokusalungiswa."</string>
- <string name="sending_message" msgid="1498583163419122128">"Ithumela umlayezo..."</string>
+ <!-- no translation found for sending_message (2822171587017313151) -->
+ <skip />
<string name="invalid_recipient" msgid="2161317422860961623">"Ikheli <xliff:g id="WRONGEMAIL">%s</xliff:g> alivumelekile."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Bonisa umbhalo ocashuniwe"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Fihla umbhalo ocashuniwe"</string>
diff --git a/src/com/android/mail/browse/ConversationContainer.java b/src/com/android/mail/browse/ConversationContainer.java
index 310a67e..5e0aed5 100644
--- a/src/com/android/mail/browse/ConversationContainer.java
+++ b/src/com/android/mail/browse/ConversationContainer.java
@@ -35,6 +35,7 @@
import com.android.mail.browse.ScrollNotifier.ScrollListener;
import com.android.mail.ui.ConversationViewFragment;
import com.android.mail.utils.DequeMap;
+import com.android.mail.utils.InputSmoother;
import com.android.mail.utils.LogUtils;
import com.google.common.collect.Lists;
@@ -73,6 +74,12 @@
R.id.conversation_topmost_overlay
};
+ /**
+ * Maximum scroll speed (in dp/sec) at which the snap header animation will draw.
+ * Anything faster than that, and drawing it creates visual artifacting (wagon-wheel effect).
+ */
+ private static final float SNAP_HEADER_MAX_SCROLL_SPEED = 600f;
+
private ConversationViewAdapter mOverlayAdapter;
private int[] mOverlayBottoms;
private ConversationWebView mWebView;
@@ -158,6 +165,8 @@
private boolean mDisableLayoutTracing;
+ private final InputSmoother mVelocityTracker;
+
private final DataSetObserver mAdapterObserver = new AdapterObserver();
/**
@@ -200,6 +209,8 @@
mOverlayViews = new SparseArray<OverlayView>();
+ mVelocityTracker = new InputSmoother(c);
+
mTouchSlop = ViewConfiguration.get(c).getScaledTouchSlop();
// Disabling event splitting fixes pinch-zoom when the first pointer goes down on the
@@ -340,6 +351,7 @@
@Override
public void onNotifierScroll(final int x, final int y) {
+ mVelocityTracker.onInput(y);
mDisableLayoutTracing = true;
positionOverlays(x, y);
mDisableLayoutTracing = false;
@@ -415,21 +427,7 @@
spacerIndex--;
}
- // render and/or re-position snap header
- ConversationOverlayItem snapItem = null;
- if (mSnapIndex != -1) {
- final ConversationOverlayItem item = mOverlayAdapter.getItem(mSnapIndex);
- if (item.canBecomeSnapHeader()) {
- snapItem = item;
- }
- }
- if (snapItem == null) {
- mSnapHeader.setVisibility(GONE);
- mSnapHeader.unbind();
- } else {
- snapItem.bindView(mSnapHeader, false /* measureOnly */);
- mSnapHeader.setVisibility(VISIBLE);
- }
+ positionSnapHeader(mSnapIndex);
}
/**
@@ -604,6 +602,9 @@
final OverlayView overlay = mOverlayViews.get(adapterIndex);
final ConversationOverlayItem item = mOverlayAdapter.getItem(adapterIndex);
+ // save off the item's current top for later snap calculations
+ item.setTop(overlayTopY);
+
// is the overlay visible and does it have non-zero height?
if (overlayTopY != overlayBottomY && overlayBottomY > mOffsetY
&& overlayTopY < mOffsetY + getHeight()) {
@@ -684,6 +685,53 @@
return view;
}
+ // render and/or re-position snap header
+ private void positionSnapHeader(int snapIndex) {
+ ConversationOverlayItem snapItem = null;
+ if (snapIndex != -1) {
+ final ConversationOverlayItem item = mOverlayAdapter.getItem(snapIndex);
+ if (item.canBecomeSnapHeader()) {
+ snapItem = item;
+ }
+ }
+ if (snapItem == null) {
+ mSnapHeader.setVisibility(GONE);
+ mSnapHeader.unbind();
+ return;
+ }
+
+ snapItem.bindView(mSnapHeader, false /* measureOnly */);
+ mSnapHeader.setVisibility(VISIBLE);
+
+ int overlap = 0;
+
+ final ConversationOverlayItem next = findNextPushingOverlay(snapIndex + 1);
+ if (next != null) {
+ overlap = Math.min(0, next.getTop() - mSnapHeader.getHeight() - mOffsetY);
+
+ // disable overlap drawing past a certain speed
+ if (overlap < 0) {
+ final Float v = mVelocityTracker.getSmoothedVelocity();
+ if (v != null && v > SNAP_HEADER_MAX_SCROLL_SPEED) {
+ overlap = 0;
+ }
+ }
+ }
+ mSnapHeader.setTranslateY(overlap);
+ }
+
+ // find the next header that can push the snap header up
+ private ConversationOverlayItem findNextPushingOverlay(int start) {
+ int value = -1;
+ for (int i = start, len = mOverlayAdapter.getCount(); i < len; i++) {
+ final ConversationOverlayItem next = mOverlayAdapter.getItem(i);
+ if (next.canPushSnapHeader()) {
+ return next;
+ }
+ }
+ return null;
+ }
+
/**
* Prevents any layouts from happening until the next time {@link #onGeometryChange(int[])} is
* called. Useful when you know the HTML spacer coordinates are inconsistent with adapter items.
diff --git a/src/com/android/mail/browse/ConversationOverlayItem.java b/src/com/android/mail/browse/ConversationOverlayItem.java
index c996184..71fc772 100644
--- a/src/com/android/mail/browse/ConversationOverlayItem.java
+++ b/src/com/android/mail/browse/ConversationOverlayItem.java
@@ -29,6 +29,7 @@
public abstract class ConversationOverlayItem {
private int mHeight; // in px
+ private int mTop; // in px
private boolean mNeedsMeasure;
public static final String LOG_TAG = ConversationViewFragment.LAYOUT_TAG;
@@ -80,6 +81,14 @@
}
}
+ public int getTop() {
+ return mTop;
+ }
+
+ public void setTop(int top) {
+ mTop = top;
+ }
+
public boolean isMeasurementValid() {
return !mNeedsMeasure;
}
diff --git a/src/com/android/mail/browse/HeaderBlock.java b/src/com/android/mail/browse/HeaderBlock.java
deleted file mode 100644
index 6fb934e..0000000
--- a/src/com/android/mail/browse/HeaderBlock.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.browse;
-
-/**
- * A header block in the conversation view that corresponds to a region in the web content. It may
- * also be eligible for snapping.
- *
- */
-public interface HeaderBlock {
-
- /**
- * Eligible to become a a snappy header?
- */
- boolean canSnap();
- /**
- * If eligible for snapping, returns the populated header view to snap.
- */
- MessageHeaderView getSnapView();
- /**
- * Spaces out this view in its container by this number of pixels to match its message body
- * size, if any.
- */
- void setMarginBottom(int height);
- void setVisibility(int vis);
- /**
- * Called on a header when new contact info is known for the conversation. If the header
- * displays contact info, it should refresh it.
- */
- void updateContactInfo();
- /**
- * If this header can be starred/unstarred, change whether the message header appears to be
- * starred or not. Does not actually mark the backing message starred/unstarred.
- */
- void setStarDisplay(boolean starred);
-
-}
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 18ae53f..58e7cd7 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -62,7 +62,7 @@
import java.util.Map;
public class MessageHeaderView extends LinearLayout implements OnClickListener,
- OnMenuItemClickListener, HeaderBlock, ConversationContainer.DetachListener {
+ OnMenuItemClickListener, ConversationContainer.DetachListener {
/**
* Cap very long recipient lists during summary construction for efficiency.
@@ -277,16 +277,6 @@
return mMessageHeaderItem == null || mMessageHeaderItem.isExpanded();
}
- @Override
- public boolean canSnap() {
- return isExpanded();
- }
-
- @Override
- public MessageHeaderView getSnapView() {
- return this;
- }
-
public void setSnappy(boolean snappy) {
mIsSnappy = snappy;
hideMessageDetails();
@@ -297,16 +287,6 @@
}
}
- /**
- * Check if this header's displayed data matches that of another header.
- *
- * @param other another header
- * @return true if the headers are displaying data for the same message
- */
- public boolean matches(MessageHeaderView other) {
- return other != null && mMessage != null && mMessage.equals(other.mMessage);
- }
-
@Override
public void onDetachedFromParent() {
unbind();
@@ -328,24 +308,6 @@
}
}
- public void renderUpperHeaderFrom(MessageHeaderView other) {
- mMessageHeaderItem = other.mMessageHeaderItem;
- mMessage = other.mMessage;
- mSender = other.mSender;
- mDefaultReplyAll = other.mDefaultReplyAll;
-
- mSenderNameView.setText(other.mSenderNameView.getText());
- mSenderEmailView.setText(other.mSenderEmailView.getText());
- mStarView.setSelected(other.mStarView.isSelected());
- mStarView.setContentDescription(getResources().getString(
- mStarView.isSelected() ? R.string.remove_star : R.string.add_star));
-
- updateContactInfo();
-
- mIsDraft = other.mIsDraft;
- updateChildVisibility();
- }
-
public void initialize(FormattedDateBuilder dateBuilder, Account account,
Map<String, Address> addressCache) {
mDateBuilder = dateBuilder;
@@ -662,23 +624,6 @@
findViewById(rowRes).setVisibility(VISIBLE);
}
- @Override
- public void setMarginBottom(int bottomMargin) {
- MarginLayoutParams p = (MarginLayoutParams) getLayoutParams();
- if (p.bottomMargin != bottomMargin) {
- p.bottomMargin = bottomMargin;
- setLayoutParams(p);
- }
- }
-
- public void setMarginTop(int topMargin) {
- MarginLayoutParams p = (MarginLayoutParams) getLayoutParams();
- if (p.topMargin != topMargin) {
- p.topMargin = topMargin;
- setLayoutParams(p);
- }
- }
-
public void setTranslateY(int offsetY) {
if (mDrawTranslateY != offsetY) {
mDrawTranslateY = offsetY;
@@ -773,8 +718,7 @@
return builder.build();
}
- @Override
- public void updateContactInfo() {
+ private void updateContactInfo() {
mPresenceView.setImageDrawable(null);
mPresenceView.setVisibility(GONE);
@@ -971,13 +915,6 @@
setMessageDetailsVisibility(GONE);
}
- @Override
- public void setStarDisplay(boolean starred) {
- if (mStarView.isSelected() != starred) {
- mStarView.setSelected(starred);
- }
- }
-
private void hideCollapsedDetails() {
if (mCollapsedDetailsView != null) {
mCollapsedDetailsView.setVisibility(GONE);
diff --git a/src/com/android/mail/browse/SuperCollapsedBlock.java b/src/com/android/mail/browse/SuperCollapsedBlock.java
index 2abec7a..e97cea8 100644
--- a/src/com/android/mail/browse/SuperCollapsedBlock.java
+++ b/src/com/android/mail/browse/SuperCollapsedBlock.java
@@ -29,15 +29,13 @@
import com.android.mail.R;
import com.android.mail.browse.ConversationViewAdapter.SuperCollapsedBlockItem;
import com.android.mail.utils.LogTag;
-import com.android.mail.utils.LogUtils;
/**
* A header block that expands to a list of collapsed message headers. Will notify a listener on tap
* so the listener can hide the block and reveal the corresponding collapsed message headers.
*
*/
-public class SuperCollapsedBlock extends FrameLayout implements View.OnClickListener,
- HeaderBlock {
+public class SuperCollapsedBlock extends FrameLayout implements View.OnClickListener {
public interface OnClickListener {
/**
@@ -118,34 +116,4 @@
+ r.getDimensionPixelOffset(R.dimen.message_header_vertical_margin);
}
- @Override
- public boolean canSnap() {
- return false;
- }
-
- @Override
- public MessageHeaderView getSnapView() {
- return null;
- }
-
- @Override
- public void setMarginBottom(int height) {
- // no-op. should never have a matching body.
-
- // sanity check
- if (height != 0) {
- LogUtils.d(LOG_TAG, "super-collapsed block yielded unexpected body height: %d", height);
- }
- }
-
- @Override
- public void updateContactInfo() {
- // no-op
- }
-
- @Override
- public void setStarDisplay(boolean starred) {
- // no-op
- }
-
}
diff --git a/src/com/android/mail/utils/InputSmoother.java b/src/com/android/mail/utils/InputSmoother.java
new file mode 100644
index 0000000..eaf1e45
--- /dev/null
+++ b/src/com/android/mail/utils/InputSmoother.java
@@ -0,0 +1,100 @@
+package com.android.mail.utils;
+
+import android.content.Context;
+import android.os.SystemClock;
+
+import com.google.common.collect.Lists;
+
+import java.util.Deque;
+
+/**
+ * Utility class to calculate a velocity using a moving average filter of recent input positions.
+ * Intended to smooth out touch input events.
+ */
+public class InputSmoother {
+
+ /**
+ * Some devices have significant sampling noise: it could be that samples come in too late,
+ * or that the reported position doesn't quite match up with the time. Instantaneous velocity
+ * on these devices is too jittery to be useful in deciding whether to instantly snap, so smooth
+ * out the data using a moving average over this window size. A sample window size n will
+ * effectively average the velocity over n-1 points, so n=2 is the minimum valid value (no
+ * averaging at all).
+ */
+ private static final int SAMPLING_WINDOW_SIZE = 5;
+
+ /**
+ * The maximum elapsed time (in millis) between samples that we would consider "consecutive".
+ * Only consecutive samples will factor into the rolling average sample window.
+ * Any samples that are older than this maximum are continually purged from the sample window,
+ * so as to avoid skewing the average with irrelevant older values.
+ */
+ private static final long MAX_SAMPLE_INTERVAL_MS = 200;
+
+ /**
+ * Sampling window to calculate rolling average of scroll velocity.
+ */
+ private final Deque<Sample> mRecentSamples = Lists.newLinkedList();
+ private final float mDensity;
+
+ private static class Sample {
+ int pos;
+ long millis;
+ }
+
+ public InputSmoother(Context context) {
+ mDensity = context.getResources().getDisplayMetrics().density;
+ }
+
+ public void onInput(int pos) {
+ Sample sample;
+ final long nowMs = SystemClock.uptimeMillis();
+
+ final Sample last = mRecentSamples.peekLast();
+ if (last != null && nowMs - last.millis > MAX_SAMPLE_INTERVAL_MS) {
+ mRecentSamples.clear();
+ }
+
+ if (mRecentSamples.size() == SAMPLING_WINDOW_SIZE) {
+ sample = mRecentSamples.removeFirst();
+ } else {
+ sample = new Sample();
+ }
+ sample.pos = pos;
+ sample.millis = nowMs;
+
+ mRecentSamples.add(sample);
+ }
+
+ /**
+ * Calculates velocity based on recent inputs from {@link #onInput(int)}, averaged together to
+ * smooth out jitter.
+ *
+ * @return returns velocity in dp/s, or null if not enough samples have been collected
+ */
+ public Float getSmoothedVelocity() {
+ if (mRecentSamples.size() < 2) {
+ // need at least 2 position samples to determine a velocity
+ return null;
+ }
+
+ // calculate moving average over current window
+ int totalDistancePx = 0;
+ int prevPos = mRecentSamples.getFirst().pos;
+ final long totalTimeMs = mRecentSamples.getLast().millis - mRecentSamples.getFirst().millis;
+
+ if (totalTimeMs <= 0) {
+ // samples are really fast or bad. no answer.
+ return null;
+ }
+
+ for (Sample s : mRecentSamples) {
+ totalDistancePx += Math.abs(s.pos - prevPos);
+ prevPos = s.pos;
+ }
+ final float distanceDp = totalDistancePx / mDensity;
+ // velocity in dp per second
+ return distanceDp * 1000 / totalTimeMs;
+ }
+
+}