ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

auto import from //depot/cupcake/@132589

This commit is contained in:
The Android Open Source Project 2009-03-03 14:04:31 -08:00
parent 7a8703fda9
commit 1f5bbf66d1
19 changed files with 70 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/message_compose.xml
View File

@ -84,7 +84,6 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="left|top"
android:minLines="3"
android:hint="@string/message_compose_body_hint"
android:inputType="textMultiLine|textAutoCorrect|textCapSentences" />
<!-- quoted text bar -->
<RelativeLayout android:id="@+id/quoted_text_bar"

6
res/layout/message_view.xml
View File

@ -25,12 +25,12 @@
android:layout_height="0dip"
android:layout_weight="1"
android:scrollbarStyle="outsideInset"
android:fadingEdge="none"
android:fillViewport="true">
android:fadingEdge="none">
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
android:layout_height="0dip"
android:layout_weight="1">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="54px"

23
res/layout/message_view_header.xml
View File

@ -24,23 +24,10 @@
<LinearLayout
android:id="@+id/from_container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:baselineAligned="false" >
<!-- Should be: -->
<!-- android:baselineAligned="true" -->
<ImageView
android:id="@+id/presence"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5px"
android:layout_gravity="center_vertical"
android:baselineAlignBottom="true" />
<!-- Should remove android:layout_gravity -->
android:layout_height="wrap_content" >
<TextView
android:id="@+id/from"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:textColor="?android:attr/textColorPrimaryInverse"
android:layout_width="0dip"
android:layout_weight="1.0"
@ -49,14 +36,12 @@
android:singleLine="true"
android:ellipsize="end"
android:paddingRight="6px" />
<ImageView
<View
android:id="@+id/attachment"
android:src="@drawable/ic_email_attachment_small"
android:background="@drawable/ic_email_attachment_small"
android:layout_width="22px"
android:layout_height="22px"
android:layout_gravity="center_vertical"
android:baselineAlignBottom="true" />
<!-- Should remove android:layout_gravity -->
android:layout_alignTop="@id/from" />
<TextView
android:id="@+id/date"
android:textAppearance="?android:attr/textAppearanceSmall"

2
res/values-cs/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Kopie"</string>
<string name="message_compose_bcc_hint">"Skrytá kopie"</string>
<string name="message_compose_subject_hint">"Předmět"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Původní zpráva --------"\n"Předmět: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Odesílatel: <xliff:g id="SENDER">%s</xliff:g>"\n"Komu: <xliff:g id="TO">%s</xliff:g>"\n"Kopie: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>napsal/a:"\n\n</string>
<string name="message_compose_quoted_text_label">"Text v uvozovkách"</string>

2
res/values-de/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Cc"</string>
<string name="message_compose_bcc_hint">"Bcc"</string>
<string name="message_compose_subject_hint">"Betreff"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Originalnachricht --------"\n"Betreff: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Von: <xliff:g id="SENDER">%s</xliff:g>"\n"An: <xliff:g id="TO">%s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> schrieb:"\n\n</string>
<string name="message_compose_quoted_text_label">"Zitierter Text"</string>

8
res/values-es/strings.xml
View File

@ -17,7 +17,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="read_attachment_label">"leer los archivos adjuntos del mensaje"</string>
<string name="read_attachment_desc">"Permite que esta aplicación lea los archivos adjuntos del correo electrónico."</string>
<string name="app_name">"Email"</string>
<string name="app_name">"Correo electrónico"</string>
<string name="accounts_title">"Tus cuentas"</string>
<string name="compose_title">"Redactar"</string>
<string name="debug_title">"Depurar"</string>
@ -29,7 +29,7 @@
<string name="reply_all_action">"Responder a todos"</string>
<string name="delete_action">"Suprimir"</string>
<string name="forward_action">"Reenviar"</string>
<string name="done_action">"Listo"</string>
<string name="done_action">"Finalizado"</string>
<string name="discard_action">"Descartar"</string>
<string name="save_draft_action">"Guardar como borrador"</string>
<string name="refresh_action">"Actualizar"</string>
@ -41,7 +41,7 @@
<string name="remove_account_action">"Eliminar cuenta"</string>
<string name="accounts_action">"Cuentas"</string>
<string name="mark_as_read_action">"Marcar como leída"</string>
<string name="mark_as_unread_action">"Marcar como no leída"</string>
<string name="mark_as_unread_action">"Marcar como no leído"</string>
<string name="add_cc_bcc_action">"Añadir Cc/CCO"</string>
<string name="add_attachment_action">"Añadir archivo adjunto"</string>
<string name="dump_settings_action">"Configuración de volcado"</string>
@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Cc"</string>
<string name="message_compose_bcc_hint">"CCO"</string>
<string name="message_compose_subject_hint">"Asunto"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%s</xliff:g>"\n"From: <xliff:g id="SENDER">%s</xliff:g>"\n"To: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
<string name="message_compose_quoted_text_label">"Texto entre comillas"</string>

