summaryrefslogtreecommitdiffstats
path: root/src/com/android/calendar/CalendarEventModel.java
diff options
context:
space:
mode:
authorMichael Chan <mchan@android.com>2010-09-28 05:15:08 -0700
committerMichael Chan <mchan@android.com>2010-10-11 11:22:41 -0700
commit352e1a2f834460bd54e03ce94cadd36a46debacb (patch)
treedaa4fba520e34229db5977c584553007f07954f5 /src/com/android/calendar/CalendarEventModel.java
parenta821d8bbf1d9e0acdecdc9012bf7dda7982499ad (diff)
downloadandroid_packages_apps_Calendar-352e1a2f834460bd54e03ce94cadd36a46debacb.tar.gz
android_packages_apps_Calendar-352e1a2f834460bd54e03ce94cadd36a46debacb.tar.bz2
android_packages_apps_Calendar-352e1a2f834460bd54e03ce94cadd36a46debacb.zip
Major bug fixing in EventInfo and EditEvent
In EventInfo/Popup: Fixed reminders and response Set a fixed height Renamed Edit event button to Open event in the Event popup Enabled Open event button unless it's a free/busy calendar Removed action bar buttons in Event popup Disallow reminders for busy/free calendars TODO: Update UI only if everything is loaded In Edit Event: Switch to side-by-side label format Have everything ready before removing "Loading" msg Added organizer Restrict adding of attendees: For non-organizers, write permission to the calendar is sufficient. For organizers, the user needs a) write permission to the calendar AND b) ownerCanRespond == true AND c) attendee data exist (this means num of attendees > 1, the calendar owner's and others). TODO: Attendees do not always show up. Need to switch from listview to linear layout TODO: Move to one column format for portrait in EditEvent Turned on Holo.light theme but the light version isn't ready in the framework yet. Removed dependency to android.test.runner b/3052155 b/2709441 b/3060967 b/3060985 Change-Id: I4a25fecf3ade6a7924ba7b55801daced3dca6fa7
Diffstat (limited to 'src/com/android/calendar/CalendarEventModel.java')
-rw-r--r--src/com/android/calendar/CalendarEventModel.java15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/calendar/CalendarEventModel.java b/src/com/android/calendar/CalendarEventModel.java
index 3d382bde..b9b531d9 100644
--- a/src/com/android/calendar/CalendarEventModel.java
+++ b/src/com/android/calendar/CalendarEventModel.java
@@ -87,6 +87,10 @@ public class CalendarEventModel {
public String mDescription = null;
public String mRrule = null;
public String mOrganizer = null;
+ public String mOrganizerDisplayName = null;
+ /**
+ * Read-Only - Derived from other fields
+ */
public boolean mIsOrganizer = true;
public boolean mIsFirstEventInSeries = true;
@@ -118,6 +122,16 @@ public class CalendarEventModel {
public boolean mGuestsCanInviteOthers = false;
public boolean mGuestsCanSeeGuests = false;
+// NEW vvvvvvvvvvvvvvv
+ // FRAG_TODO update equal/hashcode/clear
+ public boolean mOrganizerCanRespond = false;
+ public int mCalendarAccessLevel = 0;
+
+ // The model can't be updated with a calendar cursor until it has been
+ // updated with an event cursor.
+ public boolean mModelUpdatedWithEventCursor;
+// NEW ^^^^^^^^^^^^^
+
public int mVisibility = 0;
public ArrayList<Integer> mReminderMinutes;
@@ -219,6 +233,7 @@ public class CalendarEventModel {
mDescription = null;
mRrule = null;
mOrganizer = null;
+ mOrganizerDisplayName = null;
mIsOrganizer = true;
mIsFirstEventInSeries = true;