Merge change 27227 into eclair
* changes:
b/2099363 Added assets for Calendar Widget
diff --git a/res/drawable-hdpi/app_icon.png b/res/drawable-hdpi/app_icon.png
new file mode 100755
index 0000000..e0782d6
--- /dev/null
+++ b/res/drawable-hdpi/app_icon.png
Binary files differ
diff --git a/res/drawable-hdpi/white_list_rule_cal.9.png b/res/drawable-hdpi/white_list_rule_cal.9.png
new file mode 100755
index 0000000..a4d54cf
--- /dev/null
+++ b/res/drawable-hdpi/white_list_rule_cal.9.png
Binary files differ
diff --git a/res/drawable/app_icon.png b/res/drawable-mdpi/app_icon.png
similarity index 100%
rename from res/drawable/app_icon.png
rename to res/drawable-mdpi/app_icon.png
Binary files differ
diff --git a/res/drawable/white_list_rule_cal.9.png b/res/drawable-mdpi/white_list_rule_cal.9.png
similarity index 100%
rename from res/drawable/white_list_rule_cal.9.png
rename to res/drawable-mdpi/white_list_rule_cal.9.png
Binary files differ
diff --git a/src/com/android/providers/calendar/CalendarProvider.java b/src/com/android/providers/calendar/CalendarProvider.java
index 243a26e..6eb1e6b 100644
--- a/src/com/android/providers/calendar/CalendarProvider.java
+++ b/src/com/android/providers/calendar/CalendarProvider.java
@@ -3921,6 +3921,7 @@
DatabaseUtils.cursorStringToContentValues(diffsCursor, Events.ORIGINAL_ALL_DAY,
values);
DatabaseUtils.cursorLongToContentValues(diffsCursor, Events.LAST_DATE, values);
+ DatabaseUtils.cursorLongToContentValues(diffsCursor, Events.HAS_ATTENDEE_DATA, values);
DatabaseUtils.cursorLongToContentValues(diffsCursor, Events.CALENDAR_ID, values);
DatabaseUtils.cursorLongToContentValues(diffsCursor, Events.GUESTS_CAN_INVITE_OTHERS,
values);
@@ -4003,6 +4004,7 @@
sEventsProjectionMap.put(Events.ORIGINAL_INSTANCE_TIME, "originalInstanceTime");
sEventsProjectionMap.put(Events.ORIGINAL_ALL_DAY, "originalAllDay");
sEventsProjectionMap.put(Events.LAST_DATE, "lastDate");
+ sEventsProjectionMap.put(Events.HAS_ATTENDEE_DATA, "hasAttendeeData");
sEventsProjectionMap.put(Events.CALENDAR_ID, "calendar_id");
sEventsProjectionMap.put(Events.GUESTS_CAN_INVITE_OTHERS, "guestsCanInviteOthers");
sEventsProjectionMap.put(Events.GUESTS_CAN_MODIFY, "guestsCanModify");
@@ -4108,6 +4110,7 @@
Calendar.Events.ORIGINAL_INSTANCE_TIME,
Calendar.Events.ORIGINAL_ALL_DAY,
Calendar.Events.LAST_DATE,
+ Calendar.Events.HAS_ATTENDEE_DATA,
Calendar.Events.CALENDAR_ID,
Calendar.Events.GUESTS_CAN_INVITE_OTHERS,
Calendar.Events.GUESTS_CAN_MODIFY,
@@ -4139,11 +4142,12 @@
private static final int COLUMN_ORIGINAL_INSTANCE_TIME = 22;
private static final int COLUMN_ORIGINAL_ALL_DAY = 23;
private static final int COLUMN_LAST_DATE = 24;
- private static final int COLUMN_CALENDAR_ID = 25;
- private static final int COLUMN_GUESTS_CAN_INVITE_OTHERS = 26;
- private static final int COLUMN_GUESTS_CAN_MODIFY = 27;
- private static final int COLUMN_GUESTS_CAN_SEE_GUESTS = 28;
- private static final int COLUMN_ORGANIZER = 29;
+ private static final int COLUMN_HAS_ATTENDEE_DATA = 25;
+ private static final int COLUMN_CALENDAR_ID = 26;
+ private static final int COLUMN_GUESTS_CAN_INVITE_OTHERS = 27;
+ private static final int COLUMN_GUESTS_CAN_MODIFY = 28;
+ private static final int COLUMN_GUESTS_CAN_SEE_GUESTS = 29;
+ private static final int COLUMN_ORGANIZER = 30;
private static final String[] REMINDERS_PROJECTION = new String[] {
Calendar.Reminders.MINUTES,
@@ -4251,6 +4255,8 @@
c.getLong(COLUMN_ORIGINAL_INSTANCE_TIME));
entityValues.put(Calendar.Events.ORIGINAL_ALL_DAY, c.getInt(COLUMN_ORIGINAL_ALL_DAY));
entityValues.put(Calendar.Events.LAST_DATE, c.getLong(COLUMN_LAST_DATE));
+ entityValues.put(Calendar.Events.HAS_ATTENDEE_DATA,
+ c.getLong(COLUMN_HAS_ATTENDEE_DATA));
entityValues.put(Calendar.Events.GUESTS_CAN_INVITE_OTHERS,
c.getLong(COLUMN_GUESTS_CAN_INVITE_OTHERS));
entityValues.put(Calendar.Events.GUESTS_CAN_MODIFY,
diff --git a/src/com/android/providers/calendar/CalendarSyncAdapter.java b/src/com/android/providers/calendar/CalendarSyncAdapter.java
index 34aad7f..6bf1076 100644
--- a/src/com/android/providers/calendar/CalendarSyncAdapter.java
+++ b/src/com/android/providers/calendar/CalendarSyncAdapter.java
@@ -862,7 +862,8 @@
map.put(SyncConstValue._SYNC_ACCOUNT, account.name);
map.put(SyncConstValue._SYNC_ACCOUNT_TYPE, account.type);
- map.put(Events.HAS_ATTENDEE_DATA, !event.getId().contains(FULL_SELFATTENDANCE));
+ // FULL_SELFATTENDANCE means no attendee data
+ map.put(Events.HAS_ATTENDEE_DATA, event.getId().contains(FULL_SELFATTENDANCE) ? 0 : 1);
map.put(Events.GUESTS_CAN_INVITE_OTHERS, event.getGuestsCanInviteOthers() ? 1 : 0);
map.put(Events.GUESTS_CAN_MODIFY, event.getGuestsCanModify() ? 1 : 0);