14
res/values-fr/strings.xml
View File

@ -31,7 +31,7 @@
<string name="forward_action">"Transférer"</string>
<string name="done_action">"OK"</string>
<string name="discard_action">"Supprimer"</string>
<string name="save_draft_action">"Enregistrer"</string>
<string name="save_draft_action">"Enregistrer en tant que brouillon"</string>
<string name="refresh_action">"Actualiser"</string>
<string name="add_account_action">"Ajouter un compte"</string>
<string name="compose_action">"Nouveau message"</string>
@ -46,7 +46,7 @@
<string name="add_attachment_action">"Ajouter une pièce jointe"</string>
<string name="dump_settings_action">"Paramètres d\'image mémoire"</string>
<string name="accounts_context_menu_title">"Options de compte"</string>
<string name="status_loading_more">"Chargement des messages..."</string>
<string name="status_loading_more">"Chargement des messages en cours..."</string>
<string name="status_network_error">"Erreur de connexion"</string>
<string name="status_loading_more_failed">"Essayer de charger plus de messages"</string>
<string name="notification_new_title">"Nouvel e-mail"</string>
@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Cc"</string>
<string name="message_compose_bcc_hint">"Cci"</string>
<string name="message_compose_subject_hint">"Objet"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Message original --------"\n"Objet : <xliff:g id="SUBJECT">%s</xliff:g>"\n"De : <xliff:g id="SENDER">%s</xliff:g>"\n"À : <xliff:g id="TO">%s</xliff:g>"\n"Cc : <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> a écrit :"\n\n</string>
<string name="message_compose_quoted_text_label">"Texte du message précédent"</string>
@ -82,7 +80,7 @@
<string name="message_view_fetching_attachment_toast">"Récupération de la pièce jointe."</string>
<string name="message_deleted_toast">"Message supprimé."</string>
<string name="message_discarded_toast">"Message supprimé."</string>
<string name="message_saved_toast">"Message enregistré comme brouillon."</string>
<string name="message_saved_toast">"Message enregistré en tant que brouillon."</string>
<string name="account_setup_basics_title">"Configurer la messagerie électronique"</string>
<string name="account_setup_basics_instructions">"Saisissez l\'adresse e-mail de votre compte :"</string>
<string name="account_setup_basics_email_hint">"Adresse e-mail"</string>
@ -93,7 +91,7 @@
<string name="account_setup_check_settings_retr_info_msg">"Récupération des informations sur le compte…"</string>
<string name="account_setup_check_settings_check_incoming_msg">"Vérification des paramètres de serveur entrant…"</string>
<string name="account_setup_check_settings_check_outgoing_msg">"Vérification des paramètres de serveur sortant…"</string>
<string name="account_setup_check_settings_canceling_msg">"Annulation..."</string>
<string name="account_setup_check_settings_canceling_msg">"Annulation en cours..."</string>
<string name="account_setup_names_title">"Configurer la messagerie électronique"</string>
<string name="account_setup_names_instructions">"Votre compte est configuré et votre messagerie est active !"</string>
<string name="account_setup_names_account_name_label">"Donner un nom à ce compte (facultatif)"</string>
@ -161,8 +159,8 @@
<string name="account_settings_description_label">"Nom du compte"</string>
<string name="account_settings_name_label">"Votre nom"</string>
<string name="account_settings_notifications">"Paramètres de notification"</string>
<string name="account_settings_vibrate_enable">"Vibreur"</string>
<string name="account_settings_vibrate_summary">"Vibrer à la réception d\'un e-mail"</string>
<string name="account_settings_vibrate_enable">"Vibrer"</string>
<string name="account_settings_vibrate_summary">"Vibrer également lors de la réception d\'un e-mail"</string>
<string name="account_settings_ringtone">"Sélectionner la sonnerie"</string>
<string name="account_settings_servers">"Paramètres du serveur"</string>
<string name="account_delete_dlg_title">"Supprimer le compte"</string>

