History log of /packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
96a36f4cb7803d50ecf47945b6a240926f48e7c3 30-Apr-2013 James Kung <kingkung@google.com> Retain color palette icon on orientation change

Bug: 8755983
Change-Id: I357122e03ebd447aaec023d65448faa92467a46b
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
f56b14972130233fd7e7c64160084793a7a0a55b 08-Mar-2013 James Kung <kingkung@google.com> Adding init state booleans for int color variables

Change-Id: I5b4eb3e4f9180df4685b9ec11c6009464a719ab5
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
4afba187f8990ae2b3afaf8fcdb6039f231f4914 19-Dec-2012 James Kung <kingkung@google.com> Color picker for events

Bug: 3439638
Change-Id: I46ac6816ab887290f67bacf2faa1a9ed73ff7d6b
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
f9fa0ab81b8f17679af806c0edc2e227aa798ad4 14-Dec-2012 Michael Chan <mchan@android.com> Save textless event if times changed or attendees have been added.

Change-Id: I0195bf5b24e99c7466791dc9875baffaff91b4c5
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
38fc457abe8028f0a2fd71091b8cc71184e9f6db 19-Nov-2012 James Kung <kingkung@google.com> Fixed Save feature of create new event dialog

Bug: 7565039
Change-Id: I332f1522b3927ea22b8fe9203de4804627e97f96
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
09fbd8e9ef61f667c0f20d36fbf40e5a4479c8d9 12-Nov-2012 James Kung <kingkung@google.com> New event dialog on long click within month view

Bug: 5656402

Change-Id: Iaef6549f42d41770c02493ffd869faf1d8713a6c
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
30ecf57e355b8de335c1d2f7df997dc41452f834 27-Apr-2012 Sara Ting <sarating@google.com> Merge "Query by profile id when it exists for attendee info in event view." into jb-dev
ddbc002f3471e224fc112d406116e396ee1c50ae 27-Apr-2012 Sara Ting <sarating@google.com> Query by profile id when it exists for attendee info in event view.

Bug: 6324575
Change-Id: I2613d4ff9edef02495d3b5e636a697c137784527
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
e3f85db16cfc50b25b97c64d8ab99820d579e5de 27-Apr-2012 Michael Chan <chanm@google.com> Create events with event set to confirmed instead of tentative

Bug: 6383944
Change-Id: I83e742fe4a054dc9e985613a59997fa7f9d8358d
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
c6680c5819b6ad0d1914420902746fe5f86ba403 28-Oct-2011 RoboErik <epastern@google.com> b/5309787 support allowedAvailability in calendar app

Also adds support for Tentative availability.

Change-Id: Idea9424c54e2f08d020e63566567b9f0b176a5b5
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
510e5ab4f1f6c8e8d9fb9684ed29d4a9c0d03cde 17-Oct-2011 RoboErik <epastern@google.com> b/5458690 Handle access level correctly for event intents

We don't support 'ACCESS_CONFIDENTIAL' in the app, so we have to
adjust the value sent to us to display it correctly.

Change-Id: Ib24e393f2c37af09da6e7dbb38b17eebd9c4034e
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
28dab653f55caccbed32f700274f5274abaee089 22-Jul-2011 RoboErik <epastern@google.com> b/5063456 Fix event changes checks to be less agressive

Change-Id: I09571289e45a753875b3e8117027c1a95f33520b
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
18cabd263b91d7d09f3b93b0bf6c78533bbc2c6a 10-Jun-2011 Mindy Pereira <mindyp@google.com> integrate chips ui into calendar.

Makes edit event display chips UI. We still need final design
to decide if we're going to display a full list of guests in
tablets like we currently do or just the chips. Leaving with
current behavior but showing chips in the edit box for now.

Change-Id: Ia045bbdc3326dca9056070ae0ebc75a7a5b2f5ba
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
a7c0390d9c5dd4ff730de505682687fae5f5ced0 14-Jun-2011 RoboErik <epastern@google.com> Rename Calendar.java to CalendarContract.java

Change-Id: Ia6692454099322f6891b326b2c1ad919c13026b7
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
ef2add9145f058ea103ade2870a8ba899b9ed1c9 09-Jun-2011 RoboErik <epastern@google.com> Update to db v305

See change https://android-git.corp.google.com/g/#change,114333
for more details.

Change-Id: Ie28f9417c2c0f40cd26de99cf9e0555c756705d9
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
016d576c1f0fbcbf060fab132d8e6a1016dd7091 24-May-2011 Isaac Katzenelson <isaack@android.com> Layout changes for edit event

