| fac2d1594f7ecae8e50dc7790ce67de0c9b70d22 |
|
31-May-2012 |
Sara Ting <sarating@google.com> |
Make notifications code ICS compatible.
Change-Id: Ie91183c8fd8cb48d5f5acc40335e6e123d34d56f
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 693ca60d79650af15ab226f7ce6958f61fb7de39 |
|
31-May-2012 |
Michael Chan <chanm@google.com> |
Modify app so it will run in ICS MR1
Change-Id: I56e516f87269bf973e256b156a20ec5b06809289
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 132eeb8acba46be5d0a3dc69b3a4dc0876430b08 |
|
31-May-2012 |
Michael Chan <mchan@android.com> |
Revert "Modify app so it will run in ICS MR1"
This reverts commit b8d0a58e51251f4d65917fc27c86f9f0822478a9
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| b8d0a58e51251f4d65917fc27c86f9f0822478a9 |
|
22-May-2012 |
Michael Chan <chanm@google.com> |
Modify app so it will run in ICS MR1
TODO Notification
TODO Changes around TaskStacker needs to be tested
Change-Id: I75c8bca8d35e25b7b02512053a3e7434bbb67bf8
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 4d2f035beb502dbd557fe31095c821d23b13608c |
|
27-Mar-2012 |
Isaac Katzenelson <isaack@android.com> |
Improve month view animation
Bug: 5933969 Low frame rate when switching from Day/Week to Month
Change-Id: I67e17e22329823d7af38b028460b01fe8c1447d9
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| a651f0460368b7f35610375c063f151b1e544ab2 |
|
02-Mar-2012 |
Alon Albert <aalbert@google.com> |
Add support for event colors
Change-Id: I0685a3c938ff3f43f690fd3aa875c3f63d0ee9e2
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 99704a2787158bf670fa4a7b4e4f89ace10afa00 |
|
11-Nov-2011 |
Michael Chan <mchan@android.com> |
b/5233576 Fixed the problem where long desc are not showing
Change-Id: Ic12e5e0158021996d0b3822803a4dad8fb10d904
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 4acb2fd087308dea146b8b10f5278c59df387680 |
|
19-Jul-2011 |
RoboErik <epastern@google.com> |
b/5039455 Makes cal color adjust everywhere we display cal colors
Change-Id: I108b112d1ef73c596e99429ced9b408733c08db1
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| b5e3c17201b2c08ca9f3fd33f4585e1ec8fa71b1 |
|
15-Jul-2011 |
RoboErik <epastern@google.com> |
b/5021617 Fix issues with event loading in dayview
Change-Id: I021407f5a7db2ea86b693ca72cf1cfadb6b70287
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 25996100d6ea61888ebe54d7708a9a371bb12a55 |
|
01-Jul-2011 |
RoboErik <epastern@google.com> |
Rough draft of dayView colors
This adds colors and unknown/declined/accepted appearance. This
is still a rough draft of DayView changes but should be good
for dogfooding.
Change-Id: Ia054e62200cc2eee6f560ba2b7e9fbf0c462d9a1
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| a27a886892fe3ec5edbc63c0b58e0a988623011a |
|
24-Jun-2011 |
RoboErik <epastern@google.com> |
api comment fixes
Change-Id: I711673a21a5314cd3ddf374fd764bda79cb0c6da
/packages/apps/Calendar/src/com/android/calendar/Event.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/Event.java
|
| 62e59a8145c5cd32e08e4453f68bbc69d9775a64 |
|
03-Jun-2011 |
RoboErik <epastern@google.com> |
tweaks for Calendar.java cleanup
-replaced interface refs with class refs
-method signature changes
Change-Id: I65bfc58a59ae8775098a44d8dec8850919b6211c
/packages/apps/Calendar/src/com/android/calendar/Event.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/Event.java
|
| b9b34ea19f7b74f6d9dceccc19cc110d68291c74 |
|
04-Mar-2011 |
Michael Chan <mchan@android.com> |
Clean up
Change-Id: I90d04b6a44642cca4e7065f3d0ed7cd2a5b70b1d
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| ff982e820f7c1e5f369ea71bf1e6fc511778bac4 |
|
01-Mar-2011 |
RoboErik <epastern@google.com> |
b/3497123 Fix sorting of non-allday events
Moving 24+h events to allday caused more issues. This queries
non-allday and allday events separately so they all end up in
their respective correct ordering.
Change-Id: I2028346969f38cf72587f6e80fc7e8f005819fc3
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 2fda24534978f55711526dbde747aa50d68dec40 |
|
16-Feb-2011 |
RoboErik <epastern@google.com> |
b/3157682 Makes the allday area expandable
If there are too many allday events they become impossible to
read. This makes it so that in this case we will instead hide
the excess events with information about how many are hidden
and an easy way to expand the allday area to show all the
allday events. Also fixes b/3472230
Change-Id: I5a73cc20f1edde54d90fc76fb7ac5ebd1260b073
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 68655b5af2b7e5f872a103858ec58a19042123ce |
|
23-Feb-2011 |
RoboErik <epastern@google.com> |
Make column sorting for allday events handle 24h events
The column sorting code assumed allday events could be sorted
by start and end millis. With 24 hour events being drawn as
allday events this was no longer a true assumption. This adds
code for sorting these events correctly along with allday events.
Change-Id: I254f495e92e6422bdb7b9ba62e2db17c8057088b
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 1d92cbdf5b754f9da92303eaf554d8db7d7b0849 |
|
23-Feb-2011 |
RoboErik <epastern@google.com> |
Makes events that are exactly 24 hours allday
Adds an = so events that are exactly 24 hours will count as
allday for drawing purposes. This is to pick up Exchange allday
events which get written as 24 hour events. Also amputated some
unused code that was suffering bitrot.
Change-Id: I8613cd72617df5a48643d11a5fc041b914dd6459
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| d031419da7900dab91ac9f512374d7e59bb74dce |
|
01-Feb-2011 |
Erik <epastern@google.com> |
b/1896074 Make events longer than 24 hours allDay
This makes long events appear in the allDay area of Day/Week
view.
Change-Id: Ic79bc15fbccf56ad4d6c3ededd3774cfb89ee7e4
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 434a9393da9b86bc7327d2075f6a09491c8b128d |
|
07-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of d73aa540 to master
Change-Id: I3b223e66be473b1597337a2774edb103cacc957b
|
| d73aa540c36fd62108ca022d34c441d0dfd492de |
|
07-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of e12c383f to stage-korg-master
Change-Id: I0829a16cc64b0256f6b8e07f3e4ff8f3173369ed
|
| b9cd34a9b6622045cfac73d1497f4e5d745601d3 |
|
06-Nov-2010 |
Mohammad Shamsi <m.h.shams@gmail.com> |
code cleanup:
- removed unused import statements.
- removed unused local variables
- removed unused private methods and..
Change-Id: If0270c7bbedc9d84ec67624d4fcef9b7ea465148
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 981874e61ecf29a96a77601a3172b2503b6537ee |
|
06-Oct-2010 |
Erik <roboerik@android.com> |
Work on making month view a list view
This reworks mini month view to use a list view for scrolling to
improve efficiency. Also has some code prep for extending to
full month view and redoes some of the visuals to be closer to
the design doc.
Change-Id: I83d1b5bc8c2386094357225f9638a4830fec955e
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 27d671cdba3e8b50219def2c9e1118abe987f908 |
|
13-Oct-2010 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use long instead of float.
Bug: 3091447
Change-Id: I18bd22ee64181db4cd6f6c01cc42be919e8b543c
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 308bb269f380e16bd0fc129f488aa1e804192569 |
|
13-Oct-2010 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Use long to calculate overwrap threshold. Do not merge
Bug: 3091447
Change-Id: I14c949847bfb08bcd7811932bebbd2f96a31bc47
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 46b05ffc746a3150b6bad5d3a72138ffa38b0a99 |
|
29-Sep-2010 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Make remeasure() consider relation between events.
This changes affect the logic in DayView but doesn't affect
that in FullMonthView/MiniMonthView, as they don't use
column values in Event class.
Bug: 3031917
Change-Id: I1815f065fe6c5d14cae995a79b70dd796b482439
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| d7898080728d3e7f5272462444276ad5d54b6b04 |
|
27-Sep-2010 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Refrain user-unfriendly overwrap. Do not merge
Bug: 3031917
Change-Id: I0b450806abd808c7b7c0293115c20e8c83a93d9c
/packages/apps/Calendar/src/com/android/calendar/Event.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/Event.java
|
| ec5daf689279afeccad68f211e37994d64d4fb53 |
|
18-May-2010 |
The Android Open Source Project <initial-contribution@android.com> |
merge from open-source master
Change-Id: Ic1aed0d5f6e1ad337b84e8619c3f6e2f22565ed1
|
| 4ce500bd7d08eac3f05dfd50bce51e620fa9f08e |
|
17-May-2010 |
Christian Mehlmauer <FireFart@gmail.com> |
Removed some Warnings, Added Type arguments
Change-Id: Ie52eecf14773768c97e23ae7f96a80df1d067ade
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| a17725e24d51b7a6f002dd5afd3270c8eeea0dbe |
|
17-Feb-2010 |
Jeff Hamilton <jham@android.com> |
Always use a consistent name for SharedPreferences.
The code was relying on the package name for
SharedPreferences, which is problematic if running
under a new package name.
Also, remove the use of the shared user ID.
Change-Id: I9d2c8c78588d7b9868318153d0788addb84f11a6
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 6d34cec523930368976bc8d358d0a6de1da3462c |
|
11-Sep-2009 |
Michael Chan <mchan@android.com> |
b/2098823 Fixed the problem where Delete and Edit Event weren't showing in long press menus. Make use of the new organizer and guestCanModifyEvent columns.
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 98ab9de2fa5ad8dfd37faa6593dc66fa426d8960 |
|
15-May-2009 |
Michael Chan <mchan@android.com> |
findbug fixes
modified: src/com/android/calendar/AgendaActivity.java
modified: src/com/android/calendar/AgendaAdapter.java
modified: src/com/android/calendar/CalendarActivity.java
modified: src/com/android/calendar/CalendarApplication.java
modified: src/com/android/calendar/CalendarView.java
modified: src/com/android/calendar/DeleteEventHelper.java
modified: src/com/android/calendar/EditEvent.java
modified: src/com/android/calendar/Event.java
modified: src/com/android/calendar/EventInfoActivity.java
modified: src/com/android/calendar/IcsImportActivity.java
modified: src/com/android/calendar/MonthActivity.java
modified: tests/src/com/android/calendar/FormatDateRangeTest.java
modified: tests/src/com/android/calendar/WeekNumberTest.java
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 146de36083f6ce8b7e8a1f974d3990594a36bfec |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 2cb8df4a54d65554c34faa79d8b2a46a86ff7b52 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| 9fc8b6af9723434655176980979790cddebc3799 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| a9ea5e1627ce3b2ecc72a3dca7ae732593b0a424 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/packages/apps/Calendar/src/com/android/calendar/Event.java
|
| a390cbfd25a5f3b2f002df725b7580bc78bd9edf |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/packages/apps/Calendar/src/com/android/calendar/Event.java
|