12
res/values-it/strings.xml
View File

@ -29,7 +29,7 @@
<string name="reply_all_action">"Rispondi a tutti"</string>
<string name="delete_action">"Elimina"</string>
<string name="forward_action">"Inoltra"</string>
<string name="done_action">"Fine"</string>
<string name="done_action">"Completato"</string>
<string name="discard_action">"Elimina"</string>
<string name="save_draft_action">"Salva come bozza"</string>
<string name="refresh_action">"Aggiorna"</string>
@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Cc"</string>
<string name="message_compose_bcc_hint">"Ccn"</string>
<string name="message_compose_subject_hint">"Oggetto"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Messaggio originale --------"\n"Oggetto: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Da: <xliff:g id="SENDER">%s</xliff:g>"\n"A: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scritto:"\n\n</string>
<string name="message_compose_quoted_text_label">"Testo tra virgolette"</string>
@ -73,8 +71,8 @@
<string name="message_view_cc_label">"Cc:"</string>
<string name="message_view_attachment_view_action">"Apri"</string>
<string name="message_view_attachment_download_action">"Salva"</string>
<string name="message_view_prev_action">"Messaggio prec."</string>
<string name="message_view_next_action">"Messaggio succ."</string>
<string name="message_view_prev_action">"Messaggio precedente"</string>
<string name="message_view_next_action">"Messaggio successivo"</string>
<string name="message_view_status_attachment_saved">"Allegato salvato su scheda SD come <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="message_view_status_attachment_not_saved">"Impossibile salvare l\'allegato nella scheda SD."</string>
<string name="message_view_show_pictures_instructions">"Seleziona \"Mostra immagini\" per visualizzare le immagini incorporate."</string>
@ -88,11 +86,11 @@
<string name="account_setup_basics_email_hint">"Indirizzo email"</string>
<string name="account_setup_basics_password_hint">"Password"</string>
<string name="account_setup_basics_default_label">"Invia email da questo account per impostazione predefinita."</string>
<string name="account_setup_basics_manual_setup_action">"Configurazione manuale"</string>
<string name="account_setup_basics_manual_setup_action">"Impostazione manuale"</string>
<string name="account_setup_username_password_toast">"Digita un indirizzo email e una password validi."</string>
<string name="account_setup_check_settings_retr_info_msg">"Recupero informazioni sull\'account in corso…"</string>
<string name="account_setup_check_settings_check_incoming_msg">"Verifica delle impostazioni del server della posta in arrivo in corso…"</string>
<string name="account_setup_check_settings_check_outgoing_msg">"Verifica impostazioni server posta in uscita…"</string>
<string name="account_setup_check_settings_check_outgoing_msg">"Verifica delle impostazioni del server della posta in uscita in corso…"</string>
<string name="account_setup_check_settings_canceling_msg">"Annullamento in corso..."</string>
<string name="account_setup_names_title">"Imposta email"</string>
<string name="account_setup_names_instructions">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>

2
res/values-ja/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Cc"</string>
<string name="message_compose_bcc_hint">"Bcc"</string>
<string name="message_compose_subject_hint">"件名"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- 元のメッセージ --------"\n"件名: <xliff:g id="SUBJECT">%s</xliff:g>"\n"From: <xliff:g id="SENDER">%s</xliff:g>"\n"To: <xliff:g id="TO">%s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>: "\n\n</string>
<string name="message_compose_quoted_text_label">"元のメッセージ"</string>

2
res/values-ko/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"참조"</string>
<string name="message_compose_bcc_hint">"숨은참조"</string>
<string name="message_compose_subject_hint">"제목"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- 원본 메일 --------"\n"제목: <xliff:g id="SUBJECT">%s</xliff:g>"\n"보낸사람: <xliff:g id="SENDER">%s</xliff:g>"\n"받는사람: <xliff:g id="TO">%s</xliff:g>"\n"참조: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>님이 작성:"\n\n</string>
<string name="message_compose_quoted_text_label">"받은메일"</string>

