Merge "Get the width from the parent rather than a resource." into jb-ub-mail
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c335ab2..020f979 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -148,8 +148,7 @@
<item quantity="one" msgid="3657821200245019288">"Skuif gesprek"</item>
<item quantity="other" msgid="1685896770174368261">"Skuif <xliff:g id="ID_1">%1$d</xliff:g> gesprekke"</item>
</plurals>
- <!-- no translation found for content_description (175899621885107464) -->
- <skip />
+ <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> het <xliff:g id="SUBJECT">%2$s</xliff:g> op <xliff:g id="DATE">%3$s</xliff:g> gestuur"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
<plurals name="draft">
@@ -300,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Kanselleer"</string>
<string name="close" msgid="419945428844076406">"Maak toe"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Geen vouers is vir hierdie rekening opgestel nie."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Sukses"</item>
+ <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 sinkroniseer nie."</item>
+ <item msgid="4779810016424303449">"Interne fout"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Raak om op te stel"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Om gesprekke te sien, sinkroniseer hierdie vouer."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkroniseer vouer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 571212a..f5d2559 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -298,8 +298,15 @@
<string name="done" msgid="3079981801778027540">"ተከናውኗል"</string>
<string name="cancel" msgid="8762981157252199115">"ሰርዝ"</string>
<string name="close" msgid="419945428844076406">"ዝጋ"</string>
- <string name="folders_activity_instructions" msgid="5237801615196958918">"ለዚህ መለያ ምንም ስያሜዎች አልተዘጋጁም።"</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string name="folders_activity_instructions" msgid="5237801615196958918">"ለእዚህ መለያ ምንም ስያሜዎች አልተዘጋጁም።"</string>
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"ተሳክቷል"</item>
+ <item msgid="7109065688039971961">"ግንኙነት የለም።"</item>
+ <item msgid="8437496123716232060">"በመለያ መግባት አልተቻለም።"</item>
+ <item msgid="1651266301325684887">"የደህንነት ስህተት።"</item>
+ <item msgid="1461520171154288533">"ማመሳሰል አልተቻለም።"</item>
+ <item msgid="4779810016424303449">"ውስጣዊ ስህተት"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"ለማዋቀር ንካ"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"ውይይቶችን ለማየት ይህንን እቃፊ አመሳስል።"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"አቃፊ አመሳስል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bc418e8..cfcacb8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"إلغاء"</string>
<string name="close" msgid="419945428844076406">"إغلاق"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"لم يتم تعيين أية مجلدات لهذا الحساب."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"تم بنجاح"</item>
+ <item msgid="7109065688039971961">"لا يتوفر اتصال."</item>
+ <item msgid="8437496123716232060">"تعذر تسجيل الدخول."</item>
+ <item msgid="1651266301325684887">"خطأ أمنى."</item>
+ <item msgid="1461520171154288533">"تعذرت المزامنة"</item>
+ <item msgid="4779810016424303449">"خطأ داخلي"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"المس للإعداد"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"لعرض المحادثات، عليك مزامنة هذا المجلد."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"مزامنة المجلد"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9a22dff..59629a1 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Адмена"</string>
<string name="close" msgid="419945428844076406">"Закрыць"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Для гэтага ўліковага запісу не былі ўсталяваны цэтлікі."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Паспяхова"</item>
+ <item msgid="7109065688039971961">"Няма злучэння."</item>
+ <item msgid="8437496123716232060">"Не атрымалася ўвайсці."</item>
+ <item msgid="1651266301325684887">"Памылка бяспекi."</item>
+ <item msgid="1461520171154288533">"Не атрымалася сінхранізаваць."</item>
+ <item msgid="4779810016424303449">"Унутраная памылка"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Націсніце, каб наладзіць"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Сінхр. гэту тэчку, каб прагл. разм."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Сінхранізацыя тэчкi"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e8f5ab5..9e2a5e3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -148,8 +148,7 @@
<item quantity="one" msgid="3657821200245019288">"Преместване на кореспонденция"</item>
<item quantity="other" msgid="1685896770174368261">"Преместване на <xliff:g id="ID_1">%1$d</xliff:g> кореспонденции"</item>
</plurals>
- <!-- no translation found for content_description (175899621885107464) -->
- <skip />
+ <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> изпрати <xliff:g id="SUBJECT">%2$s</xliff:g> на <xliff:g id="DATE">%3$s</xliff:g>"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
<plurals name="draft">
@@ -300,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Отказ"</string>
<string name="close" msgid="419945428844076406">"Затваряне"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"В този профил не са зададени папки."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Успех"</item>
+ <item msgid="7109065688039971961">"Няма връзка."</item>
+ <item msgid="8437496123716232060">"Не можахте да влезете."</item>
+ <item msgid="1651266301325684887">"Грешка в сигурността."</item>
+ <item msgid="1461520171154288533">"Не можа да се синхронизира."</item>
+ <item msgid="4779810016424303449">"Вътрешна грешка"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Докоснете, за да настроите"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"За да видите кореспонденциите, синхронизирайте тази папка."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизиране на папката"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0fce1cd..afa79a2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Zrušit"</string>
<string name="close" msgid="419945428844076406">"Zavřít"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Pro tento účet nebyly nastaveny žádné složky."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Podařilo se"</item>
+ <item msgid="7109065688039971961">"Žádné připojení."</item>
+ <item msgid="8437496123716232060">"Přihlášení se nezdařilo."</item>
+ <item msgid="1651266301325684887">"Chyba zabezpečení."</item>
+ <item msgid="1461520171154288533">"Chyba synchronizace."</item>
+ <item msgid="4779810016424303449">"Interní chyba"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Nastavte dotykem"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Chcete-li zobrazit konverzace, synchronizujte tuto složku."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovat složku"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 22f789a..0aac3e7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Annuller"</string>
<string name="close" msgid="419945428844076406">"Luk"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Der er ikke angivet nogen etiketter for denne konto."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Gennemført"</item>
+ <item msgid="7109065688039971961">"Ingen forbindelse."</item>
+ <item msgid="8437496123716232060">"Det var ikke muligt at logge ind."</item>
+ <item msgid="1651266301325684887">"Sikkerhedsfejl."</item>
+ <item msgid="1461520171154288533">"Det var ikke muligt at synkronisere."</item>
+ <item msgid="4779810016424303449">"Intern fejl"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Tryk for at konfigurere"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Synkroniser denne mappe for at se samtaler."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser mappe"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b3f0fbd..452f528 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
<string name="close" msgid="419945428844076406">"Cerrar"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"No se definieron carpetas para esta cuenta."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"La acción se realizó correctamente."</item>
+ <item msgid="7109065688039971961">"Sin conexión"</item>
+ <item msgid="8437496123716232060">"No se pudo acceder."</item>
+ <item msgid="1651266301325684887">"Error de seguridad"</item>
+ <item msgid="1461520171154288533">"No se pudo establecer la sincronización."</item>
+ <item msgid="4779810016424303449">"Error interno"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Toca para configurarlo"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f7d845a..2392f02 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Tühista"</string>
<string name="close" msgid="419945428844076406">"Sule"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Sellele kontole pole määratud ühtegi kausta."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Õnnestus"</item>
+ <item msgid="7109065688039971961">"Ühendus puudub."</item>
+ <item msgid="8437496123716232060">"Sisselogimine ebaõnnestus."</item>
+ <item msgid="1651266301325684887">"Turvalisuse viga."</item>
+ <item msgid="1461520171154288533">"Ei saanud sünkroonida."</item>
+ <item msgid="4779810016424303449">"Sisemine viga"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Puudutage seadistamiseks"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Meilivestl. vaatamis. sünkr. kaust."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sünkrooni kaust"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 176d100..3071112 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"لغو"</string>
<string name="close" msgid="419945428844076406">"بستن"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"پوشهای برای این حساب تنظیم نشده است."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"موفقیتآمیز"</item>
+ <item msgid="7109065688039971961">"اتصال برقرار نیست."</item>
+ <item msgid="8437496123716232060">"ورود به برنامه انجام نشد."</item>
+ <item msgid="1651266301325684887">"خطای امنیتی."</item>
+ <item msgid="1461520171154288533">"همگامسازی انجام نشد."</item>
+ <item msgid="4779810016424303449">"خطای داخلی"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"برای راهاندازی لمس کنید"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"برای مشاهده مکالمات، این پوشه همگام شود."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"همگامسازی پوشه"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 01ad380..857babf 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Annuler"</string>
<string name="close" msgid="419945428844076406">"Fermer"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Aucun dossier n\'a été défini pour ce compte."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Opération réussie."</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>
+ <item msgid="4779810016424303449">"Erreur interne"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Appuyez pour configurer."</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Pour afficher les conversations, synchronisez ce dossier."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchroniser le dossier"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 9f75d48..5b0fd34 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"रद्द करें"</string>
<string name="close" msgid="419945428844076406">"बंद करें"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"इस खाते के लिए कोई फ़ोल्डर सेट नहीं किया गया है."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"सफल"</item>
+ <item msgid="7109065688039971961">"कोई कनेक्शन नहीं."</item>
+ <item msgid="8437496123716232060">"साइन इन नहीं किया जा सका."</item>
+ <item msgid="1651266301325684887">"सुरक्षा त्रुटि."</item>
+ <item msgid="1461520171154288533">"समन्वयित नहीं किया जा सका."</item>
+ <item msgid="4779810016424303449">"आंतरिक त्रुटि"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"सेट करने के लिए स्पर्श करें"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"बातचीत देखने हेतु, फ़ोल्डर समन्वयित करें."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"फ़ोल्डर समन्वयित करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6f9950d..c9bf7c5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Odustani"</string>
<string name="close" msgid="419945428844076406">"Zatvori"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Za ovaj račun nisu postavljene mape."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Uspjeh"</item>
+ <item msgid="7109065688039971961">"Nema veze."</item>
+ <item msgid="8437496123716232060">"Prijava nije bila moguća."</item>
+ <item msgid="1651266301325684887">"Sigurnosna pogreška."</item>
+ <item msgid="1461520171154288533">"Sinkronizacija nije bila moguća."</item>
+ <item msgid="4779810016424303449">"Interna pogreška"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Dodirnite za postavljanje"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Za prikaz razgovora sinkronizirajte ovu mapu."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronizacija mape"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 89d72fe..4472a47 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Mégse"</string>
<string name="close" msgid="419945428844076406">"Bezárás"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Nincs beállítva mappa ehhez a fiókhoz."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Sikerült"</item>
+ <item msgid="7109065688039971961">"Nincs kapcsolat."</item>
+ <item msgid="8437496123716232060">"A bejelentkezés sikertelen."</item>
+ <item msgid="1651266301325684887">"Biztonsági hiba"</item>
+ <item msgid="1461520171154288533">"A szinkronizálás sikertelen."</item>
+ <item msgid="4779810016424303449">"Belső hiba"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Érintse meg a beállításhoz"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Beszélgetésekhez szinkr. a mappát."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Mappa szinkronizálása"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d9d0bf8..d63d787 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Batal"</string>
<string name="close" msgid="419945428844076406">"Tutup"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Tidak ada folder yang disetel untuk akun ini."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Berhasil"</item>
+ <item msgid="7109065688039971961">"Tidak ada sambungan."</item>
+ <item msgid="8437496123716232060">"Tidak dapat masuk."</item>
+ <item msgid="1651266301325684887">"Kesalahan keamanan."</item>
+ <item msgid="1461520171154288533">"Tidak dapat menyinkronkan."</item>
+ <item msgid="4779810016424303449">"Kesalahan Internal"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Sentuh untuk menyiapkan"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat percakapan, sinkronkan folder ini."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronkan Folder"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 268c3b0..495651a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"キャンセル"</string>
<string name="close" msgid="419945428844076406">"閉じる"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"このアカウントに設定されているフォルダはありません。"</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"完了"</item>
+ <item msgid="7109065688039971961">"接続できません。"</item>
+ <item msgid="8437496123716232060">"ログインできませんでした。"</item>
+ <item msgid="1651266301325684887">"セキュリティエラー"</item>
+ <item msgid="1461520171154288533">"同期できませんでした。"</item>
+ <item msgid="4779810016424303449">"内部エラー"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"タップしてセットアップ"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"スレッドを表示するには、このフォルダを同期します。"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"フォルダを同期"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index da38d4d..aee6416 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"취소"</string>
<string name="close" msgid="419945428844076406">"닫기"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"이 계정에 대한 폴더를 설정하지 않았습니다."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"완료"</item>
+ <item msgid="7109065688039971961">"연결되지 않았습니다."</item>
+ <item msgid="8437496123716232060">"로그인하지 못했습니다."</item>
+ <item msgid="1651266301325684887">"보안 오류입니다."</item>
+ <item msgid="1461520171154288533">"동기화하지 못했습니다."</item>
+ <item msgid="4779810016424303449">"내부 오류"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"설정하려면 터치하세요."</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"대화를 보려면 폴더를 동기화하세요."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"폴더 동기화"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d5e7df4..8ccf2f1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Atšaukti"</string>
<string name="close" msgid="419945428844076406">"Uždaryti"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Šiai paskyrai nenustatyti jokie aplankai."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Sėkmingai"</item>
+ <item msgid="7109065688039971961">"Nėra ryšio."</item>
+ <item msgid="8437496123716232060">"Nepavyko prisijungti."</item>
+ <item msgid="1651266301325684887">"Saugos klaida."</item>
+ <item msgid="1461520171154288533">"Nepavyko sinchronizuoti."</item>
+ <item msgid="4779810016424303449">"Vidinė klaida"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Jei norite nustatyti, palieskite"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Jei norite perž. pok., sinchr. apl."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinchronizuoti aplanką"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4f46169..0fa325c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Atcelt"</string>
<string name="close" msgid="419945428844076406">"Aizvērt"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Šajā kontā nav izveidota neviena mape."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Izpildīta veiksmīgi"</item>
+ <item msgid="7109065688039971961">"Nav savienojuma."</item>
+ <item msgid="8437496123716232060">"Neizdevās pierakstīties."</item>
+ <item msgid="1651266301325684887">"Drošības kļūda."</item>
+ <item msgid="1461520171154288533">"Neizdevās sinhronizēt."</item>
+ <item msgid="4779810016424303449">"Iekšējā kļūda"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Pieskarieties, lai iestatītu"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Lai skat. sarunas, sinhr. šo mapi."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinhronizēt mapi"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 94d2290..5d72626 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Avbryt"</string>
<string name="close" msgid="419945428844076406">"Lukk"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Ingen mapper er angitt for denne kontoen."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Fullført"</item>
+ <item msgid="7109065688039971961">"Ingen tilkobling."</item>
+ <item msgid="8437496123716232060">"Påloggingen mislyktes."</item>
+ <item msgid="1651266301325684887">"Sikkerhetsfeil."</item>
+ <item msgid="1461520171154288533">"Synkroniseringen mislyktes."</item>
+ <item msgid="4779810016424303449">"Intern feil"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Trykk for å konfigurere"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Synkroniser denne mappen for å se samtaler."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser mappen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6188da5..f13d54d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -297,7 +297,14 @@
<string name="cancel" msgid="8762981157252199115">"Anuluj"</string>
<string name="close" msgid="419945428844076406">"Zamknij"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Dla tego konta nie ustawiono żadnych folderów."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Udało się"</item>
+ <item msgid="7109065688039971961">"Brak połączenia."</item>
+ <item msgid="8437496123716232060">"Nie można się zalogować."</item>
+ <item msgid="1651266301325684887">"Błąd zabezpieczeń."</item>
+ <item msgid="1461520171154288533">"Błąd synchronizacji."</item>
+ <item msgid="4779810016424303449">"Błąd wewnętrzny"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Kliknij, by skonfigurować"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Aby wyświetlić rozmowy, zsynchronizuj ten folder."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizuj folder"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 09d047f..4ec0398 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
<string name="close" msgid="419945428844076406">"Fechar"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Não foram definidas pastas para esta conta."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Êxito"</item>
+ <item msgid="7109065688039971961">"Sem ligação."</item>
+ <item msgid="8437496123716232060">"Não foi possível iniciar sessão."</item>
+ <item msgid="1651266301325684887">"Erro de segurança"</item>
+ <item msgid="1461520171154288533">"Não foi possível sincronizar."</item>
+ <item msgid="4779810016424303449">"Erro Interno"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Toque para configurar"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver as conversas, sincronize esta pasta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar Pasta"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 82cd916..821d365 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Anulaţi"</string>
<string name="close" msgid="419945428844076406">"Închideţi"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Pentru acest cont nu a fost setat niciun dosar."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Finalizat"</item>
+ <item msgid="7109065688039971961">"Nicio conexiune."</item>
+ <item msgid="8437496123716232060">"Conectarea a eşuat."</item>
+ <item msgid="1651266301325684887">"Eroare de securitate."</item>
+ <item msgid="1461520171154288533">"Sincronizarea a eşuat."</item>
+ <item msgid="4779810016424303449">"Eroare internă"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Atingeţi pentru a configura"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Pentru a afişa conversaţiile, sincronizaţi acest dosar."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizaţi dosarul"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7bb6de7..a955973 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Отмена"</string>
<string name="close" msgid="419945428844076406">"Закрыть"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"В этом аккаунте нет папок."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Без ошибок"</item>
+ <item msgid="7109065688039971961">"Нет соединения"</item>
+ <item msgid="8437496123716232060">"Не удалось войти"</item>
+ <item msgid="1651266301325684887">"Ошибка системы безопасности"</item>
+ <item msgid="1461520171154288533">"Ошибка синхронизации"</item>
+ <item msgid="4779810016424303449">"Внутренняя ошибка"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Нажмите для настройки"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Для просмотра цепочек писем синхронизируйте эту папку."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизировать папку"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 48c03c6..f810457 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Zrušiť"</string>
<string name="close" msgid="419945428844076406">"Zavrieť"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Pre tento účet neboli nastavené žiadne priečinky."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Úspech"</item>
+ <item msgid="7109065688039971961">"Žiadne pripojenie."</item>
+ <item msgid="8437496123716232060">"Nepodarilo sa prihlásiť."</item>
+ <item msgid="1651266301325684887">"Chyba zabezpečenia."</item>
+ <item msgid="1461520171154288533">"Nepodarilo sa synchronizovať."</item>
+ <item msgid="4779810016424303449">"Interná chyba"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Klepnutím nastavte"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Zobr. konverz., synchr. priečinok."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovať priečinok"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index dba7e64..aa32e7f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Откажи"</string>
<string name="close" msgid="419945428844076406">"Затвори"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Нису подешени директоријуми за овај налог."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Успешно"</item>
+ <item msgid="7109065688039971961">"Веза није успостављена."</item>
+ <item msgid="8437496123716232060">"Пријављивање није могуће."</item>
+ <item msgid="1651266301325684887">"Безбедносна грешка."</item>
+ <item msgid="1461520171154288533">"Синхронизација није могућа."</item>
+ <item msgid="4779810016424303449">"Интерна грешка"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Додирните да бисте подесили"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Да бисте прегледали преписке, синхронизујте директоријум."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизуј директоријум"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index e072578..2226c40 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"ยกเลิก"</string>
<string name="close" msgid="419945428844076406">"ปิด"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"ไม่ได้กำหนดโฟลเดอร์ใดไว้สำหรับบัญชีนี้"</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"สำเร็จ"</item>
+ <item msgid="7109065688039971961">"ไม่มีการเชื่อมต่อ"</item>
+ <item msgid="8437496123716232060">"ไม่สามารถลงชื่อเข้าใช้"</item>
+ <item msgid="1651266301325684887">"ข้อผิดพลาดเกี่ยวกับความปลอดภัย"</item>
+ <item msgid="1461520171154288533">"ไม่สามารถซิงค์"</item>
+ <item msgid="4779810016424303449">"ข้อผิดพลาดภายใน"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"แตะเพื่อตั้งค่า"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"ในการดูการสนทนา ให้ซิงค์โฟลเดอร์นี้"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"ซิงค์โฟลเดอร์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 71a7c1d..e6ce99f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Kanselahin"</string>
<string name="close" msgid="419945428844076406">"Isara"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Walang mga folder na naitakda para sa account na ito."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Tagumpay"</item>
+ <item msgid="7109065688039971961">"Walang koneksyon."</item>
+ <item msgid="8437496123716232060">"Hindi makapag-sign in."</item>
+ <item msgid="1651266301325684887">"Error sa seguridad."</item>
+ <item msgid="1461520171154288533">"Hindi makapag-sync."</item>
+ <item msgid="4779810016424303449">"Panloob na Error"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Pindutin upang i-set up"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para tingin pag-uusap, sync folder."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"I-sync ang Folder"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6b3c107..d33bcea 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"İptal"</string>
<string name="close" msgid="419945428844076406">"Kapat"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Bu hesap için hiçbir klasör ayarlanmamış."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Başarılı"</item>
+ <item msgid="7109065688039971961">"Bağlantı yok."</item>
+ <item msgid="8437496123716232060">"Oturum açılamadı."</item>
+ <item msgid="1651266301325684887">"Güvenlik hatası."</item>
+ <item msgid="1461520171154288533">"Senkronize edilemedi."</item>
+ <item msgid="4779810016424303449">"Dahili Hata"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Kurulum için dokunun"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"İleti dizilerini görüntülemek için bu klasörü senk edin."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Klasörü Senkronize Et"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7d5d829..cd29bc1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Hủy"</string>
<string name="close" msgid="419945428844076406">"Đóng"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Không có thư mục nào được đặt cho tài khoản này."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Thành công"</item>
+ <item msgid="7109065688039971961">"Không có kết nối."</item>
+ <item msgid="8437496123716232060">"Không thể đăng nhập."</item>
+ <item msgid="1651266301325684887">"Lỗi bảo mật."</item>
+ <item msgid="1461520171154288533">"Không thể đồng bộ hóa."</item>
+ <item msgid="4779810016424303449">"Lỗi nội bộ"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Chạm để thiết lập"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Để xem các cuộc hội thoại, hãy đồng bộ hóa thư mục này."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Đồng bộ hóa thư mục"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 14776c3..770221e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"取消"</string>
<string name="close" msgid="419945428844076406">"關閉"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"尚未設定這個帳戶的資料夾。"</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"成功"</item>
+ <item msgid="7109065688039971961">"沒有網路連線。"</item>
+ <item msgid="8437496123716232060">"無法登入。"</item>
+ <item msgid="1651266301325684887">"安全性錯誤。"</item>
+ <item msgid="1461520171154288533">"無法同步處理。"</item>
+ <item msgid="4779810016424303449">"發生內部錯誤"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"輕觸即可設定"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"如要查看會話群組，請同步處理這個資料夾。"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步處理資料夾"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c52de58..7099eae 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -299,7 +299,14 @@
<string name="cancel" msgid="8762981157252199115">"Khansela"</string>
<string name="close" msgid="419945428844076406">"Vala"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Awekho amafolda ahlelelwe le akhawunti."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Impumelelo"</item>
+ <item msgid="7109065688039971961">"Akukho ukuxhumana."</item>
+ <item msgid="8437496123716232060">"Ayikwazanga ukungena ngemvume."</item>
+ <item msgid="1651266301325684887">"Iphutha lokuphepha."</item>
+ <item msgid="1461520171154288533">"Ayikwazanga ukuvumelanisa."</item>
+ <item msgid="4779810016424303449">"Iphutha langaphakathi"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Thinta ukuze ulungisele ukusebenza"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Ukuze ubuke izingxoxo, vumelanisa le folda."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Vumelanisa ifolda"</string>
diff --git a/src/com/android/mail/browse/SelectedConversationsActionMenu.java b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
index 39654d1..6496f67 100644
--- a/src/com/android/mail/browse/SelectedConversationsActionMenu.java
+++ b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
@@ -116,7 +116,7 @@
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
boolean handled = true;
// If the user taps a new menu item, commit any existing destructive actions.
- mListView.commitDestructiveActions();
+ mListView.commitDestructiveActions(true);
switch (item.getItemId()) {
case R.id.delete:
performDestructiveAction(R.id.delete);
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index efc4019..30a29b5 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -423,6 +423,9 @@
}
});
}
+ if (accountChanged) {
+ commitDestructiveActions(false);
+ }
switchAccount(account, accountChanged);
}
}
@@ -473,6 +476,9 @@
@Override
public void onFolderChanged(Folder folder) {
+ if (!Objects.equal(mFolder, folder)) {
+ commitDestructiveActions(false);
+ }
changeFolder(folder, null);
}
@@ -701,7 +707,7 @@
final Collection<Conversation> target = Conversation.listOf(mCurrentConversation);
final Settings settings = (mAccount == null) ? null : mAccount.settings;
// The user is choosing a new action; commit whatever they had been doing before.
- commitDestructiveActions();
+ commitDestructiveActions(true);
switch (id) {
case R.id.archive: {
final boolean showDialog = (settings != null && settings.confirmArchive);
@@ -1111,7 +1117,7 @@
// this themselves?
// Commit any destructive undoable actions the user may have performed.
- commitDestructiveActions();
+ commitDestructiveActions(true);
// We don't want to invalidate the options menu when switching to
// conversation
@@ -1125,10 +1131,10 @@
return mDestroyed;
}
- private void commitDestructiveActions() {
- ConversationListFragment fragment = this.getConversationListFragment();
+ private void commitDestructiveActions(boolean animate) {
+ ConversationListFragment fragment = getConversationListFragment();
if (fragment != null) {
- fragment.commitDestructiveActions();
+ fragment.commitDestructiveActions(animate);
}
}
@@ -2082,7 +2088,7 @@
*/
protected void disableCabMode() {
// Commit any previous destructive actions when entering/ exiting CAB mode.
- commitDestructiveActions();
+ commitDestructiveActions(true);
if (mCabActionMenu != null) {
mCabActionMenu.deactivate();
}
@@ -2093,7 +2099,7 @@
*/
protected void enableCabMode() {
// Commit any previous destructive actions when entering/ exiting CAB mode.
- commitDestructiveActions();
+ commitDestructiveActions(true);
if (mCabActionMenu != null) {
mCabActionMenu.activate();
}
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 2cdbea6..73dfca8 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -356,11 +356,15 @@
return mListView;
}
- public void commitLeaveBehindItems() {
+ public void commitLeaveBehindItems(boolean animate) {
// Remove any previously existing leave behinds.
boolean changed = false;
if (hasLeaveBehinds()) {
- mLeaveBehindItem.dismiss();
+ if (animate) {
+ mLeaveBehindItem.dismiss();
+ } else {
+ mLeaveBehindItem.commit();
+ }
changed = true;
}
if (!mLastDeletingItems.isEmpty()) {
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index cede3e7..c6d4328 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -639,9 +639,9 @@
}
}
- public void commitDestructiveActions() {
+ public void commitDestructiveActions(boolean animate) {
if (mListView != null) {
- mListView.commitDestructiveActions();
+ mListView.commitDestructiveActions(animate);
}
}
diff --git a/src/com/android/mail/ui/SwipeableListView.java b/src/com/android/mail/ui/SwipeableListView.java
index a6bf55c..745cd37 100644
--- a/src/com/android/mail/ui/SwipeableListView.java
+++ b/src/com/android/mail/ui/SwipeableListView.java
@@ -162,10 +162,10 @@
// Call this whenever a new action is taken; this forces a commit of any
// existing destructive actions.
- public void commitDestructiveActions() {
+ public void commitDestructiveActions(boolean animate) {
final AnimatedAdapter adapter = getAnimatedAdapter();
if (adapter != null) {
- adapter.commitLeaveBehindItems();
+ adapter.commitLeaveBehindItems(animate);
}
}
@@ -297,7 +297,7 @@
boolean handled = super.performItemClick(view, pos, id);
// Commit any existing destructive actions when the user selects a
// conversation to view.
- commitDestructiveActions();
+ commitDestructiveActions(true);
return handled;
}
@@ -310,7 +310,7 @@
public void onScrollStateChanged(AbsListView view, int state) {
if (state == OnScrollListener.SCROLL_STATE_TOUCH_SCROLL
|| state == OnScrollListener.SCROLL_STATE_FLING) {
- commitDestructiveActions();
+ commitDestructiveActions(true);
}
}
}