aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 8d85c6c7: Split EXDATE with a Newline DelimiterHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-14.0staging/cm-12.1staging/cm-12.0-cafstable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-13.0cm-12.1cm-12.0Alon Albert2013-04-030-0/+0
|\ | | | | | | | | * commit '8d85c6c7a7f853ff25554dea9bc6403a75fb68ef': Split EXDATE with a Newline Delimiter
| * Split EXDATE with a Newline DelimiterAlon Albert2013-04-031-1/+12
| | | | | | | | | | | | | | So we can support multiple exdate values. Bug: 8331334 Change-Id: Ica70f7719f629fcedbec2e781d812045ef0de59f
* | Split EXDATE with a Newline DelimiterAlon Albert2013-03-061-1/+12
| | | | | | | | | | | | | | So we can support multiple exdate values. Bug: 8331334 Change-Id: Ica70f7719f629fcedbec2e781d812045ef0de59f
* | Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchupMichael Chan2013-02-250-0/+0
|\|
| * Fix issue with invisible recurring appointmentsFredrik Hellén-Halme2013-02-062-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Fixes that recurring appointments goes invisible when hit by the failsafe limit. There is still a hard limit in RecurrenceProcessor, but at least this limit is applied on a per-event basis, meaning that it's always possible to create new recurring appointments without them going invisible. Change-Id: I6c9e1e10db78e1b73ea9f2b7104621fbbd906452
* | Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchupMichael Chan2013-02-065-0/+77
|\|
| * Make this build in EclipseMichael Chan2012-12-205-0/+77
| | | | | | | | Change-Id: Ib34de4361aaa93c5ee9d573557931f9e24905dd6
* | Fix issue with invisible recurring appointmentsFredrik Hellén-Halme2012-11-192-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Fixes that recurring appointments goes invisible when hit by the failsafe limit. There is still a hard limit in RecurrenceProcessor, but at least this limit is applied on a per-event basis, meaning that it's always possible to create new recurring appointments without them going invisible. Change-Id: I6c9e1e10db78e1b73ea9f2b7104621fbbd906452
* | am 50484452: Rename calendarcommon to calendarcommon2 to workaround OEM ↵Michael Chan2012-09-060-0/+0
|\| | | | | | | | | | | | | silliness * commit '504844526f1b7afec048c6d2976ffb332670d5ba': Rename calendarcommon to calendarcommon2 to workaround OEM silliness
| * Rename calendarcommon to calendarcommon2 to workaround OEM sillinessMichael Chan2012-06-2613-20/+20
| | | | | | | | Change-Id: I5bd618866d6484037671376e192ee3217c42c366
* | am eb95cfa4: (-s ours) Merge remote-tracking branch \'goog/master\' into HEADIsaac Katzenelson2012-09-060-0/+0
|\| | | | | | | * commit 'eb95cfa41925d2c286075236688d6473999c954e':
| * Merge remote-tracking branch 'goog/master' into HEADIsaac Katzenelson2012-06-2110-75/+531
| |\ | | | | | | | | | | | | | | | | | | Conflicts: Android.mk Change-Id: Ibf661a0b8c1d198ee01998405b81bb7919c17aaf
* | | Merge commit '501c5d48' into manualmergecm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1Ying Wang2012-08-301-1/+2
|\| | | | | | | | | | | | | | | | | | | | Conflicts: Android.mk Change-Id: If0a6b6475ac908a22ece23d43d1011f8d20ceb43
| * | Build calendar-common against SDK 15.Ying Wang2011-12-201-1/+1
| | | | | | | | | | | | Change-Id: Ia004f7bf624e9a940c0f596df558cc7f3e0d1b51
* | | Rename calendarcommon to calendarcommon2 to workaround OEM sillinessMichael Chan2012-08-1513-20/+20
| |/ |/| | | | | Change-Id: I5bd618866d6484037671376e192ee3217c42c366
| |
| \
*-. | Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
|\ \| | | | | | | | | | Change-Id: I46443846579ecb49a3af90fc2065ba249840c007
| * | merge in jb-release history after reset to jb-devjellybean-stablejellybeanThe Android Automerger2012-05-170-0/+0
| |\ \
* | | | am 18428249: Add README fileAlice Yang2012-05-161-0/+5
|\| | | | | | | | | | | | | | | | | | | * commit '184282491e4dce14515afe22b0a6efbf2cc608ed': Add README file
| * | | Add README fileAlice Yang2012-05-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For instructions on how to build and run the calendar-common unit tests. Change-Id: I70d5ac33e80cce230dd4694a1061a84423332f7a
* | | | am a991358d: Allow ";;"Alice Yang2012-05-162-0/+9
|\| | | | | | | | | | | | | | | | | | | * commit 'a991358d94947cc0dbd6a8d75dd77b5fd377734b': Allow ";;"
| * | | Allow ";;"Alice Yang2012-05-152-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow for consecutive ";" in rules for recurring events. Bug 6312732 Change-Id: I3bd82b7818cd755eec7129ca6497746a91cb6653
| | | |
| \ \ \
*-. | | | Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \| | | | |/ / / |/| / / | |/ / Change-Id: I60b68feb036d2d484b705490d68113c856a611b9
| * | merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
|/| |
| * | merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| |\ \
| | * \ merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | |\ \ | | |/ / | |/| |
* / | | Make some methods publicAlon Albert2012-04-171-10/+10
|/ / / | | | | | | | | | | | | Bug: 6276478 Change-Id: I6725b01b14881347e3324c403e099217ab6e2057
* / / Move Duration class from CalendarProviderAlon Albert2012-03-192-0/+227
|/ / | | | | | | Change-Id: I9a354fe360376c43da2290535a038bd6ab4facd3
* | am 90c6616a: am bbcfb960: Catch exception when parsing event\'s dataIsaac Katzenelson2012-01-192-56/+90
|\ \ | | | | | | | | | | | | * commit '90c6616a33c0d1f948d309cf6c5cf0c64483bd0a': Catch exception when parsing event's data
| * \ am bbcfb960: Catch exception when parsing event\'s dataIsaac Katzenelson2012-01-182-56/+90
| |\ \ | | | | | | | | | | | | | | | | * commit 'bbcfb96060e9b518b810015984081a25c8ae2c26': Catch exception when parsing event's data
| | * | Catch exception when parsing event's dataIsaac Katzenelson2012-01-182-56/+90
| | | | | | | | | | | | | | | | | | | | Bug: 5876746 Android calendar syncing broken by certain repeated events Change-Id: Ia0b2bc610148302b1cc3d751c47a958950abfb46
* | | | am 33df4ea6: am 996f1256: Allow lowercase in rruleMichael Chan2012-01-131-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '33df4ea6d936ee17377ad03fe456843262eac97b': Allow lowercase in rrule
| * | | am 996f1256: Allow lowercase in rruleMichael Chan2012-01-131-1/+1
| |\| | | | | | | | | | | | | | | | | | * commit '996f12565f11ea0130cbdc570c0853ae53073f18': Allow lowercase in rrule
| | * | Allow lowercase in rruleMichael Chan2012-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 5822997 Change-Id: I5f309cd0f854f8ac27326e7c16f9b637b24cd604
* | | | am b9a152ec: am 0335d9f5: Fix rrules with bad count and interval during parsingMichael Chan2012-01-052-2/+139
|\| | | | | | | | | | | | | | | | | | | * commit 'b9a152ecd47d1b26f045e1cdef1ab40e36a63999': Fix rrules with bad count and interval during parsing
| * | | am 0335d9f5: Fix rrules with bad count and interval during parsingMichael Chan2012-01-052-2/+139
| |\| | | | | | | | | | | | | | | | | | * commit '0335d9f524da1da1f4d15bba37a1576a9480a36d': Fix rrules with bad count and interval during parsing
| | * | Fix rrules with bad count and interval during parsingMichael Chan2012-01-032-2/+139
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Specifically If count < 0, assume 1 If interval < 1, assume 1 Bug: 5676414 Change-Id: I942cdaffcfb98a922c5867c9d08be322c64a0f94
* | | am 74b1b5b0: ICaldendar.START/END -> package-privateConley Owens2011-12-211-2/+2
|\| | | | | | | | | | | | | | * commit '74b1b5b02ac2022e01167d9cb5cbec02d3877fa7': ICaldendar$Compenent.START/END -> package-private
| * | ICaldendar$Compenent.START/END -> package-privateConley Owens2011-12-211-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Make ICaldendar$Compenent.START and ICaldendar$Compenent.END package-private instead of private. This makes a little more sense since they are accessed outside of the class that they are defined in. In addition, this fixes errors created by proguard when building with OpenJDK. Change-Id: I3ffa4d8807c1f00e89b414f3adba39cd9e799c47
* | Stop including libphonenumberAndy McFadden2011-11-153-10/+2
| | | | | | | | | | | | | | | | No longer used by Calendar app. Bug 5578068 Change-Id: I7d7b51ac334f7dee7fbca7748a3c461f04f6b126
* | Add CleanSpecAndy McFadden2011-10-281-0/+45
| | | | | | | | | | | | | | Probably needed this with previous commit -- clears out directory so jarjar will run even though no sources have changed. Change-Id: Ibe8d5822a016b44c5a0ab847596764bf7544c4ad
* | Rename libphonenumber packageAndy McFadden2011-10-282-0/+8
|/ | | | | | | | | | We're including a static copy of libphonenumber for the benefit of the unbundled Calendar app. We need to rename the package to avoid a conflict with the (non-public) copy in ext.jar. Bug 5532441 Change-Id: I6563c924809f936d8f04e081f0159a7fa1a907be
* Support WKST in recurrence rulesAndy McFadden2011-10-213-24/+54
| | | | | | | | | | | RFC 5545 says WKST is significant in weekly rules with nonzero intervals and BYDAY rules, and also in yearly rules with a BYWEEKNO part. Yearly with BYWEEKNO seems to be generally broken, so this only attempts to correct weekly recurrences. Bug 1641249 Change-Id: Icad8762be4685036fc50bed0cc75970e774a21a8
* Include libphonenumberAndy McFadden2011-08-261-1/+3
| | | | | | | | Pull the external/libphonenumber sources into the Calendar lib. Bug 4969832 Change-Id: Id59fac7fbfae488aa79d05520a60d4c4c3473f17
* catch exception from time.parse() and throw an exception we handle betterAlon Albert2011-08-071-2/+11
| | | | | Bug: 3415450 Change-Id: I0a83082b5de6d5c243ea84134769516e39e5a5fd
* Fix a commentAndy McFadden2011-08-022-4/+3
| | | | | | | | | RFC 5545 says the behavior is unspecified. This just updates the comments (no code changes). Bug 5075775 Change-Id: I87d131c260570e2990bb05f624c90f7d78a1eb89
* Partial support for BYSETPOSAndy McFadden2011-07-202-3/+142
| | | | | | | | | | This adds support for rules like FREQ=MONTHLY;BYDAY=SA,SU;BYSETPOS=x (for the popular "first weekday of the month" sort of recurrence). Implementing fully general support for BYSETPOS is a bigger task. Bug 4946753 Change-Id: I437c0cf52bbed2a191729b3891c3afda62ffb633
* Don't require FREQ to come firstAndy McFadden2011-07-192-6/+6
| | | | | | | | | | | | The definition of "recur" in 4.3.10 suggests that FREQ must come first, but the description is really just trying to say that FREQ is mandatory. The text makes it clear that there is no ordering on rule parts. This removes the explicit test, and updates the set of test rules. Change-Id: I908ae388456a7df2d12a0c18a2174af8f95ec421
* Added some RecurrenceSet testsAndy McFadden2011-07-152-7/+51
| | | | | | | | Adds a few more tests for RecurrenceSet. Also, fix the RecurrenceSet TAG. Change-Id: I429cbea065e2b5d8d3a97662e54b9428ad8be257
* Move a couple more classes to calendar-commonAndy McFadden2011-07-134-0/+4468
| | | | | | | Move RecurrenceProcessor and DateException, so that app code can access the recurrence generator. Useful for e.g. bug 4977517. Change-Id: Iaeb3e486a6a4133aa3d361d73461a0a0a3771bb4
* Get tests workingAndy McFadden2011-07-112-4/+3
| | | | | | | | Drop the shared ID so that the tests can be installed and run. Updated a comment. Change-Id: Ic58088c3cbda601bc44203815a80866c3d318b3b