8
res/values-nb/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Kopi"</string>
<string name="message_compose_bcc_hint">"Blindkopi"</string>
<string name="message_compose_subject_hint">"Emne"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%s</xliff:g>"\n"From: <xliff:g id="SENDER">%s</xliff:g>"\n"To: <xliff:g id="TO">%s</xliff:g>"\n"CC: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>:"\n\n</string>
<string name="message_compose_quoted_text_label">"Sitert tekst"</string>
@ -77,7 +75,7 @@
<string name="message_view_next_action">"Neste melding"</string>
<string name="message_view_status_attachment_saved">"Vedlegget ble lagret til minnekortet som <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="message_view_status_attachment_not_saved">"Kunne ikke lagre vedlegget til minnekort."</string>
<string name="message_view_show_pictures_instructions">"Velg \"Vis bilder\" for å vise vedlagte bilder."</string>
<string name="message_view_show_pictures_instructions">"Velg \\\\\\\"Vis bilder\\\\\\\" for å vise vedlagte bilder."</string>
<string name="message_view_show_pictures_action">"Vis bilder"</string>
<string name="message_view_fetching_attachment_toast">"Henter vedlegg."</string>
<string name="message_deleted_toast">"Meldingen ble slettet."</string>
@ -166,9 +164,9 @@
<string name="account_settings_ringtone">"Velg ringetone"</string>
<string name="account_settings_servers">"Innstillinger for tjener"</string>
<string name="account_delete_dlg_title">"Fjern"</string>
<string name="account_delete_dlg_instructions_fmt">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" vil bli fjernet fra e-postapplikasjonen."</string>
<string name="account_delete_dlg_instructions_fmt">"Kontoen \\\\\\\"<xliff:g id="ACCOUNT">%s</xliff:g>\\\\\\\" vil bli fjernet fra e-postapplikasjonen."</string>
<string name="provider_note_yahoo">"E-posttilgang er ikke støttet for enkelte typer Yahoo!-e-postkontoer. Hvis du har problemer med å koble til, besøk yahoo.com for mer informasjon."</string>
<string name="provider_note_yahoo_uk">"Før du setter opp denne e-postkontoen, må du gå til Yahoo!-nettsiden og slå på POP3-tilgang for den."</string>
<string name="provider_note_live">"Bare noen \"pluss-kontoer tilbyr POP-tilgangBREAK_0 som dette programmet trenger for å koble til. Hvis du ikke klarer å logge innBREAK_1 med riktig e-postadresse og passord, kan det være du ikke har en betaltBREAK_2 \"pluss-tilgang. Start nettleseren for å få tilgang til slike e-postkontoer."</string>
<string name="provider_note_live">"Bare noen \\\\\\\"pluss-kontoer tilbyr POP-tilgangBREAK_0 som dette programmet trenger for å koble til. Hvis du ikke klarer å logge innBREAK_1 med riktig e-postadresse og passord, kan det være du ikke har en betaltBREAK_2 \\\\\\\"pluss-tilgang. Start nettleseren for å få tilgang til slike e-postkontoer."</string>
<string name="provider_note_t_online">"Før du setter opp denne e-postkontoen, besøk T-Online-nettsiden og velg et passord for e-posttilgang via POP3."</string>
</resources>

4
res/values-nl/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Cc"</string>
<string name="message_compose_bcc_hint">"Bcc"</string>
<string name="message_compose_subject_hint">"Onderwerp"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Oorspronkelijk bericht --------"\n"Onderwerp: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Van: <xliff:g id="SENDER">%s</xliff:g>"\n"Aan: <xliff:g id="TO">%s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>schreef:"\n\n</string>
<string name="message_compose_quoted_text_label">"Geciteerde tekst"</string>
@ -81,7 +79,7 @@
<string name="message_view_show_pictures_action">"Afbeeldingen weergeven"</string>
<string name="message_view_fetching_attachment_toast">"Bijlage wordt opgehaald."</string>
<string name="message_deleted_toast">"Bericht verwijderd."</string>
<string name="message_discarded_toast">"Bericht wordt verwijderd"</string>
<string name="message_discarded_toast">"Bericht genegeerd"</string>
<string name="message_saved_toast">"Bericht opgeslagen als concept."</string>
<string name="account_setup_basics_title">"E-mail instellen"</string>
<string name="account_setup_basics_instructions">"Typ het e-mailadres van je account:"</string>

18
res/values-pl/strings.xml
View File

