am ee7c63da: Merge "Inconsistent state after emptying trash" into ub-gmail-ur12-dev
* commit 'ee7c63da505ccee3e391cf1baa2f64b7db78aaa9':
Inconsistent state after emptying trash
diff --git a/Android.mk b/Android.mk
index bbc3587..bc81af2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,10 +26,6 @@
##################################################
include $(CLEAR_VARS)
-# STOPSHIP: Use the real support jar before ship.
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
- wearable-preview-support:libs/wearable-preview-support.jar
-
include $(BUILD_MULTI_PREBUILT)
##################################################
@@ -47,7 +43,8 @@
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
LOCAL_STATIC_JAVA_LIBRARIES += android-opt-datetimepicker
-LOCAL_STATIC_JAVA_LIBRARIES += wearable-preview-support
+# STOPSHIP: Open source the wearable support jar
+LOCAL_STATIC_JAVA_LIBRARIES += prebuilt-wearable-support
LOCAL_SDK_VERSION := current
diff --git a/libs/wearable-preview-support.jar b/libs/wearable-preview-support.jar
deleted file mode 100644
index 423ba82..0000000
--- a/libs/wearable-preview-support.jar
+++ /dev/null
Binary files differ
diff --git a/res/layout/conversation_message_details_header_expanded.xml b/res/layout/conversation_message_details_header_expanded.xml
index a25047b..8585b3d 100644
--- a/res/layout/conversation_message_details_header_expanded.xml
+++ b/res/layout/conversation_message_details_header_expanded.xml
@@ -30,6 +30,7 @@
android:id="@+id/recipients_summary_expanded"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
app:layout_row="0"
app:layout_columnSpan="2"
@@ -39,6 +40,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
+ android:focusable="true"
app:layout_column="0"
app:layout_row="1"
app:layout_columnSpan="2"
@@ -49,6 +51,7 @@
android:id="@+id/from_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
app:layout_row="2"
android:text="@string/from_heading"
@@ -58,6 +61,7 @@
android:id="@+id/from_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
@@ -68,6 +72,7 @@
android:id="@+id/replyto_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
app:layout_row="3"
android:text="@string/replyto_heading"
@@ -77,6 +82,7 @@
android:id="@+id/replyto_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
@@ -87,6 +93,7 @@
android:id="@+id/to_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
app:layout_row="4"
android:text="@string/to_heading"
@@ -96,6 +103,7 @@
android:id="@+id/to_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
@@ -106,6 +114,7 @@
android:id="@+id/cc_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
app:layout_row="5"
android:text="@string/cc_heading"
@@ -115,6 +124,7 @@
android:id="@+id/cc_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
@@ -125,6 +135,7 @@
android:id="@+id/bcc_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
app:layout_row="6"
android:text="@string/bcc_heading"
@@ -134,6 +145,7 @@
android:id="@+id/bcc_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
@@ -144,6 +156,7 @@
android:id="@+id/date_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_column="0"
app:layout_row="7"
android:text="@string/date_heading"
@@ -153,6 +166,7 @@
android:id="@+id/date_details"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:focusable="true"
app:layout_gravity="fill_horizontal"
android:layout_marginBottom="4dp"
app:layout_column="1"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 20d934b..f91aee8 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Benoem vouer se kortpad"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Wag vir sinkronisasie"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Jou e-pos sal binnekort verskyn."</string>
<string name="not_synced_title" msgid="794279749170198599">"Rekening nie gesinkroniseer nie"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Hierdie rekening is nie opgestel om outomaties te sinkroniseer nie.\nRaak "<b>"Sinkroniseer nou"</b>" om pos een keer te sinkroniseer, of "<b>"Verander sinkroniseer-instellings"</b>" om hierdie rekening op te stel om pos outomaties te sinkroniseer."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinkroniseer nou"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 42200ff..d4109e2 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"ለአቃፊ አቋራጭ ስም ስጥ"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"ማመሳሰል በመጠበቅ ላይ"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"ኢሜይልህ ከትንሽ ጊዜ በኋላ ብቅ ይላል።"</string>
<string name="not_synced_title" msgid="794279749170198599">"መለያ አልተመሳሰለም"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"ይህ መለያ በራስ-ሰር እንዲመሳሰል አልተዋቀረም።\nመልዕክት አንዴ ለማመሳሰል "<b>"አሁን አመሳስል"</b>"ን ንካ፣ ወይም ደግሞ ይሄ መለያ መልዕክት በራስ-ሰር እንዲያመሳስል ለማዋቀር "<b>"የማመሳሰል ቅንብሮችን ቀይር"</b>"።"</string>
<string name="manual_sync" msgid="6743983544685622800">"አሁን አመሳስል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c98092e..67b19f1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"اختصار اسم المجلد"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"في انتظار المزامنة"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"سيظهر بريدك الإلكتروني بعد قليل."</string>
<string name="not_synced_title" msgid="794279749170198599">"لم تتم مزامنة الحساب"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"لم يتم تعيين هذا الحساب على المزامنة تلقائيًا.\nيمكنك لمس "<b>"المزامنة الآن"</b>" لمزامنة البريد مرة واحدة أو "<b>"تغيير إعدادات المزامنة"</b>" لإعداد هذا الحساب على مزامنة البريد تلقائيًا."</string>
<string name="manual_sync" msgid="6743983544685622800">"مزامنة الآن"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6c48eb0..0c0d233 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Наименуване на пряк път към папка"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Изчаква се синхронизиране"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Имейлът ви ще се покаже след малко."</string>
<string name="not_synced_title" msgid="794279749170198599">"Профилът не е синхронизиран"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Този профил не е настроен за автоматично синхронизиране.\nДокоснете "<b>"Синхрон сега"</b>", за да синхронизирате еднократно пощата, или "<b>"Настройки за синхрон: Промяна"</b>", за да го настроите за автоматично синхронизиране."</string>
<string name="manual_sync" msgid="6743983544685622800">"Синхрон сега"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fd74c06..09371a3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Tecla de drecera per posar nom a la carpeta"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"S\'està esperant per sincronitzar"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"El correu electrònic apareixerà aviat."</string>
<string name="not_synced_title" msgid="794279749170198599">"El compte no s\'ha sincronitzat"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Aquest compte no està configurat per sincronitzar automàticament.\nToca "<b>"Sincronitza ara"</b>" per sincronitzar el correu una vegada o bé "<b>"Canvia la configuració de sincronització"</b>" per configurar aquest compte per sincronitzar el correu de manera automàtica."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronitza ara"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cc47c9a..6a8f647 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Zadejte název zkratky složky"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Čekání na synchronizaci"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Vaše e-maily se zobrazí za chvíli."</string>
<string name="not_synced_title" msgid="794279749170198599">"Účet není synchronizován"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Tento účet není nastaven na automatickou synchronizaci.\nChcete-li poštu jednou synchronizovat, dotkněte se položky "<b>"Synchronizovat"</b>". Chcete-li v účtu nastavit automatickou synchronizaci pošty, dotkněte se položky "<b>"Změnit nastavení synchronizace"</b>"."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchronizovat"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fd1ae20..c3deb25 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Genvej til navngivning af mappe"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Venter på synkronisering"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Din e-mail vises om et øjeblik."</string>
<string name="not_synced_title" msgid="794279749170198599">"Kontoen er ikke synkroniseret"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Denne konto er ikke konfigureret til automatisk synkronisering.\nTryk på "<b>"Synkroniser nu"</b>" for at synkronisere e-mails én gang, eller tryk på "<b>"Skift synkroniseringsindstillinger"</b>" for at konfigurere denne konto til at synkronisere e-mail automatisk."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synkroniser nu"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2e0114e..068b077 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ordnerverknüpfung benennen"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Warten auf Synchronisierung"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Ihre E-Mails werden gleich angezeigt."</string>
<string name="not_synced_title" msgid="794279749170198599">"Konto nicht synchronisiert"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Für dieses Konto ist keine automatische Synchronisierung eingerichtet.\nZur einmaligen Synchronisierung der E-Mails tippen Sie auf "<b>"Synchronisieren"</b>". Zum Einrichten der automatischen Synchronisierung für dieses Konto tippen Sie auf "<b>"Synchronisierungseinstellungen ändern"</b>"."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchronisieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a88dd2f..7ac89a1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Όνομα συντόμευσης φακέλου"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Αναμονή για συγχρονισμό"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Η αλληλογραφία θα εμφανιστεί σύντομα."</string>
<string name="not_synced_title" msgid="794279749170198599">"Ο λογαριασμός δεν συγχρονίστηκε"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ο λογαριασμός αυτός δεν έχει ρυθμιστεί για αυτόματο συγχρονισμό.\nΑγγίξτε "<b>"Συγχρ. τώρα"</b>" για συγχρονισμό της αλληλογραφίας μία φορά ή "<b>"Αλλαγή ρυθμίσεων συγχρονισμού"</b>" για να ρυθμίσετε το λογαριασμό για αυτόματο συγχρονισμό της αλληλογραφίας."</string>
<string name="manual_sync" msgid="6743983544685622800">"Συγχρ. τώρα"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 51f138e..4261781 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Name folder shortcut"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Waiting for sync"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Your email will appear shortly."</string>
<string name="not_synced_title" msgid="794279749170198599">"Account not synced"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"This account isn\'t set up to sync automatically.\nTouch "<b>"Sync Now"</b>" to sync mail once, or "<b>"Change Sync Settings"</b>" to set up this account to sync mail automatically."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sync now"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 51f138e..4261781 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Name folder shortcut"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Waiting for sync"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Your email will appear shortly."</string>
<string name="not_synced_title" msgid="794279749170198599">"Account not synced"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"This account isn\'t set up to sync automatically.\nTouch "<b>"Sync Now"</b>" to sync mail once, or "<b>"Change Sync Settings"</b>" to set up this account to sync mail automatically."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sync now"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 308dc80..93a69a5 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Definir el nombre del acceso directo a la carpeta"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Esperando para sincronizar"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Tu correo aparecerá en breve."</string>
<string name="not_synced_title" msgid="794279749170198599">"Cuenta no sincronizada"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Esta cuenta no está configurada para sincronizar el correo automáticamente.\nToca "<b>"Sincronizar ahora"</b>" para sincronizar el correo una vez o "<b>"Cambiar la configuración de sincronización"</b>" para que esta cuenta sincronice el correo automáticamente."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincr. ahora"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5d77997..3f078e7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Asignar nombre a acceso directo de carpeta"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Esperando para sincronizar..."</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Tu correo electrónico aparecerá en breve."</string>
<string name="not_synced_title" msgid="794279749170198599">"Cuenta no sincronizada"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Esta cuenta no está configurada para sincronizarse de forma automática.\nToca "<b>"Sincronizar ahora"</b>" para sincronizar el correo una vez o selecciona "<b>"Cambiar ajustes de sincronización"</b>" para configurar la sincronización automática del correo en esta cuenta."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronizar ahora"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index b4f64aa..93bb1d1 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Kausta otseteele nime andmine"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Sünkroonimise ootel"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Teie meil ilmub peagi."</string>
<string name="not_synced_title" msgid="794279749170198599">"Konto ei ole sünkroonitud"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"See konto ei ole seadistatud automaatseks sünkroonimiseks.\nPuudutage käsku "<b>"Sünkrooni kohe"</b>", et meile üks kord sünkroonida, või käsku "<b>"Muuda sünkroonimisseadeid"</b>", et seadistada see konto meilide automaatseks sünkroonimiseks."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sünkr. kohe"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7ae5a44..fd92fc6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"میانبر نامگذاری پوشه"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"در انتظار همگامسازی"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"ایمیل شما به زودی نمایش داده میشود."</string>
<string name="not_synced_title" msgid="794279749170198599">"حساب همگام نشد"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"این حساب برای همگامسازی به طور خودکار تنظیم نشده است.\nبرای یک بار همگامسازی نامه، "<b>"اکنون همگامسازی شود"</b>" را لمس کنید، یا برای تنظیم این حساب برای همگامسازی نامه به طور خودکار، "<b>"تنظیمات همگامسازی را تغییر دهید"</b>"."</string>
<string name="manual_sync" msgid="6743983544685622800">"اکنون همگامسازی شود"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4a2b781..79295c4 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nimeä kansion pikakuvake"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Odotetaan synkronointia"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Sähköpostit näytetään piakkoin."</string>
<string name="not_synced_title" msgid="794279749170198599">"Tiliä ei ole synkronoitu"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Tätä tiliä ei ole määritetty synkronoitavaksi automaattisesti.\nKosketa "<b>"Synkronoi"</b>" synkronoidaksesi sähköpostit kerran tai "<b>"Muuta synkronointiasetuksia"</b>" asettaaksesi tilin synkronoimaan sähköpostit automaattisesti."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synkronoi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 43c825d..d34ab06 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nom du raccourci du dossier"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"En attente de synchronisation"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Votre courriel va bientôt s\'afficher."</string>
<string name="not_synced_title" msgid="794279749170198599">"Compte non synchronisé"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"La synchronisation automatique n\'est pas configurée pour ce compte.\nAppuyez sur "<b>"Synchroniser"</b>" pour une synchronisation ponctuelle de la messagerie ou sur "<b>"Modifier les paramètres"</b>" pour activer la synchronisation automatique."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchroniser"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 4fe4902..0d3fdea 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nom du raccourci du dossier"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"En attente de synchronisation"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Votre e-mail va bientôt s\'afficher."</string>
<string name="not_synced_title" msgid="794279749170198599">"Compte non synchronisé"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"La synchronisation automatique n\'est pas configurée pour ce compte.\nAppuyez sur "<b>"Synchroniser"</b>" pour une synchronisation ponctuelle de la messagerie ou sur "<b>"Modifier les paramètres"</b>" pour activer la synchronisation automatique."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchroniser"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 691395d..57d2466 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"नाम फ़ोल्डर शॉर्टकट"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"समन्वयन की प्रतीक्षा कर रहा है"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"आपका ईमेल शीघ्र ही दिखाई देगा."</string>
<string name="not_synced_title" msgid="794279749170198599">"खाता समन्वयित नहीं है"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"यह खाता अपने आप समन्वयित करने के लिए सेट नहीं है. \nएक बार मेल समन्वयित करने के लिए, "<b>"अभी समन्वयित करें"</b>" स्पर्श करें, या इस खाते को मेल अपने आप समन्वयित करने के लिए सेट करने हेतु "<b>"समन्वयन सेटिंग बदलें"</b>" स्पर्श करें."</string>
<string name="manual_sync" msgid="6743983544685622800">"अभी समन्वयित करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bc8a776..ad4cbb6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Naziv prečaca mape"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Čekanje na sinkronizaciju"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Vaša će se e-pošta uskoro pojaviti."</string>
<string name="not_synced_title" msgid="794279749170198599">"Račun nije sinkroniziran"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ovaj račun nije postavljen za automatsku sinkronizaciju.\nDodirnite "<b>"Sinkroniziraj sada"</b>" da biste poštu sinkronizirali jednom ili "<b>"Promjena sinkronizacije"</b>" da biste ovaj račun postavili za automatsku sinkronizaciju pošte."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sink. sada"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 41ed1f3..3d312e6 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Mappaparancsikon elnevezése"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Várakozás a szinkronizálásra"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Az e-mail hamarosan megjelenik."</string>
<string name="not_synced_title" msgid="794279749170198599">"A fiók nincs szinkronizálva"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ez a fiók nincs beállítva automatikus szinkronizáláshoz.\nÉrintse meg a "<b>"Szinkr. most"</b>" elemet a levelek egyszeri szinkronizálásához, vagy érintse meg a "<b>"Szinkr. beállítások módosítása"</b>" lehetőséget a fiók leveleinek automatikusan szinkronizálásához."</string>
<string name="manual_sync" msgid="6743983544685622800">"Szinkr. most"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index a40c3d9..5f316b4 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Անվանեք դյուրանցման թղթապանակը"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Սպասում է համաժամեցմանը"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Ձեր էլփոստը շուտով կհայտնվի:"</string>
<string name="not_synced_title" msgid="794279749170198599">"Հաշիվը համաժամեցված չէ"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Այս հաշիվը չի կարգավորվել ավտոմատ համաժամեցման համար:\nՀպեք "<b>"Համաժամեցնել հիմա՝"</b>" էլփոստը միանվագ համաժամեցնելու համար կամ "<b>"Փոխել համաժամեցման կարգավորումները`"</b>" այս հաշվի էլփոստը ինքնաբերաբար համաժամեցնելով կարգավորելու համար:"</string>
<string name="manual_sync" msgid="6743983544685622800">"Համաժամեցնել հիմա"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 33a3e50..67e4c23 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Beri nama pintasan folder"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Menunggu sinkronisasi"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Email Anda akan segera muncul."</string>
<string name="not_synced_title" msgid="794279749170198599">"Akun tidak disinkronkan"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Akun ini tidak disiapkan untuk menyinkronkan secara otomatis.\nSentuh "<b>"Sinkronkan Sekarang"</b>" untuk menyinkronkan surat, atau "<b>"Ubah Setelan Sinkronisasi"</b>" untuk menyiapkan akun ini untuk sinkronisasi secara otomatis."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinkron skrg"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3935d53..bf06ec7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nome scorciatoia cartella"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"In attesa di sincronizzazione"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Le email verranno visualizzate tra poco."</string>
<string name="not_synced_title" msgid="794279749170198599">"Account non sincronizzato"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Questo account non è configurato per la sincronizzazione automatica.\nTocca "<b>"Sincronizza ora"</b>" per sincronizzare una volta i messaggi, oppure "<b>"Modifica impostazioni sincronizzazione"</b>" per configurare la sincronizzazione automatica dei messaggi per questo account."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronizza"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f6bd1bf..401cf8b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"תן שם לקיצור הדרך של התיקיה"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"ממתין לסנכרון"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"הדוא\"ל שלך יופיע בעוד זמן קצר."</string>
<string name="not_synced_title" msgid="794279749170198599">"החשבון אינו מסונכרן"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"חשבון זה אינו מוגדר לסנכרון אוטומטי.\nגע באפשרות "<b>"סנכרן כעת"</b>" כדי לסנכרן את הדואר פעם אחת, או באפשרות "<b>"שנה הגדרות סנכרון"</b>" כדי להגדיר חשבון זה לסנכרון דואר באופן אוטומטי."</string>
<string name="manual_sync" msgid="6743983544685622800">"סנכרן עכשיו"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 534ec11..689189a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"フォルダのショートカットへの名前の指定"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"同期を待機中"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"まもなくメールが表示されます。"</string>
<string name="not_synced_title" msgid="794279749170198599">"アカウントが同期していません"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"このアカウントには自動同期が設定されていません。\nメールを一度だけ同期させるには["<b>"今すぐ同期"</b>"]をタップします。このアカウントでメールが自動的に同期されるように設定するには、["<b>"同期設定の変更"</b>"]をタップします。"</string>
<string name="manual_sync" msgid="6743983544685622800">"今すぐ同期"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 9cd9b3a..e7fa593 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"საქათალდის მალმძახისთვის სახელის დარქმევა"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"სინქრონიზაციის მოლოდინი"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"თქვენი ელფოსტა გამოჩნდება ცოტა ხანში."</string>
<string name="not_synced_title" msgid="794279749170198599">"ანგარიში არ დასინქრონებულა"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"ამ ანგარიშს არ აქვს დაყენებული ავტომატური სინქრონიზაცია.\nშეეხეთ "<b>"სინქრონიზაციას"</b>" ელფოსტის ერთხელ სინქრონიზაციისთვის, ან "<b>"შეცვალეთ სინქრონიზაციის პარამეტრები"</b>" რათა დააყენოთ ელფოსტის ავტომატური სინქრონიზაცია."</string>
<string name="manual_sync" msgid="6743983544685622800">"სინქრონიზაცია"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 96dc68f..3cae5b0 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"ដាក់ឈ្មោះផ្លូវកាត់ថត"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"រង់ចាំធ្វើសមកាលកម្ម"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"អ៊ីមែលរបស់អ្នកនឹងលេចឡើងបន្តិចទៀត។"</string>
<string name="not_synced_title" msgid="794279749170198599">"មិនបានធ្វើសមកាលកម្មគណនី"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"គណនីនេះមិនត្រូវបានរៀបចំ ដើម្បីធ្វើសមកាលកម្មស្វ័យប្រវត្តិ។ \n ប៉ះ "<b>" ដើម្បីធ្វើសមកាលកម្មឥឡូវនេះ "</b>" សំបុត្រ ឬ "<b>" ប្ដូរការកំណត់ការធ្វើសមកាលកម្ម "</b>" ដើម្បីរៀបចំគណនីនេះត្រូវធ្វើសមកាលកម្មសំបុត្រស្វ័យប្រវត្តិ។"</string>
<string name="manual_sync" msgid="6743983544685622800">"ធ្វើសមកាលកម្មឥឡូវនេះ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 25848af..be8e4ee 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"폴더 바로가기 이름 지정"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"동기화 대기 중"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"이메일이 곧 표시됩니다."</string>
<string name="not_synced_title" msgid="794279749170198599">"계정이 동기화되지 않음"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"이 계정은 자동으로 동기화되도록 설정되지 않았습니다.\n"<b>"지금 동기화"</b>"를 터치하여 메일을 한 번 동기화하거나 "<b>"동기화 설정 변경"</b>"을 터치하여 이 계정이 메일을 자동으로 동기화하도록 설정하세요."</string>
<string name="manual_sync" msgid="6743983544685622800">"지금 동기화"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index b0dd6e0..2b50c84 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"ຊື່ໂຟນເດີທາງລັດ"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"ກຳລັງລໍຖ້າເພື່ອຊິ້ງຂໍ້ມູນ"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"ອີເມວຂອງທ່ານຈະໄປປາກົດໄວໆນີ້."</string>
<string name="not_synced_title" msgid="794279749170198599">"ບັນຊີບໍ່ໄດ້ຊິ້ງຂໍ້ມູນ"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"ບັນຊີນີ້ບໍ່ໄດ້ຖືກຕັ້ງໃຫ້ຊິ້ງຂໍ້ມູນອັດຕະໂນມັດ.\nແຕະ "<b>"ຊິ້ງຂໍ້ມູນດຽວນີ້"</b>" ເພື່ອຊິ້ງຂໍ້ມູນເມວ ຫຼື "<b>"ປ່ຽນການຕັ້ງຄ່າການຊິ້ງຂໍ້ມູນ"</b>" ເພື່ອຕັ້ງໃຫ້ບັນຊີນີ້ຊິ້ງຂໍ້ມູນອີເມວອັດຕະໂນມັດ."</string>
<string name="manual_sync" msgid="6743983544685622800">"ຊິ້ງຂໍ້ມູນດຽວນີ້"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index afb9b60..568b9e1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nurodyti spartųjį aplanko klavišą"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Laukiama sinchronizavimo"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"El. paštas netrukus bus rodomas."</string>
<string name="not_synced_title" msgid="794279749170198599">"Paskyra nesinchronizuota"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ši paskyra nenustatyta automatiškai sinchronizuoti.\nJei norite vieną kartą sinchronizuoti paštą, palieskite "<b>"Sinch. dabar"</b>" arba palieskite "<b>"Keisti sinchronizavimo nustat."</b>", kad nustatytumėte šią paskyrą automatiškai sinchronizuoti paštą."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinch. dabar"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4059379..ef7746a 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nosaukuma piešķiršana mapes saīsnei"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Gaida sinhronizāciju"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-pasta saturs drīz tiks parādīts."</string>
<string name="not_synced_title" msgid="794279749170198599">"Konts nav sinhronizēts"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Šajā kontā nav iestatīta automātiskā sinhronizācija.\nPieskarieties vienumam "<b>"Sinhronizēt tūlīt"</b>", lai vienreiz sinhronizētu pastu, vai vienumam "<b>"Mainīt sinhronizācijas iestatījumus"</b>", lai šajā kontā iestatītu automātisku pasta sinhronizāciju."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinhr. tūlīt"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 712ff50..151bd58 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Нэрийн фолдерын товчилбор"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Синк хийгдэхийг хүлээж байна"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Таны имэйл удахгүй гарч ирэх болно."</string>
<string name="not_synced_title" msgid="794279749170198599">"Акаунт синк хийгдээгүй"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Энэ акаунтыг автоматаар синк хийхээр тохируулаагүй.\nИмэйлийг нэг удаа синк хийхийн тулд "<b>"Одоо синк хийх"</b>" гэсэнд хүрэх буюу энэ акаунтыг автоматаар синк хийхээр тохируулахын тулд "<b>"Синкийн Тохиргоог Өөрчлөх"</b>" гэсэнд хүрнэ үү."</string>
<string name="manual_sync" msgid="6743983544685622800">"Одоо синк хийх"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index a6a91b3..6965a20 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Namakan pintasan folder"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Menunggu penyegerakan"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-mel anda akan muncul tidak lama lagi."</string>
<string name="not_synced_title" msgid="794279749170198599">"Akaun tidak tersegerak"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Akaun ini tidak ditetapkan untuk disegerakkan secara automatik.\nSentuh "<b>"Segerakkan Sekarang"</b>" untuk menyegerakkan e-mel sekali, atau "<b>"Tukar Tetapan Penyegerakan"</b>" untuk menyediakan akaun ini agar menyegerakkan e-mel secara automatik."</string>
<string name="manual_sync" msgid="6743983544685622800">"Segerakkan sekarang"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9e54eae..6f46528 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Navngi mappesnarvei"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Venter på synkronisering"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-posten din vises snart."</string>
<string name="not_synced_title" msgid="794279749170198599">"Kontoen ble ikke synkronisert"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Denne kontoen er ikke konfigurert til å synkroniseres automatisk.\nTrykk på "<b>"Synkroniser nå"</b>" for å synkronisere e-post én gang, eller trykk på "<b>"Endre synkroniseringsinnstillinger"</b>" for å konfigurere denne kontoen til å synkronisere e-post automatisk."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synkroniser nå"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e607231..c164d59 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Snelkoppeling naar map een naam geven"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Wachten op synchronisatie"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Uw e-mail wordt zo weergegeven."</string>
<string name="not_synced_title" msgid="794279749170198599">"Account niet gesynchroniseerd"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Automatische synchronisatie is niet ingesteld voor dit account.\nRaak"<b>"Nu synchroniseren"</b>" aan om e-mail één keer te synchroniseren of raak "<b>"Synchronisatie-instellingen wijzigen"</b>" aan om automatische synchronisatie in te stellen voor dit account."</string>
<string name="manual_sync" msgid="6743983544685622800">"Nu synchroniseren"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3d0616e..160a9e6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Nazwij skrót folderu"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Czekam na synchronizację"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-maile pojawią się za chwilę."</string>
<string name="not_synced_title" msgid="794279749170198599">"Konto nie jest zsynchronizowane"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Konto nie jest skonfigurowane do automatycznej synchronizacji.\nKliknij "<b>"Synchronizuj"</b>", by zsynchronizować pocztę jeden raz, lub "<b>"Zmień ustawienia synchronizacji"</b>", by skonfigurować konto do automatycznej synchronizacji wiadomości."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchronizuj"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 88af025..364a00a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Atalho para pasta de nome"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"A aguardar sincronização"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"O seu email aparecerá em breve."</string>
<string name="not_synced_title" msgid="794279749170198599">"Conta não sincronizada"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"A conta não está configurada para sincronização automática.\nToque em "<b>"Sincronizar Agora"</b>" para sincronizar correio uma vez ou em "<b>"Alterar Definições de Sincronização"</b>" para configurar esta conta para sincronização automática de correio."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincronizar agora"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7122a1e..ef408ab 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Atalho da pasta Nome"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Aguardando sincronização"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Seu e-mail será exibido em breve."</string>
<string name="not_synced_title" msgid="794279749170198599">"Conta não sincronizada"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Esta conta não está configurada para sincronizar automaticamente.\nToque em "<b>"Sincronizar agora"</b>" para sincronizar os e-mails uma vez ou em "<b>"Alterar configurações de sincronização"</b>" para configurar a sincronização automática de e-mails desta conta."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincr. agora"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index f96be94..9266ca2 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -439,8 +439,6 @@
<skip />
<!-- no translation found for wait_for_sync_title (2767841242539238015) -->
<skip />
- <!-- no translation found for wait_for_sync_body (7718316938173643688) -->
- <skip />
<!-- no translation found for not_synced_title (794279749170198599) -->
<skip />
<!-- no translation found for wait_for_manual_sync_body (2003192935254244968) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b0944bb..5b0aa8e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Denumiţi o comandă rapidă pentru dosar"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Se aşteaptă sincronizarea"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-mailul dvs. va apărea în curând."</string>
<string name="not_synced_title" msgid="794279749170198599">"Cont nesincronizat"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Acest cont nu este configurat să se sincronizeze în mod automat.\nAtingeţi "<b>"Sincronizaţi acum"</b>", pentru a sincroniza mesajele de e-mail o dată sau "<b>"Modificaţi setările de sincronizare"</b>" ca să configuraţi acest cont pentru a sincroniza mesajele de e-mail în mod automat."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sincron.acum"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ba8645a..69d3d70 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ярлык папки"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Синхронизация…"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Ваши сообщения загружаются."</string>
<string name="not_synced_title" msgid="794279749170198599">"Аккаунт не синхронизирован"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"В этом аккаунте не настроена автоматическая синхронизация.\nВыберите "<b>"Настройки синхронизации"</b>", чтобы включить ее, или "<b>"Синхронизировать сейчас"</b>", чтобы синхронизировать почту один раз."</string>
<string name="manual_sync" msgid="6743983544685622800">"Синхр."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e63e6ef..be6cabb 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Pomenovať skratku priečinka"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Čaká sa na synchronizáciu"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Váš e-mail sa zobrazí čoskoro."</string>
<string name="not_synced_title" msgid="794279749170198599">"Účet nie je synchronizovaný"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Tento účet nie je nastavený na automatickú synchronizáciu.\nAk chcete synchronizovať e-maily jednorazovo, dotknite sa položky "<b>"Synchronizovať"</b>". Ak chcete nastaviť, aby účet synchronizoval e-maily automaticky, dotknite sa položky "<b>"Zmeniť nastavenia synchronizácie"</b>"."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synchroniz."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 81027db..b61e4ff 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ime bližnjice do mape"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Čakanje na sinhronizacijo"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Vaša e-pošta se bo kmalu pojavila."</string>
<string name="not_synced_title" msgid="794279749170198599">"Račun ni sinhroniziran"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Ta račun se ne sinhronizira samodejno.\nDotaknite se "<b>"Sinhroniziraj"</b>", če želite enkrat sinhronizirati pošto, ali "<b>"Spremeni nastavitve sinhronizacije"</b>", če želite spremeniti nastavitve računa tako, da se bo pošta samodejno sinhronizirala."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sinhroniz."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 25091ae..21fb828 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Именовање пречице директоријума"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Чека се синхронизација"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Адреса е-поште ће се ускоро појавити."</string>
<string name="not_synced_title" msgid="794279749170198599">"Налог није синхронизован"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Овај налог није подешен за аутоматску синхронизацију.\nДодирните "<b>"Синхронизуј одмах"</b>" да бисте синхронизовали пошту једном, односно "<b>"Промени подешавања синхронизације"</b>" да бисте подесили овај налог да аутоматски синхронизује пошту."</string>
<string name="manual_sync" msgid="6743983544685622800">"Синхр. одмах"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a900225..3a90e82 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -188,8 +188,8 @@
<item quantity="other" msgid="2250720080221922267">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har rapporterats som Inte skräppost."</item>
</plurals>
<plurals name="conversation_not_important">
- <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har markerats som oviktig."</item>
- <item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har markerats som oviktig."</item>
+ <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har markerats som icke viktig."</item>
+ <item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har markerats som icke viktig."</item>
</plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> har rapporterats som nätfiske."</item>
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Kortkommando för att namnge mapp"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Väntar på synk"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Ditt e-postmeddelande visas snart."</string>
<string name="not_synced_title" msgid="794279749170198599">"Kontot är inte synkat"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Det här kontot har inte konfigurerats så att det synkroniseras automatiskt.\nTryck på "<b>"Synka nu"</b>" om du vill synkronisera e-post en gång eller "<b>"Ändra synkroniseringsinställn."</b>" om du vill konfigurera kontot så att e-post synkroniseras automatiskt."</string>
<string name="manual_sync" msgid="6743983544685622800">"Synka nu"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 82e91f8..f0af847 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -166,7 +166,7 @@
<string name="loading_conversations" msgid="2649440958602369555">"Inapakia…"</string>
<string name="empty_inbox" msgid="7623182658180140245">"Umemaliza! Tafadhali furahia siku yako."</string>
<string name="empty_search" msgid="7123710829748939105">"Lo! Hatukupata chochote kwa utafutaji wa \"<xliff:g id="SEARCH_QUERY">%1$s</xliff:g>\"."</string>
- <string name="empty_spam_folder" msgid="7915096608607243274">"Riboribo, hakuna barua taka hapa!"</string>
+ <string name="empty_spam_folder" msgid="7915096608607243274">"Hoyaaa, hakuna barua taka!"</string>
<string name="empty_trash_folder" msgid="2205589798674653912">"Hakuna takataka hapa. Asante kwa kurejeleza!"</string>
<string name="empty_folder" msgid="107806583742395757">"Hakuna barua pepe hapa."</string>
<string name="getting_messages" msgid="563711962781090231">"Inaleta ujumbe wako"</string>
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ipe jina njia ya mkato ya folda"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Inasubiri usawazishaji"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Barua pepe yako itaonekana baada ya muda mfupi."</string>
<string name="not_synced_title" msgid="794279749170198599">"Akaunti haijasawazishwa"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Akaunti hii haijawekwa kujisawazisha kiotomatiki.\nGusa "<b>"Sawazisha Sasa"</b>" ili kusawazisha barua pepe mara moja, au "<b>"Badilisha Mipangilio ya Usawazishaji"</b>" ili kuweka akaunti hii isawazishe barua pepe kiotomatiki."</string>
<string name="manual_sync" msgid="6743983544685622800">"Sawazisha sasa"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 00256cd..a97b072 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -21,7 +21,7 @@
<string name="to" msgid="4392614766835725698">"ถึง"</string>
<string name="cc" msgid="7017720927911078193">"สำเนา"</string>
<string name="bcc" msgid="3098643138241111579">"สำเนาลับ"</string>
- <string name="subject_hint" msgid="7253964583324677128">"หัวเรื่อง"</string>
+ <string name="subject_hint" msgid="7253964583324677128">"เรื่อง"</string>
<string name="body_hint" msgid="4279864165439577668">"เขียนอีเมล"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"แนบไฟล์"</string>
<string name="add_photo_attachment" msgid="3738882100645552858">"แนบรูปภาพ"</string>
@@ -111,11 +111,11 @@
<string name="download_failed" msgid="442019281547315527">"โหลดไม่ได้ แตะเพื่อลองซ้ำ"</string>
<string name="attachments_header" msgid="6459475590011460229">"ไฟล์แนบ"</string>
<string name="menu_photo_save_all" msgid="4295226099481995348">"บันทึกทั้งหมด"</string>
- <string name="menu_photo_share" msgid="2214772815165829079">"แบ่งปัน"</string>
- <string name="menu_photo_share_all" msgid="4577299400844129078">"แบ่งปันหมด"</string>
+ <string name="menu_photo_share" msgid="2214772815165829079">"แชร์"</string>
+ <string name="menu_photo_share_all" msgid="4577299400844129078">"แชร์หมด"</string>
<string name="menu_photo_print" msgid="1751063711206436775">"พิมพ์"</string>
<string name="saving" msgid="925514721138014677">"กำลังบันทึก…"</string>
- <string name="choosertitle_sharevia" msgid="6142681649048665134">"แบ่งปันผ่าน"</string>
+ <string name="choosertitle_sharevia" msgid="6142681649048665134">"แชร์ผ่าน"</string>
<string name="contextmenu_openlink" msgid="2176176524824953775">"เปิดในเบราว์เซอร์"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"คัดลอก"</string>
<string name="contextmenu_copylink" msgid="3580131515400610839">"คัดลอก URL ของลิงก์"</string>
@@ -125,7 +125,7 @@
<string name="contextmenu_add_contact" msgid="8395100913366045250">"เพิ่มรายชื่อติดต่อ"</string>
<string name="contextmenu_send_mail" msgid="8301941130009797208">"ส่งอีเมล"</string>
<string name="contextmenu_map" msgid="7721544518698532954">"แผนที่"</string>
- <string name="contextmenu_sharelink" msgid="6213520416250245200">"แบ่งปันลิงก์"</string>
+ <string name="contextmenu_sharelink" msgid="6213520416250245200">"แชร์ลิงก์"</string>
<string name="contextmenu_help" msgid="4651718679842414097">"ความช่วยเหลือ"</string>
<string name="contextmenu_feedback" msgid="4429118420169571473">"ส่งความคิดเห็น"</string>
<!-- no translation found for num_selected (5723323585692387843) -->
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"ตั้งชื่อทางลัดของโฟลเดอร์"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"กำลังรอการซิงค์"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"อีเมลของคุณจะปรากฏในไม่ช้า"</string>
<string name="not_synced_title" msgid="794279749170198599">"บัญชีไม่ได้ซิงค์"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"บัญชีนี้ไม่ได้รับการตั้งค่าให้ซิงค์อัตโนมัติ\nแตะ "<b>"ซิงค์เลย"</b>" เพื่อซิงค์เมลหนึ่งครั้ง หรือแตะ "<b>"เปลี่ยนการตั้งค่าการซิงค์"</b>" เพื่อตั้งค่าบัญชีนี้ให้ซิงค์เมลอัตโนมัติ"</string>
<string name="manual_sync" msgid="6743983544685622800">"ซิงค์เลย"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3d807f0..6e09534 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Shortcut sa pangalan ng folder"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Naghihintay ng pag-sync"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Lilitaw na ang iyong email."</string>
<string name="not_synced_title" msgid="794279749170198599">"Hindi na-sync ang account"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Hindi naka-set up ang account na ito upang awtomatikong mag-sync.\nPindutin ang "<b>"I-sync Ngayon"</b>" upang i-sync ang mail nang isang beses, o "<b>"Baguhin ang Mga Setting ng Pag-sync"</b>" upang i-set up ang account na ito upang awtomatikong i-sync ang mail."</string>
<string name="manual_sync" msgid="6743983544685622800">"I-sync na"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ebcd69b..3336367 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -134,7 +134,7 @@
<item quantity="one" msgid="3657821200245019288">"İleti dizisini taşı"</item>
<item quantity="other" msgid="1685896770174368261">"<xliff:g id="ID_1">%1$d</xliff:g> ileti dizisini taşı"</item>
</plurals>
- <string name="content_description" msgid="169080965055367954">"<xliff:g id="SUBJECT">%3$s</xliff:g> hakkında <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="DATE">%5$s</xliff:g> tarihinde <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
+ <string name="content_description" msgid="169080965055367954">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> adlı katılımcıya <xliff:g id="DATE">%5$s</xliff:g> tarihinde gönderilen <xliff:g id="SUBJECT">%3$s</xliff:g> konulu ve <xliff:g id="READSTATE">%6$s</xliff:g> durumda olan iletinin bir bölümü: <xliff:g id="SNIPPET">%4$s</xliff:g>"</string>
<string name="content_description_today" msgid="7796658700638720091">"<xliff:g id="SUBJECT">%3$s</xliff:g> hakkında <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (saat: <xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="219566857950091332">"ileti dizisi okundu"</string>
<string name="unread_string" msgid="588180203444398297">"ileti dizisi okunmadı"</string>
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Ad klasörü kısayolu"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Senkronize etmek için bekleniyor"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"E-postanız birazdan görüntülenecektir."</string>
<string name="not_synced_title" msgid="794279749170198599">"Hesap senkronize değil"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Bu hesap otomatik olarak senkronize edilecek şekilde yapılandırılmadı.\nPostayı bir kez senkronize etmek için "<b>"Şimdi Senk Et"</b>"\'e veya bu hesabı postayı otomatik olarak senkronize edilecek şekilde ayarlamak için "<b>"Senk Ayarlarını Değiştir"</b>"\'e dokunun."</string>
<string name="manual_sync" msgid="6743983544685622800">"Şimdi senk et"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index dd74128..1d8123e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Назвати ярлик папки"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Очікування на синхронізацію"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Електронна пошта з’явиться незабаром."</string>
<string name="not_synced_title" msgid="794279749170198599">"Обліковий запис не синхронізовано"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Цей обліковий запис не налаштовано для автоматичної синхронізації.\nВиберіть "<b>"Синхронізувати зараз"</b>", щоб синхронізувати пошту один раз, або "<b>"Змінити налаштування синхронізації"</b>", щоб налаштувати цей обліковий запис для автоматичної синхронізації пошти."</string>
<string name="manual_sync" msgid="6743983544685622800">"Синхр. зараз"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2daa4dc..9c483e3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -61,7 +61,7 @@
<string name="archive" msgid="847250094775910499">"Lưu trữ"</string>
<string name="report_spam" msgid="6467567747975393907">"Báo cáo spam"</string>
<string name="mark_not_spam" msgid="694891665407228160">"Báo cáo không phải spam"</string>
- <string name="report_phishing" msgid="5714205737453138338">"Báo cáo thư lừa đảo"</string>
+ <string name="report_phishing" msgid="5714205737453138338">"Báo cáo lừa đảo"</string>
<string name="delete" msgid="844871204175957681">"Xóa"</string>
<string name="discard_drafts" msgid="6862272443470085375">"Hủy thư nháp"</string>
<string name="refresh" msgid="490989798005710951">"Làm mới"</string>
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Lối tắt thư mục tên"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Đang đợi đồng bộ hóa"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"Email của bạn sẽ xuất hiện trong chốc lát."</string>
<string name="not_synced_title" msgid="794279749170198599">"Tài khoản chưa được đồng bộ hóa"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Tài khoản này không được thiết lập để tự động đồng bộ hóa.\nChạm vào "<b>"Đồng bộ hóa ngay bây giờ"</b>" để đồng bộ hóa thư một lần hoặc "<b>"Thay đổi cài đặt đồng bộ hóa"</b>" để thiết lập tài khoản này tự động đồng bộ hóa thư."</string>
<string name="manual_sync" msgid="6743983544685622800">"Đồng bộ hóa ngay bây giờ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b45e491..d22da01 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"为文件夹快捷方式命名"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"正在等待同步"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"您的电子邮件很快就会显示。"</string>
<string name="not_synced_title" msgid="794279749170198599">"帐户未同步"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"此帐户未设置为自动同步。您可以\n触摸"<b>"立即同步"</b>"同步邮件一次，或者触摸"<b>"更改同步设置"</b>"，将此帐户设置为自动同步邮件。"</string>
<string name="manual_sync" msgid="6743983544685622800">"立即同步"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 7bfdd9a..c19d9ae 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"為資料夾捷徑命名"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"正在等待同步處理"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"您的電子郵件即將顯示。"</string>
<string name="not_synced_title" msgid="794279749170198599">"帳戶未同步"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"這個帳戶尚未設定為自動保持同步。\n請輕觸 [立即同步]"<b></b>"，將您的郵件進行同步處理一次，或者輕觸 [更改同步設定]"<b></b>"，將帳戶設定為自動保持郵件同步。"</string>
<string name="manual_sync" msgid="6743983544685622800">"立即同步"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 52b7808..cd003af 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"名稱資料夾捷徑"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"正在等待同步處理"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"即將顯示您的電子郵件。"</string>
<string name="not_synced_title" msgid="794279749170198599">"帳戶尚未同步處理"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"這個帳戶尚未設成自動同步處理。\n請輕觸 [立即同步處理]"<b></b>"，將您的郵件同步處理一次，或者輕觸 [變更同步處理設定]"<b></b>"，將帳戶設定成自動同步處理郵件。"</string>
<string name="manual_sync" msgid="6743983544685622800">"立即同步處理"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 4438016..75bdcc1 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -290,7 +290,6 @@
<skip />
<string name="shortcut_name_title" msgid="8220482314700618391">"Isinqamuleli sefolda yegama"</string>
<string name="wait_for_sync_title" msgid="2767841242539238015">"Ilinde ukuvumelanisa"</string>
- <string name="wait_for_sync_body" msgid="7718316938173643688">"I-imeyli yakho izovela maduze."</string>
<string name="not_synced_title" msgid="794279749170198599">"I-akhawunti ayivumelanisiwe"</string>
<string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Le akhawunti ayisethiwe kufika ekuvumelaniseni kokuzenzakalela.\nThinta u-"<b>"Vumelanisa manje"</b>" ukuze uvumelanise imeyila kanye, noma "<b>"shintsha izilungiselelo zokuvumelanisa"</b>" ukuze usethe le akhawunti ukuze ivumelanise imeyili ngokuzenzakalela."</string>
<string name="manual_sync" msgid="6743983544685622800">"Vumelanisa manje"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bac8c47..92df5e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -167,6 +167,8 @@
<string name="menu_settings">Settings</string>
<!-- Menu item: search through the Gmail inbox -->
<string name="menu_search">Search</string>
+ <!-- Title of the drawer, indicating what it is used for, which is navigation of the app -->
+ <string name="drawer_title">Navigation</string>
<!-- Menu item: shown in conversation menu. Tap this to move to mark conversation as important [CHAR LIMIT=30] -->
<string name="mark_important">Mark important</string>
diff --git a/src/com/android/emailcommon/utility/ConversionUtilities.java b/src/com/android/emailcommon/utility/ConversionUtilities.java
index 0dbb520..1f53db8 100644
--- a/src/com/android/emailcommon/utility/ConversionUtilities.java
+++ b/src/com/android/emailcommon/utility/ConversionUtilities.java
@@ -60,9 +60,6 @@
public static class BodyFieldData {
public String textContent;
public String htmlContent;
- public String textReply;
- public String htmlReply;
- public String introText;
public String snippet;
public boolean isQuotedReply;
public boolean isQuotedForward;
@@ -76,39 +73,12 @@
final BodyFieldData data = new BodyFieldData();
StringBuffer sbHtml = null;
StringBuffer sbText = null;
- StringBuffer sbHtmlReply = null;
- StringBuffer sbTextReply = null;
- StringBuffer sbIntroText = null;
for (Part viewable : viewables) {
String text = MimeUtility.getTextFromPart(viewable);
- String[] replyTags = viewable.getHeader(MimeHeader.HEADER_ANDROID_BODY_QUOTED_PART);
- String replyTag = null;
- if (replyTags != null && replyTags.length > 0) {
- replyTag = replyTags[0];
- }
// Deploy text as marked by the various tags
boolean isHtml = "text/html".equalsIgnoreCase(viewable.getMimeType());
- if (replyTag != null) {
- data.isQuotedReply = BODY_QUOTED_PART_REPLY.equalsIgnoreCase(replyTag);
- data.isQuotedForward = BODY_QUOTED_PART_FORWARD.equalsIgnoreCase(replyTag);
- boolean isQuotedIntro = BODY_QUOTED_PART_INTRO.equalsIgnoreCase(replyTag);
-
- if (data.isQuotedReply || data.isQuotedForward) {
- if (isHtml) {
- sbHtmlReply = appendTextPart(sbHtmlReply, text);
- } else {
- sbTextReply = appendTextPart(sbTextReply, text);
- }
- continue;
- }
- if (isQuotedIntro) {
- sbIntroText = appendTextPart(sbIntroText, text);
- continue;
- }
- }
-
// Most of the time, just process regular body parts
if (isHtml) {
sbHtml = appendTextPart(sbHtml, text);
@@ -130,15 +100,6 @@
data.snippet = TextUtilities.makeSnippetFromHtmlText(text);
}
}
- if (sbHtmlReply != null && sbHtmlReply.length() != 0) {
- data.htmlReply = sbHtmlReply.toString();
- }
- if (sbTextReply != null && sbTextReply.length() != 0) {
- data.textReply = sbTextReply.toString();
- }
- if (sbIntroText != null && sbIntroText.length() != 0) {
- data.introText = sbIntroText.toString();
- }
return data;
}
}
diff --git a/src/com/android/mail/browse/ConversationContainer.java b/src/com/android/mail/browse/ConversationContainer.java
index b75dd5a..0fa9d03 100644
--- a/src/com/android/mail/browse/ConversationContainer.java
+++ b/src/com/android/mail/browse/ConversationContainer.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.content.res.Configuration;
import android.database.DataSetObserver;
-import android.graphics.Canvas;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.util.SparseArray;
@@ -63,8 +62,14 @@
* sandwich has unique characteristics: the list items are scrolled based on an external controller,
* and we happen to know all of the overlay positions up front. So it didn't make sense to shoehorn
* a ListView in and instead, we rolled our own view recycler by borrowing key details from
- * ListView and AbsListView.
+ * ListView and AbsListView.<br/><br/>
*
+ * There is one additional constraint with the recycling: since scroll
+ * notifications happen during the WebView's draw, we do not remove and re-add views for recycling.
+ * Instead, we simply move the views off-screen and add them to our recycle cache. When the views
+ * are reused, they are simply moved back on screen instead of added. This practice
+ * circumvents the issues found when views are added or removed during draw (which results in
+ * elements not being drawn and other visual oddities). See b/10994303 for more details.
*/
public class ConversationContainer extends ViewGroup implements ScrollListener {
private static final String TAG = ConversationViewFragment.LAYOUT_TAG;
@@ -89,20 +94,6 @@
private OverlayPosition[] mOverlayPositions;
private ConversationWebView mWebView;
private SnapHeader mSnapHeader;
- private View mTopMostOverlay;
-
- /**
- * This is a hack.
- *
- * <p>Without this hack enabled, very fast scrolling can sometimes cause the top-most layers
- * to skip being drawn for a frame or two. It happens specifically when overlay views are
- * attached or added, and WebView happens to draw (on its own) immediately afterwards.
- *
- * <p>The workaround is to force an additional draw of the top-most overlay. Since the problem
- * only occurs when scrolling overlays are added, restrict the additional draw to only occur
- * if scrolling overlays were added since the last draw.
- */
- private boolean mAttachedOverlaySinceLastDraw;
private final List<View> mNonScrollingChildren = Lists.newArrayList();
@@ -178,7 +169,7 @@
/**
* The adapter index of the lowest overlay item that is above the top of the screen and reports
* {@link ConversationOverlayItem#canPushSnapHeader()}. We calculate this after a pass through
- * {@link #positionOverlays(int, int)}.
+ * {@link #positionOverlays}.
*
*/
private int mSnapIndex;
@@ -263,8 +254,6 @@
mWebView = (ConversationWebView) findViewById(R.id.webview);
mWebView.addScrollListener(this);
- mTopMostOverlay = findViewById(R.id.conversation_topmost_overlay);
-
for (int id : BOTTOM_LAYER_VIEW_IDS) {
mNonScrollingChildren.add(findViewById(id));
}
@@ -346,7 +335,7 @@
private void clearOverlays() {
for (int i = 0, len = mOverlayViews.size(); i < len; i++) {
- detachOverlay(mOverlayViews.valueAt(i));
+ detachOverlay(mOverlayViews.valueAt(i), true /* removeFromContainer */);
}
mOverlayViews.clear();
}
@@ -367,7 +356,7 @@
mAdditionalBottomBorderAdded = false;
mSnapEnabled = isSnapEnabled();
- positionOverlays(0, mOffsetY);
+ positionOverlays(mOffsetY, false /* postAddView */);
}
private void forwardFakeMotionEvent(MotionEvent original, int newAction) {
@@ -450,14 +439,23 @@
}
@Override
- public void onNotifierScroll(final int x, final int y) {
+ public void onNotifierScroll(final int y) {
mVelocityTracker.onInput(y);
mDisableLayoutTracing = true;
- positionOverlays(x, y);
+ positionOverlays(y, true /* postAddView */); // post the addView since we're in draw code
mDisableLayoutTracing = false;
}
- private void positionOverlays(int x, int y) {
+ /**
+ * Positions the overlays given an updated y position for the container.
+ * @param y the current top position on screen
+ * @param postAddView If {@code true}, posts all calls to
+ * {@link #addViewInLayoutWrapper(android.view.View, boolean)}
+ * to the UI thread rather than adding it immediately. If {@code false},
+ * calls {@link #addViewInLayoutWrapper(android.view.View, boolean)}
+ * immediately.
+ */
+ private void positionOverlays(int y, boolean postAddView) {
mOffsetY = y;
/*
@@ -525,7 +523,7 @@
traceLayout("in loop, spacer=%d overlay=%d t/b=%d/%d (%s)", spacerIndex, adapterIndex,
itemPos.top, itemPos.bottom, adapterItem);
- positionOverlay(adapterIndex, itemPos.top, itemPos.bottom);
+ positionOverlay(adapterIndex, itemPos.top, itemPos.bottom, postAddView);
// and keep stacking overlays unconditionally if we are on the first spacer, or as long
// as overlays are contiguous
@@ -545,21 +543,21 @@
traceLayout("in contig loop, spacer=%d overlay=%d t/b=%d/%d (%s)", spacerIndex,
adapterIndex, itemPos.top, itemPos.bottom, adapterItem);
- positionOverlay(adapterIndex, itemPos.top, itemPos.bottom);
+ positionOverlay(adapterIndex, itemPos.top, itemPos.bottom, postAddView);
}
spacerIndex--;
}
positionSnapHeader(mSnapIndex);
- positionAdditionalBottomBorder();
+ positionAdditionalBottomBorder(postAddView);
}
/**
* Adds an additional bottom border to the overlay views in case
* the overlays do not fill the entire screen.
*/
- private void positionAdditionalBottomBorder() {
+ private void positionAdditionalBottomBorder(boolean postAddView) {
final int lastBottom = mAdditionalBottomBorderOverlayTop;
final int containerHeight = webPxToScreenPx(mWebView.getContentHeight());
final int speculativeHeight = containerHeight - lastBottom;
@@ -572,7 +570,7 @@
setAdditionalBottomBorderHeight(speculativeHeight);
if (!mAdditionalBottomBorderAdded) {
- addViewInLayoutWrapper(mAdditionalBottomBorder);
+ addViewInLayoutWrapper(mAdditionalBottomBorder, postAddView);
mAdditionalBottomBorderAdded = true;
}
@@ -649,18 +647,11 @@
private void onOverlayScrolledOff(final int adapterIndex, final OverlayView overlay,
int overlayTop, int overlayBottom) {
- // detach the view asynchronously, as scroll notification can happen during a draw, when
- // it's not safe to remove children
-
- // but immediately remove this view from the view set so future lookups don't find it
+ // immediately remove this view from the view set so future lookups don't find it
mOverlayViews.remove(adapterIndex);
- post(new Runnable() {
- @Override
- public void run() {
- detachOverlay(overlay);
- }
- });
+ // detach but don't actually remove from the view
+ detachOverlay(overlay, false /* removeFromContainer */);
// push it out of view immediately
// otherwise this scrolled-off header will continue to draw until the runnable runs
@@ -678,12 +669,15 @@
public void addScrapView(int type, View v) {
mScrapViews.add(type, v);
+ addViewInLayoutWrapper(v, false /* postAddView */);
}
- private void detachOverlay(OverlayView overlay) {
+ private void detachOverlay(OverlayView overlay, boolean removeFromContainer) {
// Prefer removeViewInLayout over removeView. The typical followup layout pass is unneeded
// because removing overlay views doesn't affect overall layout.
- removeViewInLayout(overlay.view);
+ if (removeFromContainer) {
+ removeViewInLayout(overlay.view);
+ }
mScrapViews.add(overlay.itemType, overlay.view);
if (overlay.view instanceof DetachListener) {
((DetachListener) overlay.view).onDetachedFromParent();
@@ -737,17 +731,7 @@
}
}
- positionOverlays(0, mOffsetY);
- }
-
- @Override
- protected void dispatchDraw(Canvas canvas) {
- super.dispatchDraw(canvas);
-
- if (mAttachedOverlaySinceLastDraw) {
- drawChild(canvas, mTopMostOverlay, getDrawingTime());
- mAttachedOverlaySinceLastDraw = false;
- }
+ positionOverlays(mOffsetY, false /* postAddView */);
}
@Override
@@ -784,7 +768,8 @@
return (int) (webPx * mScale);
}
- private void positionOverlay(int adapterIndex, int overlayTopY, int overlayBottomY) {
+ private void positionOverlay(
+ int adapterIndex, int overlayTopY, int overlayBottomY, boolean postAddView) {
final OverlayView overlay = mOverlayViews.get(adapterIndex);
final ConversationOverlayItem item = mOverlayAdapter.getItem(adapterIndex);
@@ -797,7 +782,7 @@
View overlayView = overlay != null ? overlay.view : null;
// show and/or move overlay
if (overlayView == null) {
- overlayView = addOverlayView(adapterIndex);
+ overlayView = addOverlayView(adapterIndex, postAddView);
ViewCompat.setLayoutDirection(overlayView, ViewCompat.getLayoutDirection(this));
measureOverlayView(overlayView);
item.markMeasurementValid();
@@ -852,7 +837,7 @@
child.layout(childLeft, top, childLeft + child.getMeasuredWidth(), bottom);
}
- private View addOverlayView(int adapterIndex) {
+ private View addOverlayView(int adapterIndex, boolean postAddView) {
final int itemType = mOverlayAdapter.getItemViewType(adapterIndex);
final View convertView = mScrapViews.poll(itemType);
@@ -865,17 +850,41 @@
LogUtils.d(TAG, "want to CREATE scrolled-in view: index=%d obj=%s", adapterIndex, view);
}
- addViewInLayoutWrapper(view);
+ if (view.getParent() == null) {
+ addViewInLayoutWrapper(view, postAddView);
+ } else {
+ // Need to call postInvalidate since the view is being moved back on
+ // screen and we want to force it to draw the view. Without doing this,
+ // the view may not draw itself when it comes back on screen.
+ view.postInvalidate();
+ }
return view;
}
- private void addViewInLayoutWrapper(View view) {
- final int index = BOTTOM_LAYER_VIEW_IDS.length;
- addViewInLayout(view, index, view.getLayoutParams(), true /* preventRequestLayout */);
- mAttachedOverlaySinceLastDraw = true;
+ private void addViewInLayoutWrapper(View view, boolean postAddView) {
+ final AddViewRunnable addviewRunnable = new AddViewRunnable(view);
+ if (postAddView) {
+ post(addviewRunnable);
+ } else {
+ addviewRunnable.run();
+ }
}
+ private class AddViewRunnable implements Runnable {
+ public final View mView;
+
+ public AddViewRunnable(View view) {
+ mView = view;
+ }
+
+ @Override
+ public void run() {
+ final int index = BOTTOM_LAYER_VIEW_IDS.length;
+ addViewInLayout(mView, index, mView.getLayoutParams(), true /* preventRequestLayout */);
+ }
+ };
+
private boolean isSnapEnabled() {
if (mAccountController == null || mAccountController.getAccount() == null
|| mAccountController.getAccount().settings == null) {
@@ -936,19 +945,6 @@
}
/**
- * Return a collection of all currently visible overlay views, in no particular order.
- * Please don't mess with them too badly (e.g. remove from parent).
- *
- */
- public List<View> getOverlayViews() {
- final List<View> views = Lists.newArrayList();
- for (int i = 0, len = mOverlayViews.size(); i < len; i++) {
- views.add(mOverlayViews.valueAt(i).view);
- }
- return views;
- }
-
- /**
* Prevents any layouts from happening until the next time
* {@link #onGeometryChange(OverlayPosition[])} is
* called. Useful when you know the HTML spacer coordinates are inconsistent with adapter items.
@@ -969,7 +965,7 @@
}
mOverlayPositions = overlayPositions;
- positionOverlays(0, mOffsetY);
+ positionOverlays(mOffsetY, false /* postAddView */);
}
private void traceLayout(String msg, Object... params) {
diff --git a/src/com/android/mail/browse/ConversationWebView.java b/src/com/android/mail/browse/ConversationWebView.java
index a5d3a14..506674c 100644
--- a/src/com/android/mail/browse/ConversationWebView.java
+++ b/src/com/android/mail/browse/ConversationWebView.java
@@ -180,7 +180,7 @@
super.onScrollChanged(l, t, oldl, oldt);
for (ScrollListener listener : mScrollListeners) {
- listener.onNotifierScroll(l, t);
+ listener.onNotifierScroll(t);
}
}
diff --git a/src/com/android/mail/browse/MessageScrollView.java b/src/com/android/mail/browse/MessageScrollView.java
index d3182ae..91e7ca2 100644
--- a/src/com/android/mail/browse/MessageScrollView.java
+++ b/src/com/android/mail/browse/MessageScrollView.java
@@ -258,7 +258,7 @@
protected void onScrollChanged(int l, int t, int oldl, int oldt) {
super.onScrollChanged(l, t, oldl, oldt);
for (ScrollListener listener : mScrollListeners) {
- listener.onNotifierScroll(l, t);
+ listener.onNotifierScroll(t);
}
}
diff --git a/src/com/android/mail/browse/ScrollIndicatorsView.java b/src/com/android/mail/browse/ScrollIndicatorsView.java
index 4656644..3a3055b 100644
--- a/src/com/android/mail/browse/ScrollIndicatorsView.java
+++ b/src/com/android/mail/browse/ScrollIndicatorsView.java
@@ -77,7 +77,7 @@
}
@Override
- public void onNotifierScroll(int left, int top) {
+ public void onNotifierScroll(int top) {
awakenScrollBars();
}
}
diff --git a/src/com/android/mail/browse/ScrollNotifier.java b/src/com/android/mail/browse/ScrollNotifier.java
index 0d0b60e..f73b9d0 100644
--- a/src/com/android/mail/browse/ScrollNotifier.java
+++ b/src/com/android/mail/browse/ScrollNotifier.java
@@ -19,7 +19,7 @@
public interface ScrollNotifier {
public interface ScrollListener {
- void onNotifierScroll(int x, int y);
+ void onNotifierScroll(int y);
}
void addScrollListener(ScrollListener l);
diff --git a/src/com/android/mail/ui/HierarchicalFolderSelectorAdapter.java b/src/com/android/mail/ui/HierarchicalFolderSelectorAdapter.java
index bd21c79..49fd81a 100644
--- a/src/com/android/mail/ui/HierarchicalFolderSelectorAdapter.java
+++ b/src/com/android/mail/ui/HierarchicalFolderSelectorAdapter.java
@@ -38,6 +38,7 @@
private Context mContext;
+ @VisibleForTesting
public HierarchicalFolderSelectorAdapter(Context context, Cursor folders,
Set<String> initiallySelected, int layout, String header) {
super(context, folders, initiallySelected, layout, header);
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 0801bee..2d16f1b 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -25,6 +25,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.widget.DrawerLayout;
+import android.view.Gravity;
import android.widget.ListView;
import com.android.mail.ConversationListContext;
@@ -129,6 +130,8 @@
public boolean onCreate(Bundle savedInstanceState) {
mActivity.setContentView(R.layout.one_pane_activity);
mDrawerContainer = (DrawerLayout) mActivity.findViewById(R.id.drawer_container);
+ mDrawerContainer.setDrawerTitle(Gravity.START,
+ mActivity.getActivityContext().getString(R.string.drawer_title));
final String drawerPulloutTag = mActivity.getString(R.string.drawer_pullout_tag);
mDrawerPullout = mDrawerContainer.findViewWithTag(drawerPulloutTag);
mDrawerPullout.setBackgroundResource(R.color.list_background_color);
diff --git a/src/com/android/mail/ui/ScrollNotifyingListView.java b/src/com/android/mail/ui/ScrollNotifyingListView.java
index 467e498..d4e65d1 100644
--- a/src/com/android/mail/ui/ScrollNotifyingListView.java
+++ b/src/com/android/mail/ui/ScrollNotifyingListView.java
@@ -91,7 +91,7 @@
@SuppressWarnings("unused")
public void onScrollChanged(int l, int t, int oldl, int oldt) {
for (ScrollListener sl : mObservers) {
- sl.onNotifierScroll(l, t);
+ sl.onNotifierScroll(t);
}
}
diff --git a/src/com/android/mail/ui/SecureConversationViewController.java b/src/com/android/mail/ui/SecureConversationViewController.java
index 5e10794..edd37e9 100644
--- a/src/com/android/mail/ui/SecureConversationViewController.java
+++ b/src/com/android/mail/ui/SecureConversationViewController.java
@@ -22,6 +22,7 @@
import android.content.res.Resources;
import android.graphics.Rect;
import android.os.Bundle;
+import android.support.v4.text.BidiFormatter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -168,7 +169,7 @@
}
@Override
- public void onNotifierScroll(final int x, final int y) {
+ public void onNotifierScroll(final int y) {
// We need to decide whether or not to display the snap header.
// Get the location of the moveable message header inside the scroll view.
Rect rect = new Rect();
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 18ad970..ef4dfa3 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -121,6 +121,8 @@
public boolean onCreate(Bundle savedState) {
mActivity.setContentView(R.layout.two_pane_activity);
mDrawerContainer = (DrawerLayout) mActivity.findViewById(R.id.drawer_container);
+ mDrawerContainer.setDrawerTitle(Gravity.START,
+ mActivity.getActivityContext().getString(R.string.drawer_title));
mDrawerPullout = mDrawerContainer.findViewById(R.id.content_pane);
mLayout = (TwoPaneLayout) mActivity.findViewById(R.id.two_pane_activity);
if (mLayout == null) {
diff --git a/src/com/android/mail/utils/NotificationActionUtils.java b/src/com/android/mail/utils/NotificationActionUtils.java
index 15b151e..6dd05fc 100644
--- a/src/com/android/mail/utils/NotificationActionUtils.java
+++ b/src/com/android/mail/utils/NotificationActionUtils.java
@@ -28,10 +28,10 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
-import android.preview.support.wearable.notifications.RemoteInput;
-import android.preview.support.wearable.notifications.WearableNotifications;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder;
+import android.support.wearable.notifications.RemoteInput;
+import android.support.wearable.notifications.WearableNotifications;
import android.widget.RemoteViews;
import com.android.mail.MailIntentService;
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 83bded2..fa93733 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -29,13 +29,13 @@
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.preview.support.v4.app.NotificationManagerCompat;
-import android.preview.support.wearable.notifications.WearableNotifications;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.Contacts.Photo;
import android.support.v4.app.NotificationCompat;
import android.support.v4.text.BidiFormatter;
import android.support.v4.util.ArrayMap;
+import android.support.wearable.notifications.WearableNotifications;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;