auto import from //branches/cupcake/...@125939
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
new file mode 100644
index 0000000..c41d07d
--- /dev/null
+++ b/res/values-fr/arrays.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array name="reminder_minutes_labels">
+ <item>"5 minutes"</item>
+ <item>"10 minutes"</item>
+ <item>"15 minutes"</item>
+ <item>"20 minutes"</item>
+ <item>"25 minutes"</item>
+ <item>"30 minutes"</item>
+ <item>"45 minutes"</item>
+ <item>"1 heure"</item>
+ <item>"2 heures"</item>
+ <item>"3 heures"</item>
+ <item>"12 heures"</item>
+ <item>"24 heures"</item>
+ <item>"2 jours"</item>
+ <item>"1 semaine"</item>
+ </string-array>
+ <string-array name="reminder_minutes_values">
+ <item>"5"</item>
+ <item>"10"</item>
+ <item>"15"</item>
+ <item>"20"</item>
+ <item>"25"</item>
+ <item>"30"</item>
+ <item>"45"</item>
+ <item>"60"</item>
+ <item>"120"</item>
+ <item>"180"</item>
+ <item>"720"</item>
+ <item>"1440"</item>
+ <item>"2880"</item>
+ <item>"10080"</item>
+ </string-array>
+ <string-array name="preferences_default_reminder_labels">
+ <item>"Aucun"</item>
+ <item>"5 minutes"</item>
+ <item>"10 minutes"</item>
+ <item>"15 minutes"</item>
+ <item>"20 minutes"</item>
+ <item>"25 minutes"</item>
+ <item>"30 minutes"</item>
+ <item>"45 minutes"</item>
+ <item>"1 heure"</item>
+ <item>"2 heures"</item>
+ <item>"3 heures"</item>
+ <item>"12 heures"</item>
+ <item>"24 heures"</item>
+ <item>"2 jours"</item>
+ <item>"1 semaine"</item>
+ </string-array>
+ <string-array name="preferences_default_reminder_values">
+ <item>"0"</item>
+ <item>"5"</item>
+ <item>"10"</item>
+ <item>"15"</item>
+ <item>"20"</item>
+ <item>"25"</item>
+ <item>"30"</item>
+ <item>"45"</item>
+ <item>"60"</item>
+ <item>"120"</item>
+ <item>"180"</item>
+ <item>"720"</item>
+ <item>"1440"</item>
+ <item>"2880"</item>
+ <item>"10080"</item>
+ </string-array>
+ <string-array name="preferences_alert_type_labels">
+ <item>"Alerte"</item>
+ <item>"Notification de barre d\'état"</item>
+ <item>"Désactivé"</item>
+ </string-array>
+ <string-array name="preferences_alert_type_values">
+ <item>"0"</item>
+ <item>"1"</item>
+ <item>"2"</item>
+ </string-array>
+ <!-- no translation found for availability:0 (454869065893453189) -->
+ <!-- no translation found for availability:1 (6228387173725732140) -->
+ <string-array name="visibility">
+ <item>"Par défaut"</item>
+ <item>"Privé"</item>
+ <item>"Public"</item>
+ </string-array>
+ <string-array name="day_labels">
+ <item>"dimanche"</item>
+ <item>"lundi"</item>
+ <item>"mardi"</item>
+ <item>"mercredi"</item>
+ <item>"jeudi"</item>
+ <item>"vendredi"</item>
+ <item>"samedi"</item>
+ </string-array>
+ <string-array name="ordinal_labels">
+ <item>"premier"</item>
+ <item>"seconde"</item>
+ <item>"troisième"</item>
+ <item>"quatrième"</item>
+ <item>"dernier"</item>
+ </string-array>
+ <string-array name="response_labels1">
+ <item>"(Aucune réponse)"</item>
+ <item>"Oui"</item>
+ <item>"Peut-être"</item>
+ <item>"Non"</item>
+ </string-array>
+ <string-array name="response_labels2">
+ <item>"Oui"</item>
+ <item>"Peut-être"</item>
+ <item>"Non"</item>
+ </string-array>
+ <string-array name="delete_repeating_labels">
+ <item>"Uniquement cet événement"</item>
+ <item>"Cet événement et les suivants"</item>
+ <item>"Tous les événements"</item>
+ </string-array>
+ <!-- no translation found for delete_repeating_labels_no_selected:0 (1341910309321756150) -->
+ <!-- no translation found for delete_repeating_labels_no_selected:1 (6315440193748139854) -->
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
new file mode 100644
index 0000000..9885b96
--- /dev/null
+++ b/res/values-fr/strings.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label">"Google Agenda"</string>
+ <string name="calendar_plug"><font fgcolor="#ffffffff">"Bienvenue dans Google Agenda !"</font>" "\n"La solution de Google pour gérer votre emploi du temps en planifiant vos événements de manière plus intuitive, efficace et directe."</string>
+ <string name="what_label">"Objet"</string>
+ <string name="when_label">"Date"</string>
+ <string name="where_label">"Lieu"</string>
+ <!-- no translation found for repeats_label (7414023871434593196) -->
+ <skip />
+ <string name="no_title_label">"(Aucun objet)"</string>
+ <plurals name="Nminutes">
+ <item quantity="one">"1 minute"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> minutes"</item>
+ </plurals>
+ <plurals name="Nmins">
+ <item quantity="one">"1 min"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+ </plurals>
+ <plurals name="Nhours">
+ <item quantity="one">"1 heure"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> heures"</item>
+ </plurals>
+ <plurals name="Ndays">
+ <item quantity="one">"1 jour"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> jours"</item>
+ </plurals>
+ <string name="agenda_view">"Agenda"</string>
+ <string name="day_view">"Jour"</string>
+ <string name="week_view">"Semaine"</string>
+ <string name="month_view">"Mois"</string>
+ <string name="event_view">"Afficher l\'événement"</string>
+ <string name="event_create">"Nouvel événement"</string>
+ <string name="event_edit">"Modifier l\'événement"</string>
+ <string name="event_delete">"Supprimer l\'événement"</string>
+ <string name="goto_today">"Aujourd\'hui"</string>
+ <string name="menu_select_calendars">"Mes agendas"</string>
+ <string name="menu_preferences">"Paramètres"</string>
+ <string name="plus_N_more">"(et <xliff:g id="MORE_COUNT">%d</xliff:g> autres…)"</string>
+ <string name="calendars_title">"Mes agendas"</string>
+ <string name="add_calendars">"Ajouter des agendas"</string>
+ <string name="remove_calendars">"Supprimer les agendas"</string>
+ <string name="event_edit_title">"Détails sur l\'événement"</string>
+ <string name="hint_what">"Nom de l\'événement"</string>
+ <string name="hint_where">"Lieu de l\'événement"</string>
+ <string name="hint_description">"Description de l\'événement"</string>
+ <!-- no translation found for creating_event (8237877638457604455) -->
+ <skip />
+ <!-- no translation found for saving_event (8853425146353785688) -->
+ <skip />
+ <!-- no translation found for loading_calendars_title (3819254313413902272) -->
+ <skip />
+ <!-- no translation found for loading_calendars_message (8266077515011438420) -->
+ <skip />
+ <string name="alert_when_label">"Date :"</string>
+ <string name="alert_where_label">"Lieu :"</string>
+ <string name="alert_missed_events_single">"(<xliff:g id="REMINDER_COUNT">%s</xliff:g> rappel supplémentaire)"</string>
+ <string name="alert_missed_events_multiple">"(<xliff:g id="REMINDER_COUNT">%s</xliff:g> rappels supplémentaires)"</string>
+ <string name="event_info_title">"Afficher l\'événement"</string>
+ <string name="event_info_title_invite">"Invitation à une réunion"</string>
+ <string name="add_new_reminder">"Ajouter un rappel"</string>
+ <string name="edit_event_to_label">"Au"</string>
+ <string name="edit_event_from_label">"Du"</string>
+ <string name="edit_event_all_day_label">"Journée entière"</string>
+ <string name="edit_event_calendar_label">"Agenda"</string>
+ <string name="edit_event_show_extra_options">"Afficher les options supplémentaires"</string>
+ <string name="edit_event_hide_extra_options">"Masquer les options supplémentaires"</string>
+ <string name="description_label">"Description"</string>
+ <string name="presence_label">"Présence"</string>
+ <string name="privacy_label">"Confidentialité"</string>
+ <string name="reminders_label">"Rappels"</string>
+ <!-- no translation found for no_syncable_calendars (7019488867045436129) -->
+ <skip />
+ <!-- no translation found for no_calendars_found (755379468136462058) -->
+ <skip />
+ <string name="view_event_calendar_label">"Agenda"</string>
+ <string name="view_event_timezone_label">"Fuseau horaire local"</string>
+ <string name="view_event_response_label">"Participation ?"</string>
+ <string name="agenda_today">"Aujourd\'hui"</string>
+ <string name="num_events">"Nbre d\'événements"</string>
+ <string name="edit_event_label">"Modifier l\'événement"</string>
+ <string name="delete_label">"Supprimer"</string>
+ <string name="delete_event_label">"Supprimer l\'événement"</string>
+ <string name="save_label">"Enregistrer"</string>
+ <string name="discard_label">"Ignorer les modifications"</string>
+ <string name="import_label">"Importer"</string>
+ <string name="snooze_all_label">"Tout mettre en attente"</string>
+ <string name="dismiss_all_label">"Tout supprimer"</string>
+ <!-- no translation found for does_not_repeat (1877681921029738999) -->
+ <skip />
+ <string name="daily">"Quotidien"</string>
+ <string name="every_weekday">"Chaque jour de semaine (lun–ven)"</string>
+ <string name="weekly">"Hebdomadaire (chaque <xliff:g id="DAYS_OF_WEEK">%s</xliff:g>)"</string>
+ <string name="monthly_on_day_count">"Mensuel (chaque <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> <xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>)"</string>
+ <string name="monthly_on_day">"Mensuel (le <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
+ <string name="yearly">"Annuel (le <xliff:g id="DATES">%s</xliff:g>)"</string>
+ <string name="custom">"Personnalisé… (paramétrage impossible avec un téléphone)"</string>
+ <string name="modify_event">"Modifier uniquement cet événement."</string>
+ <string name="modify_all">"Modifier tous les événements de la série."</string>
+ <string name="modify_all_following">"Modifier cet événement et tous les suivants."</string>
+ <string name="delete_this_event_title">"Cet événement va être supprimé."</string>
+ <string name="delete_title">"Supprimer"</string>
+ <string name="preferences_title">"Paramètres"</string>
+ <string name="preferences_general_title">"Paramètre d\'affichage de l\'agenda"</string>
+ <string name="preferences_alerts_title">"Paramètres de rappel"</string>
+ <string name="preferences_hide_declined_title">"Masquer les événements refusés"</string>
+ <string name="preferences_alerts_type_title">"Définir les alertes et les notifications"</string>
+ <!-- no translation found for preferences_alerts_type_dialog (2195667763429994271) -->
+ <skip />
+ <string name="preferences_alerts_vibrate_title">"Vibreur"</string>
+ <string name="preferences_alerts_ringtone_title">"Sélectionner la sonnerie"</string>
+ <string name="preferences_default_reminder_title">"Définir le rappel par défaut"</string>
+ <!-- no translation found for preferences_default_reminder_dialog (2490348857239323412) -->
+ <skip />
+ <string name="preferences_default_reminder_default">"10"</string>
+</resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
new file mode 100644
index 0000000..5fa875e
--- /dev/null
+++ b/res/values-it/arrays.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array name="reminder_minutes_labels">
+ <item>"5 minuti"</item>
+ <item>"10 minuti"</item>
+ <item>"15 minuti"</item>
+ <item>"20 minuti"</item>
+ <item>"25 minuti"</item>
+ <item>"30 minuti"</item>
+ <item>"45 minuti"</item>
+ <item>"1 ora"</item>
+ <item>"2 ore"</item>
+ <item>"3 ore"</item>
+ <item>"12 ore"</item>
+ <item>"24 ore"</item>
+ <item>"2 giorni"</item>
+ <item>"1 settimana"</item>
+ </string-array>
+ <string-array name="reminder_minutes_values">
+ <item>"5"</item>
+ <item>"10"</item>
+ <item>"15"</item>
+ <item>"20"</item>
+ <item>"25"</item>
+ <item>"30"</item>
+ <item>"45"</item>
+ <item>"60"</item>
+ <item>"120"</item>
+ <item>"180"</item>
+ <item>"720"</item>
+ <item>"1440"</item>
+ <item>"2880"</item>
+ <item>"10080"</item>
+ </string-array>
+ <string-array name="preferences_default_reminder_labels">
+ <item>"Nessuno"</item>
+ <item>"5 minuti"</item>
+ <item>"10 minuti"</item>
+ <item>"15 minuti"</item>
+ <item>"20 minuti"</item>
+ <item>"25 minuti"</item>
+ <item>"30 minuti"</item>
+ <item>"45 minuti"</item>
+ <item>"1 ora"</item>
+ <item>"2 ore"</item>
+ <item>"3 ore"</item>
+ <item>"12 ore"</item>
+ <item>"24 ore"</item>
+ <item>"2 giorni"</item>
+ <item>"1 settimana"</item>
+ </string-array>
+ <string-array name="preferences_default_reminder_values">
+ <item>"0"</item>
+ <item>"5"</item>
+ <item>"10"</item>
+ <item>"15"</item>
+ <item>"20"</item>
+ <item>"25"</item>
+ <item>"30"</item>
+ <item>"45"</item>
+ <item>"60"</item>
+ <item>"120"</item>
+ <item>"180"</item>
+ <item>"720"</item>
+ <item>"1440"</item>
+ <item>"2880"</item>
+ <item>"10080"</item>
+ </string-array>
+ <string-array name="preferences_alert_type_labels">
+ <item>"Avviso"</item>
+ <item>"Notifica barra di stato"</item>
+ <item>"Disattivato"</item>
+ </string-array>
+ <string-array name="preferences_alert_type_values">
+ <item>"0"</item>
+ <item>"1"</item>
+ <item>"2"</item>
+ </string-array>
+ <!-- no translation found for availability:0 (454869065893453189) -->
+ <!-- no translation found for availability:1 (6228387173725732140) -->
+ <string-array name="visibility">
+ <item>"Predefinito"</item>
+ <item>"Privato"</item>
+ <item>"Pubblico"</item>
+ </string-array>
+ <string-array name="day_labels">
+ <item>"Domenica"</item>
+ <item>"Lunedì"</item>
+ <item>"Martedì"</item>
+ <item>"Mercoledì"</item>
+ <item>"Giovedì"</item>
+ <item>"Venerdì"</item>
+ <item>"Sabato"</item>
+ </string-array>
+ <string-array name="ordinal_labels">
+ <item>"primo"</item>
+ <item>"secondo"</item>
+ <item>"terzo"</item>
+ <item>"quarto"</item>
+ <item>"ultimo"</item>
+ </string-array>
+ <string-array name="response_labels1">
+ <item>"(Nessuna risposta)"</item>
+ <item>"Sì"</item>
+ <item>"Forse"</item>
+ <item>"No"</item>
+ </string-array>
+ <string-array name="response_labels2">
+ <item>"Sì"</item>
+ <item>"Forse"</item>
+ <item>"No"</item>
+ </string-array>
+ <string-array name="delete_repeating_labels">
+ <item>"Solo questo evento"</item>
+ <item>"Questo e gli eventi futuri"</item>
+ <item>"Tutti gli eventi"</item>
+ </string-array>
+ <!-- no translation found for delete_repeating_labels_no_selected:0 (1341910309321756150) -->
+ <!-- no translation found for delete_repeating_labels_no_selected:1 (6315440193748139854) -->
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
new file mode 100644
index 0000000..9d7e03e
--- /dev/null
+++ b/res/values-it/strings.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label">"Calendario"</string>
+ <string name="calendar_plug"><font fgcolor="#ffffffff">"Benvenuto in Google Calendar!"</font>" "\n"Un approccio di Google alla gestione della tua pianificazione in base all\'idea che gli eventi di pianificazione possano essere più intuitivi, efficaci e accessibili."</string>
+ <string name="what_label">"Titolo"</string>
+ <string name="when_label">"Intervallo di tempo"</string>
+ <string name="where_label">"Posizione"</string>
+ <!-- no translation found for repeats_label (7414023871434593196) -->
+ <skip />
+ <string name="no_title_label">"(Nessun oggetto)"</string>
+ <plurals name="Nminutes">
+ <item quantity="one">"1 minuto"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> minuti"</item>
+ </plurals>
+ <plurals name="Nmins">
+ <item quantity="one">"1 min"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> min"</item>
+ </plurals>
+ <plurals name="Nhours">
+ <item quantity="one">"1 ora"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> ore"</item>
+ </plurals>
+ <plurals name="Ndays">
+ <item quantity="one">"1 giorno"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> giorni"</item>
+ </plurals>
+ <string name="agenda_view">"Agenda"</string>
+ <string name="day_view">"Giorno"</string>
+ <string name="week_view">"Settimana"</string>
+ <string name="month_view">"Mese"</string>
+ <string name="event_view">"Visualizza evento"</string>
+ <string name="event_create">"Nuovo evento"</string>
+ <string name="event_edit">"Modifica evento"</string>
+ <string name="event_delete">"Elimina evento"</string>
+ <string name="goto_today">"Oggi"</string>
+ <string name="menu_select_calendars">"I miei calendari"</string>
+ <string name="menu_preferences">"Impostazioni"</string>
+ <string name="plus_N_more">"(più altri <xliff:g id="MORE_COUNT">%d</xliff:g>…)"</string>
+ <string name="calendars_title">"I miei calendari"</string>
+ <string name="add_calendars">"Aggiungi calendari"</string>
+ <string name="remove_calendars">"Rimuovi calendari"</string>
+ <string name="event_edit_title">"Dettagli evento"</string>
+ <string name="hint_what">"Nome evento"</string>
+ <string name="hint_where">"Luogo evento"</string>
+ <string name="hint_description">"Descrizione evento"</string>
+ <!-- no translation found for creating_event (8237877638457604455) -->
+ <skip />
+ <!-- no translation found for saving_event (8853425146353785688) -->
+ <skip />
+ <!-- no translation found for loading_calendars_title (3819254313413902272) -->
+ <skip />
+ <!-- no translation found for loading_calendars_message (8266077515011438420) -->
+ <skip />
+ <string name="alert_when_label">"Intervallo di tempo:"</string>
+ <string name="alert_where_label">"Posizione:"</string>
+ <string name="alert_missed_events_single">"(Altri <xliff:g id="REMINDER_COUNT">%s</xliff:g> promemoria)"</string>
+ <string name="alert_missed_events_multiple">"(Altri <xliff:g id="REMINDER_COUNT">%s</xliff:g> promemoria)"</string>
+ <string name="event_info_title">"Visualizza evento"</string>
+ <string name="event_info_title_invite">"Invito a riunione"</string>
+ <string name="add_new_reminder">"Aggiungi promemoria"</string>
+ <string name="edit_event_to_label">"A"</string>
+ <string name="edit_event_from_label">"Da"</string>
+ <string name="edit_event_all_day_label">"Tutto il giorno"</string>
+ <string name="edit_event_calendar_label">"Calendario"</string>
+ <string name="edit_event_show_extra_options">"Mostra opzioni aggiuntive"</string>
+ <string name="edit_event_hide_extra_options">"Nascondi opzioni aggiuntive"</string>
+ <string name="description_label">"Descrizione"</string>
+ <string name="presence_label">"Presenza"</string>
+ <string name="privacy_label">"Privacy"</string>
+ <string name="reminders_label">"Promemoria"</string>
+ <!-- no translation found for no_syncable_calendars (7019488867045436129) -->
+ <skip />
+ <!-- no translation found for no_calendars_found (755379468136462058) -->
+ <skip />
+ <string name="view_event_calendar_label">"Calendario"</string>
+ <string name="view_event_timezone_label">"Fuso orario locale"</string>
+ <string name="view_event_response_label">"Partecipanti?"</string>
+ <string name="agenda_today">"Oggi"</string>
+ <string name="num_events">"N. eventi"</string>
+ <string name="edit_event_label">"Modifica evento"</string>
+ <string name="delete_label">"Elimina"</string>
+ <string name="delete_event_label">"Elimina evento"</string>
+ <string name="save_label">"Salva"</string>
+ <string name="discard_label">"Ignora modifiche"</string>
+ <string name="import_label">"Importa"</string>
+ <string name="snooze_all_label">"Posponi tutto"</string>
+ <string name="dismiss_all_label">"Ignora tutto"</string>
+ <!-- no translation found for does_not_repeat (1877681921029738999) -->
+ <skip />
+ <string name="daily">"Ogni giorno"</string>
+ <string name="every_weekday">"Ogni giorno della settimana (Lun-Ven)"</string>
+ <string name="weekly">"Ogni settimana (ogni <xliff:g id="DAYS_OF_WEEK">%s</xliff:g>)"</string>
+ <string name="monthly_on_day_count">"Ogni mese (ogni <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g><xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>"</string>
+ <string name="monthly_on_day">"Ogni mese (il <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
+ <string name="yearly">"Ogni anno (il <xliff:g id="DATES">%s</xliff:g>"</string>
+ <string name="custom">"Personalizzato… (impossibile personalizzare sul telefono)"</string>
+ <string name="modify_event">"Modifica solo questo evento."</string>
+ <string name="modify_all">"Modifica tutti gli eventi nelle serie."</string>
+ <string name="modify_all_following">"Modifica questo e tutti gli eventi futuri."</string>
+ <string name="delete_this_event_title">"L\'evento verrà eliminato."</string>
+ <string name="delete_title">"Elimina"</string>
+ <string name="preferences_title">"Impostazioni"</string>
+ <string name="preferences_general_title">"Impostazione visualizzazione calendario"</string>
+ <string name="preferences_alerts_title">"Impostazioni promemoria"</string>
+ <string name="preferences_hide_declined_title">"Nascondi eventi rifiutati"</string>
+ <string name="preferences_alerts_type_title">"Imposta avvisi e notifiche"</string>
+ <!-- no translation found for preferences_alerts_type_dialog (2195667763429994271) -->
+ <skip />
+ <string name="preferences_alerts_vibrate_title">"Vibrazione"</string>
+ <string name="preferences_alerts_ringtone_title">"Seleziona suoneria"</string>
+ <string name="preferences_default_reminder_title">"Imposta promemoria predefinito"</string>
+ <!-- no translation found for preferences_default_reminder_dialog (2490348857239323412) -->
+ <skip />
+ <string name="preferences_default_reminder_default">"10"</string>
+</resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
new file mode 100644
index 0000000..716ccfc
--- /dev/null
+++ b/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string-array name="reminder_minutes_labels">
+ <item>"5 分钟"</item>
+ <item>"10 分钟"</item>
+ <item>"15 分钟"</item>
+ <item>"20 分钟"</item>
+ <item>"25 分钟"</item>
+ <item>"30 分钟"</item>
+ <item>"45 分钟"</item>
+ <item>"1 小时"</item>
+ <item>"2 小时"</item>
+ <item>"3 小时"</item>
+ <item>"12 小时"</item>
+ <item>"24 小时"</item>
+ <item>"2 天"</item>
+ <item>"1 周"</item>
+ </string-array>
+ <string-array name="reminder_minutes_values">
+ <item>"5"</item>
+ <item>"10"</item>
+ <item>"15"</item>
+ <item>"20"</item>
+ <item>"25"</item>
+ <item>"30"</item>
+ <item>"45"</item>
+ <item>"60"</item>
+ <item>"120"</item>
+ <item>"180"</item>
+ <item>"720"</item>
+ <item>"1440"</item>
+ <item>"2880"</item>
+ <item>"10080"</item>
+ </string-array>
+ <string-array name="preferences_default_reminder_labels">
+ <item>"无"</item>
+ <item>"5 分钟"</item>
+ <item>"10 分钟"</item>
+ <item>"15 分钟"</item>
+ <item>"20 分钟"</item>
+ <item>"25 分钟"</item>
+ <item>"30 分钟"</item>
+ <item>"45 分钟"</item>
+ <item>"1 小时"</item>
+ <item>"2 小时"</item>
+ <item>"3 小时"</item>
+ <item>"12 小时"</item>
+ <item>"24 小时"</item>
+ <item>"2 天"</item>
+ <item>"1 周"</item>
+ </string-array>
+ <string-array name="preferences_default_reminder_values">
+ <item>"0"</item>
+ <item>"5"</item>
+ <item>"10"</item>
+ <item>"15"</item>
+ <item>"20"</item>
+ <item>"25"</item>
+ <item>"30"</item>
+ <item>"45"</item>
+ <item>"60"</item>
+ <item>"120"</item>
+ <item>"180"</item>
+ <item>"720"</item>
+ <item>"1440"</item>
+ <item>"2880"</item>
+ <item>"10080"</item>
+ </string-array>
+ <string-array name="preferences_alert_type_labels">
+ <item>"提醒"</item>
+ <item>"状态栏通知"</item>
+ <item>"关闭"</item>
+ </string-array>
+ <string-array name="preferences_alert_type_values">
+ <item>"0"</item>
+ <item>"1"</item>
+ <item>"2"</item>
+ </string-array>
+ <!-- no translation found for availability:0 (454869065893453189) -->
+ <!-- no translation found for availability:1 (6228387173725732140) -->
+ <string-array name="visibility">
+ <item>"默认"</item>
+ <item>"私人"</item>
+ <item>"公共"</item>
+ </string-array>
+ <string-array name="day_labels">
+ <item>"星期日"</item>
+ <item>"星期一"</item>
+ <item>"星期二"</item>
+ <item>"星期三"</item>
+ <item>"星期四"</item>
+ <item>"星期五"</item>
+ <item>"星期六"</item>
+ </string-array>
+ <string-array name="ordinal_labels">
+ <item>"第一个"</item>
+ <item>"第二个"</item>
+ <item>"第三个"</item>
+ <item>"第四个"</item>
+ <item>"上一"</item>
+ </string-array>
+ <string-array name="response_labels1">
+ <item>"（未响应）"</item>
+ <item>"是"</item>
+ <item>"不确定"</item>
+ <item>"否"</item>
+ </string-array>
+ <string-array name="response_labels2">
+ <item>"是"</item>
+ <item>"不确定"</item>
+ <item>"否"</item>
+ </string-array>
+ <string-array name="delete_repeating_labels">
+ <item>"仅此活动"</item>
+ <item>"此活动和将来的活动"</item>
+ <item>"所有活动"</item>
+ </string-array>
+ <!-- no translation found for delete_repeating_labels_no_selected:0 (1341910309321756150) -->
+ <!-- no translation found for delete_repeating_labels_no_selected:1 (6315440193748139854) -->
+</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..1444654
--- /dev/null
+++ b/res/values-zh-rCN/strings.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_label">"日历"</string>
+ <string name="calendar_plug"><font fgcolor="#ffffffff">"欢迎使用 Google 日历！"</font>" "\n"Google 日历是一种用于管理您的日程安排的工具，它独到的设计理念能让您更加直接、高效和方便地安排活动。"</string>
+ <string name="what_label">"活动"</string>
+ <string name="when_label">"时间"</string>
+ <string name="where_label">"地点"</string>
+ <!-- no translation found for repeats_label (7414023871434593196) -->
+ <skip />
+ <string name="no_title_label">"（无主题）"</string>
+ <plurals name="Nminutes">
+ <item quantity="one">"1 分钟"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> 分钟"</item>
+ </plurals>
+ <plurals name="Nmins">
+ <item quantity="one">"1 分钟"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> 分钟"</item>
+ </plurals>
+ <plurals name="Nhours">
+ <item quantity="one">"1 小时"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> 小时"</item>
+ </plurals>
+ <plurals name="Ndays">
+ <item quantity="one">"1 天"</item>
+ <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> 天"</item>
+ </plurals>
+ <string name="agenda_view">"日程"</string>
+ <string name="day_view">"天"</string>
+ <string name="week_view">"周"</string>
+ <string name="month_view">"月"</string>
+ <string name="event_view">"查看活动"</string>
+ <string name="event_create">"新建活动"</string>
+ <string name="event_edit">"编辑活动"</string>
+ <string name="event_delete">"删除活动"</string>
+ <string name="goto_today">"今天"</string>
+ <string name="menu_select_calendars">"我的日历"</string>
+ <string name="menu_preferences">"设置"</string>
+ <string name="plus_N_more">"（还有 <xliff:g id="MORE_COUNT">%d</xliff:g> 个未显示...）"</string>
+ <string name="calendars_title">"我的日历"</string>
+ <string name="add_calendars">"添加日历"</string>
+ <string name="remove_calendars">"删除日历"</string>
+ <string name="event_edit_title">"活动详情"</string>
+ <string name="hint_what">"活动名称"</string>
+ <string name="hint_where">"活动地点"</string>
+ <string name="hint_description">"活动描述"</string>
+ <!-- no translation found for creating_event (8237877638457604455) -->
+ <skip />
+ <!-- no translation found for saving_event (8853425146353785688) -->
+ <skip />
+ <!-- no translation found for loading_calendars_title (3819254313413902272) -->
+ <skip />
+ <!-- no translation found for loading_calendars_message (8266077515011438420) -->
+ <skip />
+ <string name="alert_when_label">"时间："</string>
+ <string name="alert_where_label">"地点："</string>
+ <string name="alert_missed_events_single">"（还有 <xliff:g id="REMINDER_COUNT">%s</xliff:g> 个提醒）"</string>
+ <string name="alert_missed_events_multiple">"（还有 <xliff:g id="REMINDER_COUNT">%s</xliff:g> 个提醒）"</string>
+ <string name="event_info_title">"查看活动"</string>
+ <string name="event_info_title_invite">"会议邀请"</string>
+ <string name="add_new_reminder">"添加提醒"</string>
+ <string name="edit_event_to_label">"结束日期"</string>
+ <string name="edit_event_from_label">"开始日期"</string>
+ <string name="edit_event_all_day_label">"全天"</string>
+ <string name="edit_event_calendar_label">"日历"</string>
+ <string name="edit_event_show_extra_options">"显示其他选项"</string>
+ <string name="edit_event_hide_extra_options">"隐藏其他选项"</string>
+ <string name="description_label">"描述"</string>
+ <string name="presence_label">"现状"</string>
+ <string name="privacy_label">"隐私性"</string>
+ <string name="reminders_label">"提醒"</string>
+ <!-- no translation found for no_syncable_calendars (7019488867045436129) -->
+ <skip />
+ <!-- no translation found for no_calendars_found (755379468136462058) -->
+ <skip />
+ <string name="view_event_calendar_label">"日历"</string>
+ <string name="view_event_timezone_label">"本地时区"</string>
+ <string name="view_event_response_label">"是否参加？"</string>
+ <string name="agenda_today">"今天"</string>
+ <string name="num_events">"活动数"</string>
+ <string name="edit_event_label">"编辑活动"</string>
+ <string name="delete_label">"删除"</string>
+ <string name="delete_event_label">"删除活动"</string>
+ <string name="save_label">"保存"</string>
+ <string name="discard_label">"放弃更改"</string>
+ <string name="import_label">"导入"</string>
+ <string name="snooze_all_label">"全部暂停"</string>
+ <string name="dismiss_all_label">"全部解除"</string>
+ <!-- no translation found for does_not_repeat (1877681921029738999) -->
+ <skip />
+ <string name="daily">"每天"</string>
+ <string name="every_weekday">"每个工作日（周一至周五）"</string>
+ <string name="weekly">"每周（每个<xliff:g id="DAYS_OF_WEEK">%s</xliff:g>）"</string>
+ <string name="monthly_on_day_count">"每月（第 <xliff:g id="ORDINAL_NUMBER">%1$s</xliff:g> 个<xliff:g id="DAY_OF_WEEK">%2$s</xliff:g>）"</string>
+ <string name="monthly_on_day">"每月（<xliff:g id="DAY_OF_MONTH">%s</xliff:g> 日）"</string>
+ <string name="yearly">"每年（<xliff:g id="DATES">%s</xliff:g>）"</string>
+ <string name="custom">"自定义...（无法通过电话自定义）"</string>
+ <string name="modify_event">"仅更改此活动。"</string>
+ <string name="modify_all">"更改此系列的所有活动。"</string>
+ <string name="modify_all_following">"更改此活动和将来的所有活动。"</string>
+ <string name="delete_this_event_title">"系统将删除此活动。"</string>
+ <string name="delete_title">"删除"</string>
+ <string name="preferences_title">"设置"</string>
+ <string name="preferences_general_title">"日历视图设置"</string>
+ <string name="preferences_alerts_title">"提醒设置"</string>
+ <string name="preferences_hide_declined_title">"隐藏拒绝的活动"</string>
+ <string name="preferences_alerts_type_title">"设置提醒和通知"</string>
+ <!-- no translation found for preferences_alerts_type_dialog (2195667763429994271) -->
+ <skip />
+ <string name="preferences_alerts_vibrate_title">"振动"</string>
+ <string name="preferences_alerts_ringtone_title">"选择铃声"</string>
+ <string name="preferences_default_reminder_title">"设置默认提醒"</string>
+ <!-- no translation found for preferences_default_reminder_dialog (2490348857239323412) -->
+ <skip />
+ <string name="preferences_default_reminder_default">"10"</string>
+</resources>
diff --git a/src/com/android/calendar/AgendaActivity.java b/src/com/android/calendar/AgendaActivity.java
index 0867327..f35c238 100644
--- a/src/com/android/calendar/AgendaActivity.java
+++ b/src/com/android/calendar/AgendaActivity.java
@@ -52,18 +52,19 @@
protected static final String BUNDLE_KEY_RESTORE_TIME = "key_restore_time";
private static final String[] PROJECTION = new String[] {
- Instances._ID, // 0
- Instances.TITLE, // 1
- Instances.EVENT_LOCATION, // 2
- Instances.ALL_DAY, // 3
- Instances.HAS_ALARM, // 4
- Instances.COLOR, // 5
- Instances.RRULE, // 6
- Instances.BEGIN, // 7
- Instances.END, // 8
- Instances.EVENT_ID, // 9
- Instances.START_DAY, // 10 Julian start day
- Instances.END_DAY, // 11 Julian end day
+ Instances._ID, // 0
+ Instances.TITLE, // 1
+ Instances.EVENT_LOCATION, // 2
+ Instances.ALL_DAY, // 3
+ Instances.HAS_ALARM, // 4
+ Instances.COLOR, // 5
+ Instances.RRULE, // 6
+ Instances.BEGIN, // 7
+ Instances.END, // 8
+ Instances.EVENT_ID, // 9
+ Instances.START_DAY, // 10 Julian start day
+ Instances.END_DAY, // 11 Julian end day
+ Instances.SELF_ATTENDEE_STATUS, // 12
};
public static final int INDEX_TITLE = 1;
@@ -77,6 +78,7 @@
public static final int INDEX_EVENT_ID = 9;
public static final int INDEX_START_DAY = 10;
public static final int INDEX_END_DAY = 11;
+ public static final int INDEX_SELF_ATTENDEE_STATUS = 12;
public static final String AGENDA_SORT_ORDER = "startDay ASC, begin ASC, title ASC";
diff --git a/src/com/android/calendar/AgendaAdapter.java b/src/com/android/calendar/AgendaAdapter.java
index b7fefbd..07a6bc7 100644
--- a/src/com/android/calendar/AgendaAdapter.java
+++ b/src/com/android/calendar/AgendaAdapter.java
@@ -22,6 +22,7 @@
import android.database.Cursor;
import android.graphics.PorterDuff;
import android.net.Uri;
+import android.provider.Calendar.Attendees;
import android.provider.Calendar.Reminders;
import android.text.format.DateFormat;
import android.text.format.DateUtils;
@@ -60,6 +61,13 @@
int color = cursor.getInt(AgendaActivity.INDEX_COLOR) & 0xbbffffff;
stripe.getBackground().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+ // Fade visible boxes if event was declined.
+ int selfAttendeeStatus = cursor.getInt(AgendaActivity.INDEX_SELF_ATTENDEE_STATUS);
+ boolean declined = (selfAttendeeStatus == Attendees.ATTENDEE_STATUS_DECLINED);
+ int targetAlpha = declined ? 128 : 255;
+
+ view.getBackground().setAlpha(targetAlpha);
+
// What
TextView title = (TextView) view.findViewById(R.id.title);
String titleString = cursor.getString(AgendaActivity.INDEX_TITLE);
diff --git a/src/com/android/calendar/CalendarView.java b/src/com/android/calendar/CalendarView.java
index 1606cdf..3c5c4dc 100644
--- a/src/com/android/calendar/CalendarView.java
+++ b/src/com/android/calendar/CalendarView.java
@@ -2060,6 +2060,13 @@
}
}
+ // Fade visible boxes if event was declined.
+ boolean declined = (event.selfAttendeeStatus == Attendees.ATTENDEE_STATUS_DECLINED);
+ int targetAlpha = declined ? 128 : 255;
+
+ box.setAlpha(targetAlpha);
+ p.setAlpha(targetAlpha);
+
RectF rf = mRectF;
rf.top = event.top;
rf.bottom = event.bottom;
diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java
index c92473d..fe70b4f 100644
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -1350,13 +1350,13 @@
private void checkTimeDependentFields(ContentValues values) {
long oldBegin = mInitialValues.getAsLong(EVENT_BEGIN_TIME);
long oldEnd = mInitialValues.getAsLong(EVENT_END_TIME);
- boolean oldAllDay = mInitialValues.getAsBoolean(Events.ALL_DAY);
+ boolean oldAllDay = mInitialValues.getAsInteger(Events.ALL_DAY) != 0;
String oldRrule = mInitialValues.getAsString(Events.RRULE);
String oldTimezone = mInitialValues.getAsString(Events.EVENT_TIMEZONE);
long newBegin = values.getAsLong(Events.DTSTART);
long newEnd = values.getAsLong(Events.DTEND);
- boolean newAllDay = values.getAsInteger(Events.ALL_DAY) == 1;
+ boolean newAllDay = values.getAsInteger(Events.ALL_DAY) != 0;
String newRrule = values.getAsString(Events.RRULE);
String newTimezone = values.getAsString(Events.EVENT_TIMEZONE);
diff --git a/src/com/android/calendar/Event.java b/src/com/android/calendar/Event.java
index 9f272d5..c15e5b5 100644
--- a/src/com/android/calendar/Event.java
+++ b/src/com/android/calendar/Event.java
@@ -39,22 +39,23 @@
private static final boolean PROFILE = false;
private static final String[] PROJECTION = new String[] {
- Instances.TITLE, // 0
- Instances.EVENT_LOCATION, // 1
- Instances.ALL_DAY, // 2
- Instances.COLOR, // 3
- Instances.EVENT_TIMEZONE, // 4
- Instances.EVENT_ID, // 5
- Instances.BEGIN, // 6
- Instances.END, // 7
- Instances._ID, // 8
- Instances.START_DAY, // 9
- Instances.END_DAY, // 10
- Instances.START_MINUTE, // 11
- Instances.END_MINUTE, // 12
- Instances.HAS_ALARM, // 13
- Instances.RRULE, // 14
- Instances.RDATE, // 15
+ Instances.TITLE, // 0
+ Instances.EVENT_LOCATION, // 1
+ Instances.ALL_DAY, // 2
+ Instances.COLOR, // 3
+ Instances.EVENT_TIMEZONE, // 4
+ Instances.EVENT_ID, // 5
+ Instances.BEGIN, // 6
+ Instances.END, // 7
+ Instances._ID, // 8
+ Instances.START_DAY, // 9
+ Instances.END_DAY, // 10
+ Instances.START_MINUTE, // 11
+ Instances.END_MINUTE, // 12
+ Instances.HAS_ALARM, // 13
+ Instances.RRULE, // 14
+ Instances.RDATE, // 15
+ Instances.SELF_ATTENDEE_STATUS, // 16
};
// The indices for the projection array above.
@@ -73,6 +74,7 @@
private static final int PROJECTION_HAS_ALARM_INDEX = 13;
private static final int PROJECTION_RRULE_INDEX = 14;
private static final int PROJECTION_RDATE_INDEX = 15;
+ private static final int PROJECTION_SELF_ATTENDEE_STATUS_INDEX = 16;
public long id;
public int color;
@@ -92,6 +94,8 @@
public boolean hasAlarm;
public boolean isRepeating;
+
+ public int selfAttendeeStatus;
// The coordinates of the event rectangle drawn on the screen.
public float left;
@@ -124,6 +128,7 @@
e.endMillis = endMillis;
e.hasAlarm = hasAlarm;
e.isRepeating = isRepeating;
+ e.selfAttendeeStatus = selfAttendeeStatus;
return e;
}
@@ -142,6 +147,7 @@
dest.endMillis = endMillis;
dest.hasAlarm = hasAlarm;
dest.isRepeating = isRepeating;
+ dest.selfAttendeeStatus = selfAttendeeStatus;
}
public static final Event newInstance() {
@@ -160,6 +166,7 @@
e.endMillis = 0;
e.hasAlarm = false;
e.isRepeating = false;
+ e.selfAttendeeStatus = Attendees.ATTENDEE_STATUS_NONE;
return e;
}
@@ -346,6 +353,8 @@
} else {
e.isRepeating = false;
}
+
+ e.selfAttendeeStatus = c.getInt(PROJECTION_SELF_ATTENDEE_STATUS_INDEX);
events.add(e);
}
diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index 2a17c89..ccde953 100644
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -16,12 +16,10 @@
package com.android.calendar;
-import static android.provider.Calendar.EVENT_BEGIN_TIME;
-import static android.provider.Calendar.EVENT_END_TIME;
-
import android.app.Activity;
import android.content.ContentResolver;
import android.content.ContentUris;
+import android.content.ContentValues;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources;
@@ -34,6 +32,8 @@
import android.provider.Calendar;
import android.provider.Calendar.Attendees;
import android.provider.Calendar.Calendars;
+import static android.provider.Calendar.EVENT_BEGIN_TIME;
+import static android.provider.Calendar.EVENT_END_TIME;
import android.provider.Calendar.Events;
import android.provider.Calendar.Reminders;
import android.text.format.DateFormat;
@@ -56,19 +56,20 @@
private static final int MAX_REMINDERS = 5;
private static final String[] EVENT_PROJECTION = new String[] {
- Events._ID, // 0 do not remove; used in DeleteEventHelper
- Events.TITLE, // 1 do not remove; used in DeleteEventHelper
- Events.RRULE, // 2 do not remove; used in DeleteEventHelper
- Events.ALL_DAY, // 3 do not remove; used in DeleteEventHelper
- Events.CALENDAR_ID, // 4 do not remove; used in DeleteEventHelper
- Events.DTSTART, // 5 do not remove; used in DeleteEventHelper
- Events._SYNC_ID, // 6 do not remove; used in DeleteEventHelper
- Events.EVENT_TIMEZONE, // 7 do not remove; used in DeleteEventHelper
- Events.DESCRIPTION, // 8
- Events.EVENT_LOCATION, // 9
- Events.HAS_ALARM, // 10
- Events.ACCESS_LEVEL, // 11
- Events.COLOR, // 12
+ Events._ID, // 0 do not remove; used in DeleteEventHelper
+ Events.TITLE, // 1 do not remove; used in DeleteEventHelper
+ Events.RRULE, // 2 do not remove; used in DeleteEventHelper
+ Events.ALL_DAY, // 3 do not remove; used in DeleteEventHelper
+ Events.CALENDAR_ID, // 4 do not remove; used in DeleteEventHelper
+ Events.DTSTART, // 5 do not remove; used in DeleteEventHelper
+ Events._SYNC_ID, // 6 do not remove; used in DeleteEventHelper
+ Events.EVENT_TIMEZONE, // 7 do not remove; used in DeleteEventHelper
+ Events.DESCRIPTION, // 8
+ Events.EVENT_LOCATION, // 9
+ Events.HAS_ALARM, // 10
+ Events.ACCESS_LEVEL, // 11
+ Events.COLOR, // 12
+ Events.SELF_ATTENDEE_STATUS, // 13
};
private static final int EVENT_INDEX_ID = 0;
private static final int EVENT_INDEX_TITLE = 1;
@@ -81,12 +82,14 @@
private static final int EVENT_INDEX_HAS_ALARM = 10;
private static final int EVENT_INDEX_ACCESS_LEVEL = 11;
private static final int EVENT_INDEX_COLOR = 12;
+ private static final int EVENT_INDEX_SELF_ATTENDEE_STATUS = 13;
private static final String[] ATTENDEES_PROJECTION = new String[] {
Attendees._ID, // 0
Attendees.ATTENDEE_RELATIONSHIP, // 1
Attendees.ATTENDEE_STATUS, // 2
};
+ private static final int ATTENDEES_INDEX_ID = 0;
private static final int ATTENDEES_INDEX_RELATIONSHIP = 1;
private static final int ATTENDEES_INDEX_STATUS = 2;
private static final String ATTENDEES_WHERE = Attendees.EVENT_ID + "=%d";
@@ -145,6 +148,7 @@
private DeleteEventHelper mDeleteEventHelper;
private int mResponseOffset;
+ private int mOriginalAttendeeResponse;
// This is called when one of the "remove reminder" buttons is selected.
public void onClick(View v) {
@@ -295,7 +299,7 @@
ArrayList<Integer> reminderMinutes = EditEvent.reminderItemsToMinutes(mReminderItems,
mReminderValues);
EditEvent.saveReminders(cr, mEventId, reminderMinutes, mOriginalMinutes);
- saveResponse();
+ saveResponse(cr);
}
@Override
@@ -387,7 +391,7 @@
}
}
- private void saveResponse() {
+ private void saveResponse(ContentResolver cr) {
if (mAttendeesCursor == null) {
return;
}
@@ -398,8 +402,23 @@
}
int status = ATTENDEE_VALUES[position];
- mAttendeesCursor.updateInt(ATTENDEES_INDEX_STATUS, status);
- mAttendeesCursor.commitUpdates();
+
+ // If the status has not changed, then don't update the database
+ if (status == mOriginalAttendeeResponse) {
+ return;
+ }
+
+ // Update the "selfAttendeeStatus" field for the event
+ ContentValues values = new ContentValues();
+
+ // Will need to add email when MULTIPLE_ATTENDEES_PER_EVENT supported.
+ values.put(Attendees.ATTENDEE_STATUS, status);
+ values.put(Attendees.EVENT_ID, mEventId);
+
+ int attendeeId = mAttendeesCursor.getInt(ATTENDEES_INDEX_ID);
+
+ Uri uri = ContentUris.withAppendedId(Attendees.CONTENT_URI, attendeeId);
+ cr.update(uri, values, null /* where */, null /* selection args */);
}
private int findResponseIndexFor(int response) {
@@ -534,9 +553,9 @@
Spinner spinner = (Spinner) findViewById(R.id.response_value);
- int response = ATTENDEE_NO_RESPONSE;
+ mOriginalAttendeeResponse = ATTENDEE_NO_RESPONSE;
if (mAttendeesCursor != null) {
- response = mAttendeesCursor.getInt(ATTENDEES_INDEX_STATUS);
+ mOriginalAttendeeResponse = mAttendeesCursor.getInt(ATTENDEES_INDEX_STATUS);
}
mResponseOffset = 0;
@@ -545,9 +564,9 @@
* Switch the entries to a set of entries without the
* no response option.
*/
- if ((response != Attendees.ATTENDEE_STATUS_INVITED)
- && (response != ATTENDEE_NO_RESPONSE)
- && (response != Attendees.ATTENDEE_STATUS_NONE)) {
+ if ((mOriginalAttendeeResponse != Attendees.ATTENDEE_STATUS_INVITED)
+ && (mOriginalAttendeeResponse != ATTENDEE_NO_RESPONSE)
+ && (mOriginalAttendeeResponse != Attendees.ATTENDEE_STATUS_NONE)) {
CharSequence[] entries;
entries = getResources().getTextArray(R.array.response_labels2);
mResponseOffset = -1;
@@ -558,7 +577,7 @@
spinner.setAdapter(adapter);
}
- int index = findResponseIndexFor(response);
+ int index = findResponseIndexFor(mOriginalAttendeeResponse);
spinner.setSelection(index + mResponseOffset);
}