@ -31,7 +31,7 @@
<string name="forward_action">"Przekaż dalej"</string>
<string name="done_action">"Gotowe"</string>
<string name="discard_action">"Odrzuć"</string>
<string name="save_draft_action">"Zapisz wersję roboczą"</string>
<string name="save_draft_action">"Zapisz jako wersję roboczą"</string>
<string name="refresh_action">"Odśwież"</string>
<string name="add_account_action">"Dodaj konto"</string>
<string name="compose_action">"Utwórz"</string>
@ -53,7 +53,7 @@
<string name="notification_new_one_account_fmt">"Nieprzeczytane: <xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> (<xliff:g id="ACCOUNT">%s</xliff:g>)"</string>
<string name="notification_new_multi_account_fmt">"na <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontach"</string>
<string name="special_mailbox_name_inbox">"Odebrane"</string>
<string name="accounts_welcome">"Zapraszamy do skonfigurowania poczty e-mail!"\n\n"W tej usłudze można korzystać z dowolnego konta e-mail."\n\n"Konfiguracja najpopularniejszych kont e-mail składa się z tylko 2 etapów."</string>
<string name="accounts_welcome">"Witamy w konfiguracji poczty e-mail!"\n\n"W tej usłudze można korzystać z dowolnego konta e-mail."\n\n"Konfiguracja najpopularniejszych kont e-mail składa się z tylko 2 etapów."</string>
<string name="debug_version_fmt">"Wersja: <xliff:g id="VERSION">%s</xliff:g>"</string>
<string name="debug_enable_debug_logging_label">"Czy włączyć dodatkowe rejestrowanie na potrzeby debugowania?"</string>
<string name="debug_enable_sensitive_logging_label">"Czy chcesz włączyć rejestrowanie poufnych informacji na potrzeby debugowania? (Może to spowodować uwzględnianie haseł w dziennikach)."</string>
@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"DW"</string>
<string name="message_compose_bcc_hint">"UDW"</string>
<string name="message_compose_subject_hint">"Temat"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Wiadomość oryginalna --------"\n"Temat: <xliff:g id="SUBJECT">%s</xliff:g>"\n"Od: <xliff:g id="SENDER">%s</xliff:g>"\n"Do: <xliff:g id="TO">%s</xliff:g>"\n"DW: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"Użytkownik <xliff:g id="SENDER">%s</xliff:g> napisał:"\n\n</string>
<string name="message_compose_quoted_text_label">"Cytowany tekst"</string>
@ -128,7 +126,7 @@
<string name="account_setup_outgoing_username_label">"Nazwa użytkownika"</string>
<string name="account_setup_outgoing_password_label">"Hasło"</string>
<string name="account_setup_options_title">"Opcje konta"</string>
<string name="account_setup_options_mail_check_frequency_label">"Sprawdzanie poczty"</string>
<string name="account_setup_options_mail_check_frequency_label">"Częstotliwość sprawdzania poczty e-mail"</string>
<string name="account_setup_options_mail_check_frequency_never">"Nigdy"</string>
<string name="account_setup_options_mail_check_frequency_5min">"Co 5 minut"</string>
<string name="account_setup_options_mail_check_frequency_10min">"Co 10 minut"</string>
@ -153,16 +151,16 @@
<string name="account_settings_default_label">"Domyślne konto"</string>
<string name="account_settings_default_summary">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
<string name="account_settings_notify_label">"Powiadomienia e-mail"</string>
<string name="account_settings_notify_summary">"Wyświetl powiadomienie na pasku stanu po otrzymaniu e-maila"</string>
<string name="account_settings_mail_check_frequency_label">"Sprawdzanie poczty"</string>
<string name="account_settings_incoming_label">"Poczta przychodząca"</string>
<string name="account_settings_outgoing_label">"Poczta wychodząca"</string>
<string name="account_settings_notify_summary">"Wyświetl powiadomienie na pasku stanu po otrzymaniu wiadomości e-mail"</string>
<string name="account_settings_mail_check_frequency_label">"Częstotliwość sprawdzania poczty e-mail"</string>
<string name="account_settings_incoming_label">"Ustawienia poczty przychodzącej"</string>
<string name="account_settings_outgoing_label">"Ustawienia poczty wychodzącej"</string>
<string name="account_settings_add_account_label">"Dodaj kolejne konto"</string>
<string name="account_settings_description_label">"Nazwa konta"</string>
<string name="account_settings_name_label">"Imię i nazwisko"</string>
<string name="account_settings_notifications">"Ustawienia powiadomień"</string>
<string name="account_settings_vibrate_enable">"Wibracje"</string>
<string name="account_settings_vibrate_summary">"Sygnalizuj otrzymanie wiadomości e-mail wibracją"</string>
<string name="account_settings_vibrate_summary">"Sygnalizuj wibracjami otrzymanie wiadomości e-mail"</string>
<string name="account_settings_ringtone">"Wybierz dzwonek"</string>
<string name="account_settings_servers">"Ustawienia serwera"</string>
<string name="account_delete_dlg_title">"Usuń konto"</string>