Change-Id: I01a4fd088057fa156709ca096530baf891908d9c
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
09a13e6a48995410732e9e0ed43d5f8c9e0bfce6 02-Jun-2011 Isaac Katzenelson <isaack@android.com> Merge "Consolidate 2 Attendee classes into one"
78de8f45e8909832920ad6388c55ce3d886ddedb 02-Jun-2011 Michael Chan <mchan@android.com> Merge "Rename "transparency" to "availability" Rename "visibility" to "accessLevel""
667af28a8e9729e14831f3db456ff3edb2c4c29a 02-Jun-2011 Isaac Katzenelson <isaack@android.com> Consolidate 2 Attendee classes into one

Change-Id: I2de26dfe655dc8f7fb1a0794ef581179c58277bf
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
ced0eb67ef49c3203f72520c296e73d9cb4f654b 01-Jun-2011 Michael Chan <mchan@android.com> Rename "transparency" to "availability"
Rename "visibility" to "accessLevel"

Change-Id: I902fd9fbae34217faacc763fd201cb6e355f343a
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
c250e2eae5156fdc5233b7f1d319ee81dfc1cbd9 23-May-2011 Michael Chan <mchan@android.com> New intent for creating events

Change-Id: I4632c78d838b3ec5a0b3a893d6a3155f2c47daaf
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
9645d9c3e9b2cfd35c5fc89f41caf6e99153ba10 17-May-2011 Andy McFadden <fadden@android.com> Add support for different alert methods to UI

Google Calendar supports different alert methods for reminders
(e.g. pop-up message or e-mail). This change adds a UI element
that allows you to select the method for each reminder.

The set of available methods is determined by calendar attributes,
as is the maximum number of reminders.

Bug 4419019

Change-Id: I3f319e21b1919965d4859595f76206b9e96242b8
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
c27e56f7150b77da3d8ae22e48a4b3699bd2e19c 16-May-2011 Andy McFadden <fadden@android.com> Make ReminderEntry Serializable

Otherwise, the app crashes when CalendarEventModel is serialized.

Change-Id: Ic3c5c70034b49e41d1c036afb46b0260268a4160
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
fea9af5d69ad3e5687a4efd72d7d3adfb8d056c8 14-May-2011 Andy McFadden <fadden@android.com> Progress toward alert method support

This replaces some of the "lists of minutes" with a list of objects
that also specify the alert method. There should be no externally
visible effects.

Bug 4419019

Change-Id: Ia555252c5c44019eaf4f1a569703a2eab6740acc
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
0e1e62408b96e1532eb6f6a609ae4c817751aaf3 06-May-2011 RoboErik <epastern@google.com> Update calendars table to v300

See change I515b3e0a for more details

Change-Id: Iee64f3868e4109ceb1cebf0503fdf7b818ffe305
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
ae5bcce4a24c1ef3a2db2493b3dedd64a6aa35ff 14-Apr-2011 Andy McFadden <fadden@android.com> Sort and uniquify reminders

Reminders are now sorted before display, and sorted+uniquified before
being saved.

Also, removed a redundant function.

Bug 3409286

Change-Id: I858708c166bad686cbc2db826d964612bc9f29d8
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
9d8a376b89fcc36c44d4df0c5cbf6991306131c4 30-Mar-2011 Michael Chan <mchan@android.com> b/4068211 Added 0 minute reminder

Committing change from https://android-git.corp.google.com/g/#change,104050
since the original author doesn't have an android.com account yet.

Change-Id: I78cd01482590b2628d4d18b05596c0dff72372eb
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
8a5489641442c022089ae1b00e498e2c1a0ba480 11-Jan-2011 Erik <epastern@google.com> b/3335099 Adds a home time zone descriptor to edit event

This adds lines for displaying the date and time of an event
that is in a different time zone than the time zone your calendar
is set to.
Also fixed some bugs:
The ro mode was displaying when in the wrong time zone and new
events weren't being created in the home time zone if it was set.

Change-Id: Ieb8a55a0d0e7c9f26f0246a7bf32da25fba53b5e
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
d0fb2dd416a59e29f85435255ace75045a72886c 07-Jan-2011 Michael Chan <mchan@android.com> Prevent the saving unchanged events and creation of empty events

Change-Id: I9b3239ccb256b5880cb77753a1e14a37644b1a27
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
66b2067e0a389180f909eb0a528bea5f6becca23 20-Dec-2010 Michael Chan <mchan@android.com> b/3299524 Added defensive code to handle null values for duration and rrule

Change-Id: I84650163d1df944691c0a0943f30759473498c57
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
31eb9e37d743f4286378ab697cad3a89ba3522ab 09-Dec-2010 Erik <epastern@google.com> b/3035744 Makes events not save if nothing was changed

Change-Id: Ieaa873aedcb7ed2779ba8e8b31d6375abb99d63f
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
a7694eead7cbb293990bc89c3906e17bad36194c 08-Dec-2010 Erik <epastern@google.com> Add card style event view to search