2
res/values-ru/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"Копия"</string>
<string name="message_compose_bcc_hint">"Скрытая"</string>
<string name="message_compose_subject_hint">"Тема"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- Исходное сообщение --------"\n"Тема: <xliff:g id="SUBJECT">%s</xliff:g>"\n"От: <xliff:g id="SENDER">%s</xliff:g>"\n"Кому: <xliff:g id="TO">%s</xliff:g>"\n"Копия: <xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g> написал(а):"\n\n</string>
<string name="message_compose_quoted_text_label">"Цитируемый текст"</string>

2
res/values-zh-rCN/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"抄送"</string>
<string name="message_compose_bcc_hint">"密送"</string>
<string name="message_compose_subject_hint">"主题"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"-------- 原始邮件 --------"\n"主题：<xliff:g id="SUBJECT">%s</xliff:g>"\n"发件人：<xliff:g id="SENDER">%s</xliff:g>"\n"收件人：<xliff:g id="TO">%s</xliff:g>"\n"抄送：<xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>写道："\n\n</string>
<string name="message_compose_quoted_text_label">"引用文字"</string>

2
res/values-zh-rTW/strings.xml
View File

@ -62,8 +62,6 @@
<string name="message_compose_cc_hint">"副本"</string>
<string name="message_compose_bcc_hint">"密件副本"</string>
<string name="message_compose_subject_hint">"主旨"</string>
<!-- no translation found for message_compose_body_hint (7575406246484103697) -->
<skip />
<string name="message_compose_fwd_header_fmt">\n\n"--------原始郵件 --------"\n"主旨：<xliff:g id="SUBJECT">%s</xliff:g>"\n"寄件者：<xliff:g id="SENDER">%s</xliff:g>"\n"收件者：<xliff:g id="TO">%s</xliff:g>"\n"副本：<xliff:g id="CC_0">%s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt">\n\n"<xliff:g id="SENDER">%s</xliff:g>提到："\n\n</string>
<string name="message_compose_quoted_text_label">"引用的文字"</string>

2
res/values/strings.xml
View File

@ -126,8 +126,6 @@
<string name="message_compose_bcc_hint">Bcc</string>
<!-- Hint text in Subject field -->
<string name="message_compose_subject_hint">Subject</string>
<!-- Hint text in Message composer body field -->
<string name="message_compose_body_hint">Compose Mail</string>
<!-- Header for forwarded original messages -->
<string name="message_compose_fwd_header_fmt">\n\n-------- Original Message --------\nSubject: <xliff:g id="subject">%s</xliff:g>\nFrom: <xliff:g id="sender">%s</xliff:g>\nTo: <xliff:g id="to">%s</xliff:g>\nCC: <xliff:g id="cc">%s</xliff:g>\n\n</string>
<!-- Header for replied-to messages -->

194
src/com/android/email/activity/MessageView.java
View File

@ -16,29 +16,19 @@
package com.android.email.activity;
import com.android.email.Account;
import com.android.email.Email;
import com.android.email.MessagingController;
import com.android.email.MessagingListener;
import com.android.email.R;
import com.android.email.Utility;
import com.android.email.mail.Address;
import com.android.email.mail.Message;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Multipart;
import com.android.email.mail.Part;
import com.android.email.mail.Message.RecipientType;
import com.android.email.mail.internet.MimeUtility;
import com.android.email.mail.store.LocalStore.LocalAttachmentBodyPart;
import com.android.email.mail.store.LocalStore.LocalMessage;
import com.android.email.provider.AttachmentProvider;
import org.apache.commons.io.IOUtils;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.Map;
import java.util.regex.Matcher;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.media.MediaScannerConnection;
@ -48,9 +38,6 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.Process;
import android.provider.Contacts;
import android.provider.Contacts.People;
import android.provider.Contacts.Presence;
import android.text.util.Regex;
import android.util.Config;
import android.util.Log;
@ -70,16 +57,24 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.Map;
import java.util.Random;
import java.util.regex.Matcher;
import org.apache.commons.io.IOUtils;
import com.android.email.Account;
import com.android.email.Email;
import com.android.email.MessagingController;
import com.android.email.MessagingListener;
import com.android.email.R;
import com.android.email.Utility;
import com.android.email.mail.Address;
import com.android.email.mail.Message;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Multipart;
import com.android.email.mail.Part;
import com.android.email.mail.Message.RecipientType;
import com.android.email.mail.internet.MimeUtility;
import com.android.email.mail.store.LocalStore.LocalAttachmentBodyPart;
import com.android.email.mail.store.LocalStore.LocalMessage;
import com.android.email.provider.AttachmentProvider;
public class MessageView extends Activity
implements UrlInterceptHandler, OnClickListener {
@ -88,12 +83,6 @@ public class MessageView extends Activity
private static final String EXTRA_MESSAGE = "com.android.email.MessageView_message";
private static final String EXTRA_FOLDER_UIDS = "com.android.email.MessageView_folderUids";
private static final String EXTRA_NEXT = "com.android.email.MessageView_next";
private static final String[] METHODS_WITH_PRESENCE_PROJECTION = new String[] {
People.ContactMethods._ID, // 0
People.PRESENCE_STATUS, // 1
};
private static final int METHODS_STATUS_COLUMN = 1;
private TextView mSubjectView;
private TextView mFromView;
@ -104,9 +93,8 @@ public class MessageView extends Activity
private View mCcContainerView;
private WebView mMessageContentView;
private LinearLayout mAttachments;
private ImageView mAttachmentIcon;
private View mAttachmentIcon;
private View mShowPicturesSection;
private ImageView mSenderPresenceView;
private Account mAccount;
private String mFolder;
@ -133,7 +121,6 @@ public class MessageView extends Activity
private static final int MSG_ATTACHMENT_NOT_SAVED = 8;
private static final int MSG_SHOW_SHOW_PICTURES = 9;
private static final int MSG_FETCHING_ATTACHMENT = 10;
private static final int MSG_SET_SENDER_PRESENCE = 11;
@Override
public void handleMessage(android.os.Message msg) {
@ -185,9 +172,6 @@ public class MessageView extends Activity
getString(R.string.message_view_fetching_attachment_toast),
Toast.LENGTH_SHORT).show();
break;
case MSG_SET_SENDER_PRESENCE:
updateSenderPresence(msg.arg1);
break;
default:
super.handleMessage(msg);
}
@ -254,12 +238,6 @@ public class MessageView extends Activity
msg.arg1 = show ? 1 : 0;
sendMessage(msg);
}
public void setSenderPresence(int presenceIconId) {
android.os.Message
.obtain(this, MSG_SET_SENDER_PRESENCE, presenceIconId, 0)
.sendToTarget();
}
}
/**
@ -301,25 +279,22 @@ public class MessageView extends Activity
setContentView(R.layout.message_view);
mSubjectView = (TextView) findViewById(R.id.subject);
mFromView = (TextView) findViewById(R.id.from);
mToView = (TextView) findViewById(R.id.to);
mCcView = (TextView) findViewById(R.id.cc);
mSubjectView = (TextView)findViewById(R.id.subject);
mFromView = (TextView)findViewById(R.id.from);
mToView = (TextView)findViewById(R.id.to);
mCcView = (TextView)findViewById(R.id.cc);
mCcContainerView = findViewById(R.id.cc_container);
mDateView = (TextView) findViewById(R.id.date);
mTimeView = (TextView) findViewById(R.id.time);
mMessageContentView = (WebView) findViewById(R.id.message_content);
mAttachments = (LinearLayout) findViewById(R.id.attachments);
mAttachmentIcon = (ImageView) findViewById(R.id.attachment);
mDateView = (TextView)findViewById(R.id.date);
mTimeView = (TextView)findViewById(R.id.time);
mMessageContentView = (WebView)findViewById(R.id.message_content);
mAttachments = (LinearLayout)findViewById(R.id.attachments);
mAttachmentIcon = findViewById(R.id.attachment);
mShowPicturesSection = findViewById(R.id.show_pictures_section);
mSenderPresenceView = (ImageView) findViewById(R.id.presence);
mMessageContentView.setVerticalScrollBarEnabled(false);
mAttachments.setVisibility(View.GONE);
mAttachmentIcon.setVisibility(View.GONE);
mFromView.setOnClickListener(this);
mSenderPresenceView.setOnClickListener(this);
findViewById(R.id.reply).setOnClickListener(this);
findViewById(R.id.reply_all).setOnClickListener(this);
findViewById(R.id.delete).setOnClickListener(this);
@ -399,9 +374,6 @@ public class MessageView extends Activity
public void onResume() {
super.onResume();
MessagingController.getInstance(getApplication()).addListener(mListener);
if (mMessage != null) {
startPresenceCheck();
}
}
@Override
@ -445,27 +417,6 @@ public class MessageView extends Activity
}
}
}
private void onClickSender() {
if (mMessage != null) {
try {
Address senderEmail = mMessage.getFrom()[0];
// TODO look up contact
// TODO action VIEW if exists
// TODO disambiguate
// TODO create
Toast.makeText(this,
"Look up contact for " + senderEmail.toFriendly(), Toast.LENGTH_SHORT)
.show();
} catch (MessagingException me) {
if (Config.LOGV) {
Log.v(Email.LOG_TAG, "loadMessageForViewHeadersAvailable", me);
}
}
}
}
private void onReply() {
if (mMessage != null) {
@ -579,10 +530,6 @@ public class MessageView extends Activity
public void onClick(View view) {
switch (view.getId()) {
case R.id.from:
case R.id.presence:
onClickSender();
break;
case R.id.reply:
onReply();
break;
@ -786,72 +733,6 @@ public class MessageView extends Activity
}
}
}
/**
* Launch a thread (because of cross-process DB lookup) to check presence of the sender of the
* message. When that thread completes, update the UI.
*
* This must only be called when mMessage is null (it will hide presence indications) or when
* mMessage has already seen its headers loaded.
*
* Note: This is just a polling operation. A more advanced solution would be to keep the
* cursor open and respond to presence status updates (in the form of content change
* notifications). However, because presence changes fairly slowly compared to the duration
* of viewing a single message, a simple poll at message load (and onResume) should be
* sufficient.
*/
private void startPresenceCheck() {
String email = null;
try {
if (mMessage != null) {
Address sender = mMessage.getFrom()[0];
email = sender.getAddress();
}
} catch (MessagingException me) { }
if (email == null) {
mHandler.setSenderPresence(0);
return;
}
final String senderEmail = email;
new Thread() {
@Override
public void run() {
Cursor methodsCursor = getContentResolver().query(
Uri.withAppendedPath(Contacts.ContactMethods.CONTENT_URI, "with_presence"),
METHODS_WITH_PRESENCE_PROJECTION,
Contacts.ContactMethods.DATA + "=?",
new String[]{ senderEmail },
null);
int presenceIcon = 0;
if (methodsCursor != null) {
if (methodsCursor.moveToFirst() &&
!methodsCursor.isNull(METHODS_STATUS_COLUMN)) {
presenceIcon = Presence.getPresenceIconResourceId(
methodsCursor.getInt(METHODS_STATUS_COLUMN));
}
methodsCursor.close();
}
mHandler.setSenderPresence(presenceIcon);
}
}.start();
}
/**
* Update the actual UI. Must be called from main thread (or handler)
* @param presenceIconId the presence of the sender, 0 for "unknown"
*/
private void updateSenderPresence(int presenceIconId) {
if (presenceIconId == 0) {
mSenderPresenceView.setVisibility(View.GONE);
} else {
mSenderPresenceView.setImageResource(presenceIconId);
mSenderPresenceView.setVisibility(View.VISIBLE);
}
}
class Listener extends MessagingListener {
@Override
@ -875,7 +756,6 @@ public class MessageView extends Activity
toText,
ccText,
hasAttachments);
startPresenceCheck();
}
catch (MessagingException me) {
if (Config.LOGV) {

2
tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java
View File

@ -84,8 +84,6 @@ public class MessageComposeInstrumentationTests
Preferences.getPreferences(context).getDefaultAccount();
Email.setServicesEnabled(context);
}
Intent intent = new Intent(Intent.ACTION_VIEW);
setActivityIntent(intent);
final MessageCompose a = getActivity();
mToView = (EditText) a.findViewById(R.id.to);
mSubjectView = (EditText) a.findViewById(R.id.subject);