This puts the read only card style event into search. Two big
todos for search are:
1)open an event by default on load
2)attempt to reopen an event when data changes, or open a new
default if the previous event was deleted.
3)re-examine the onPause saving behavior once b/3263703 is
resolved.

Change-Id: I52c2d26d683cfb478b163a7636c151b902a7a020
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
3400a2bfc1e6be435ea2bb0f436a6ef338446504 07-Dec-2010 Erik <epastern@google.com> Implement 'card' style for EditEvent

A todo for this change is to remove the extra gravities once
b/3259292 is fixed. Also fixes a bug with rotating new events.

Change-Id: If07fc053bf986bc8361e7dc9001e1bd653bb4364
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
59ead671b50514b49749fcd6a1d4186a270239d2 30-Nov-2010 Erik <epastern@google.com> Adds saving/restoring on rotation to EditEventFragment

As part of this the CalendarEventModel needed to be serializable
which required switching its Uri to a String and then parsing it
when used as a Uri.

Change-Id: I36a95ca1dce444e08cc6b5339d0b6441b1d0dfd2
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
9d5f351e45e20ff04da6f9118031cc2cc7419905 06-Nov-2010 Michael Chan <mchan@android.com> Show the calendar for existing events.
Previous we were hiding the calendar spinner for existing events.

Change-Id: I902d90408b2344cefa6cc4ef227430fd406d5501
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
304bf0d244d54c2c8c1799e3d43c54d197a891d8 13-Oct-2010 Michael Chan <mchan@android.com> Initialize default calendar permission for new events

Change-Id: I6cd8a6a2674b148754c2b0a2e3865f58f07af04f
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
352e1a2f834460bd54e03ce94cadd36a46debacb 28-Sep-2010 Michael Chan <mchan@android.com> 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
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
4b441bd6544fe6d11be75f974a41afd8fa040a4f 16-Sep-2010 Daisuke Miyakawa <dmiyakawa@google.com> Make settings screen support two pane mode.

1) Rename CalendarPreferenceActivity to GeneralPreferences, and
add CalendarSettingsActivity for top-level Activity.

We should retain previous logs for CalendarPreferenceActivity,
and we shouldn't call it "Activity" any more, as it is Fragment.

I'm not sure whether the new "CalendarSettingsActivity" should
be named so, or renaming it to "CalendarPreferenceActivity"
to keep consistency around naming.

2) Add necessary xmls.

Some of them are derived from Settings app, which already has
new two pane structure, so refering its logic seems enough for now.

Change-Id: I6a0b04bb824d06c2842cbd8127e2860c45350987
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
d845fbe558d5229102b58cce70a1b29fe6cb6967 12-Aug-2010 Erik <roboerik@android.com> New Edit Event layout

Some large changes to EditEvent including a new two-pane layout,
an attendance widget, and a list of attendees with remove buttons.
This also removes a lot of the excess layout code and cleans up
the theme code.

Change-Id: I87ab3511f7bb6501f2aa4bf6d33b5d4f8e6f4936
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
eca82e9468c002590045338f98588ad3ce1a0bb3 11-Jun-2010 Erik <roboerik@android.com> Creates an EditEventView with as little app logic as possible

This is work on separating the UI and the logic for Calendar. The view
should be responsible only for updating a model in response to user interaction
and notifying the controller when it is finished. All other work should be
handled at the fragment or activity level. This version does not introduce the
use of fragments. They will come in the next version. It does make all the event
queries asynchronous.

Change-Id: If967c77f39bbbe09490a5fe5e78151e828c8e6cf
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
6ae7d69b90f22fd51ab677036ba987dbdc35a62d 28-May-2010 Erik <roboerik@android.com> Updates to EditEventHelper

This makes some changes to EditEventHelper and the tests to address bugs
found while working on the view component. Also adds some extra functionality
that was missing, such as building a model from an intent and setting default
reminders.

Change-Id: I3b3f3df1b17b7863e791ea1eff4f4f139bee235f
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java
73714169d34a55fc01e14b30897a1ebbacf9934e 17-May-2010 Erik <roboerik@android.com> Creates a model for events and moves edit event methods into a helper

This is a step towards separating the UI and the logic for Calendar. This
creates a standard model for representing events programatically. This
model allows all the fields necessary for updating and managing an event
in the db and a few early helper methods for working with them. EditEventHelper
contains most of the logic from the previous EditEvent activity redone to use
the new event model and without reliance on any UI elements and with db access
minimized. It will still need to be modified to use a service for db access.

Change-Id: Ic8f68269b75f43a0f2fd6408196176592d32e699
/packages/apps/Calendar/src/com/android/calendar/CalendarEventModel.java