summaryrefslogtreecommitdiffstats
path: root/src/com/android/calendar
Commit message (Collapse)AuthorAgeFilesLines
...
* Add analytics tracking to calendar app.Paul Sliwowski2013-06-273-26/+86
| | | | | Bug: 9486046 Change-Id: Icce29196849f7c43a1e5dc7ba12109f0a682df48
* Fix small typos in I9490f478681783200a5cb8309a58243723bda4c1.Paul Sliwowski2013-06-261-5/+5
| | | | Change-Id: I8b7da79314e9b2c43135aa7fc76443ea193337e7
* Merge "Add in-memory cache to dismiss alerts that we haven't seen yet." into ↵Paul Sliwowski2013-06-262-101/+273
|\ | | | | | | ics-ub-calendar-eggplant
| * Add in-memory cache to dismiss alerts that we haven't seen yet.Paul Sliwowski2013-06-192-101/+273
| | | | | | | | | | | | | | | | | | | | Bug: 9018194 This adds an in-memory cache of alerts that we haven't seen yet, so that we can dismiss them once the calendar data provider syncs. Change-Id: I9490f478681783200a5cb8309a58243723bda4c1
* | Merge "Fix bug where recurrent event won't allow events with duration of 0." ↵Paul Sliwowski2013-06-261-1/+1
|\ \ | | | | | | | | | into ics-ub-calendar-eggplant
| * | Fix bug where recurrent event won't allow events with duration of 0.Paul Sliwowski2013-06-241-1/+1
| | | | | | | | | | | | | | | Bug: 9499422 Change-Id: I9aee638ea074b5a96bcf984c086b104da1ff40bf
* | | Revert "Add timely fragment"Isaac Katzenelson2013-06-254-188/+1
|/ / | | | | | | | | | | This reverts commit bf44e272f0c5a6df2217e2efae2ae4ec0b24e073. Change-Id: Ib8e7d1df0b686c5951d15884827effd604efa120 (cherry picked from commit 376fa68925efc5a9ddd38ed1013c2fa57255f8f2)
* | Merge "Fix bug in recurrent event dialog picker when setting monthly day of ↵Paul Sliwowski2013-06-201-6/+29
|\ \ | | | | | | | | | the week." into ics-ub-calendar-eggplant
| * | Fix bug in recurrent event dialog picker when setting monthly day of the week.Paul Sliwowski2013-06-201-6/+29
| |/ | | | | | | | | | | | | | | | | | | Bug: 9463328 Dialog picker didn't handle last monthly day of the week. It used 5 instead of -1, whiched caused a crash when syncing with the web and also having recurrent events not show up on months that didn't have 5 weeks. Change-Id: Ia32898936a3bcf4b39ff3d0890821d307291755e
* | Merge "Fixed ISE issue when subscribing to gcm groups from the main thread." ↵Paul Sliwowski2013-06-191-1/+9
|\ \ | | | | | | | | | into ics-ub-calendar-eggplant
| * | Fixed ISE issue when subscribing to gcm groups from the main thread.Paul Sliwowski2013-06-181-1/+9
| |/ | | | | | | | | | | Bug: 9057948 Change-Id: I5f81b29f8e8fd21f9748004795ee5748eefc8b32
* / Fix mokey NullPointerException when there is no colors to save.Paul Sliwowski2013-06-181-0/+4
|/ | | | | Bug: 9479905 Change-Id: I6fd445a2e1ad30741102561c87a7385e9a91e887
* Merge "Fix calander crash where getTimezone was call without a looper." into ↵Paul Sliwowski2013-06-142-12/+15
|\ | | | | | | ics-ub-calendar-eggplant
| * Fix calander crash where getTimezone was call without a looper.Paul Sliwowski2013-06-122-12/+15
| | | | | | | | | | | | Bug: 9164929 Change-Id: Id4cac1c0c0de0887ae5b1af76707d7a0ddbfc79e
* | Fix crash when dismissing notification.Paul Sliwowski2013-06-133-15/+10
|/ | | | | | Crash caused by cl I0c90033c5af16f02c72c81c5d407528ce644db58. Change-Id: I249010d3698215b4c0ffe4230a03d65c6e92fa03
* am 61388102: Calendar color picker Exchange account fixJames Kung2013-05-316-15/+207
|\ | | | | | | | | * commit '61388102bec5243dfd4494b8c674cdb7957663a6': Calendar color picker Exchange account fix
| * Calendar color picker Exchange account fixJames Kung2013-05-306-15/+207
| | | | | | | | | | Bug: 9196777 Change-Id: I21c97bf06ab51254d816f7c5cc2817f85e91d2eb
* | Merge "Remove dead code in AlarmService." into ics-ub-calendar-timelyPaul Sliwowski2013-05-212-9/+11
|\ \
| * | Remove dead code in AlarmService.Paul Sliwowski2013-05-212-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8766415 Only DismissAlarmsService handles DELETE_ALL_ACTION, so removing the handling out of AlarmService. Change-Id: I0c90033c5af16f02c72c81c5d407528ce644db58
* | | Merge "Display error when a viewed event has been deleted." into ↵Paul Sliwowski2013-05-211-9/+15
|\ \ \ | | | | | | | | | | | | ics-ub-calendar-timely
| * | | Display error when a viewed event has been deleted.Paul Sliwowski2013-05-211-9/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8766415 Add error message to EventInfoFragment when there is no event to display. This state should only occur when the event is deleted while viewing it. Change-Id: I36c1592061c4d7f58d0c259d8179f44c8f5f67f0
* | | Merge "Capitalize Noon and Midnight in event edit view." into ↵Paul Sliwowski2013-05-211-0/+1
|\ \ \ | | | | | | | | | | | | ics-ub-calendar-timely
| * | | Capitalize Noon and Midnight in event edit view.Paul Sliwowski2013-05-201-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8565520 Set DateUtils flag to have Noon and Midnight capitalized when time is formatted. Change-Id: I88b8adb1dae66fcf580e8a81174a4468d895a745
* / / Fixed leak cursor in AlertRecieverPaul Sliwowski2013-05-201-12/+10
|/ / | | | | | | | | | | | | | | | | Bug: 8764753 This fixed cleans up the code and make sure we close the location cursor when finished with it. Change-Id: I815c2e99bedbfe52d81e95ea7efd546ec1343635
* | am 497a6259: No crash on color change and orientation changeJames Kung2013-05-171-8/+10
|\| | | | | | | | | * commit '497a6259757e4b61ef8f15aa516284d5b0ac3451': No crash on color change and orientation change
| * No crash on color change and orientation changeJames Kung2013-05-171-8/+10
| | | | | | | | | | Bug: 9005546 Change-Id: I0830d4dd9fbbeaa9f79c9295eb5dd7bad70d979b
* | am 9662675d: Merge "Query for Colors in parallel with all other queries" ↵Isaac Katzenelson2013-05-141-4/+10
|\| | | | | | | | | | | | | into ics-ub-calendar-denim * commit '9662675dc0765ab347d1786e3d5a86ce9f3f5b84': Query for Colors in parallel with all other queries
| * Merge "Query for Colors in parallel with all other queries" into ↵Isaac Katzenelson2013-05-141-4/+10
| |\ | | | | | | | | | ics-ub-calendar-denim
| | * Query for Colors in parallel with all other queriesIsaac Katzenelson2013-05-131-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8945406 When the data queried for editing an event is not done squentially there is a timing issue that causes the view to lose the focus and the IME. Changed the queries to start all in parallel. Change-Id: Id592d7f1ae0f27717275288a661d5938c0a4f485
* | | am 3f0521e9: Merge "Fix for interval strings beginning with the count" into ↵James Kung2013-05-131-8/+4
|\| | | | | | | | | | | | | | | | | | | | ics-ub-calendar-denim * commit '3f0521e93a94ac7fb927926ef3eab410bd6c83e3': Fix for interval strings beginning with the count
| * | Merge "Fix for interval strings beginning with the count" into ↵James Kung2013-05-131-8/+4
| |\ \ | | | | | | | | | | | | ics-ub-calendar-denim
| | * | Fix for interval strings beginning with the countJames Kung2013-05-131-8/+4
| | | | | | | | | | | | | | | | | | | | Bug: 8895602 Change-Id: I07996e0dfaebfa73b5e61040d9848c09858e763d
* | | | am 8f0d70bf: Merge "Solution for recurrence spinner issues" into ↵James Kung2013-05-131-29/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ics-ub-calendar-denim * commit '8f0d70bfa2e4595a4f5f74be80de106411ea140a': Solution for recurrence spinner issues
| * | | Merge "Solution for recurrence spinner issues" into ics-ub-calendar-denimJames Kung2013-05-131-29/+10
| |\| |
| | * | Solution for recurrence spinner issuesJames Kung2013-05-101-29/+10
| | | | | | | | | | | | | | | | | | | | Bug: 8895602 Change-Id: I22b71def459fe8fc9ccf6b60144a5341d4db4655
* | | | am 7ecf7983: spawn a worker thread in onReceive.Chris Wren2013-05-091-29/+40
|\| | | | | | | | | | | | | | | | | | | * commit '7ecf798315d4c54e6435f13e0eaaf5c1a0a089b2': spawn a worker thread in onReceive.
| * | | spawn a worker thread in onReceive.Chris Wren2013-05-091-29/+40
| |/ / | | | | | | | | | | | | Bug: 8890471 Change-Id: I4d284a29cfd83c24408b0328b603a7c938cd0d47
* | | am 5f44e994: serialize the GCM calls.Chris Wren2013-05-062-124/+117
|\| | | | | | | | | | | | | | * commit '5f44e994a6f1dabf5a208f0035d476e71460626b': serialize the GCM calls.
| * | serialize the GCM calls.Chris Wren2013-05-062-124/+117
| | | | | | | | | | | | | | | Bug: 8777815 Change-Id: Idb8f906d4c596ad4c0ac4a538a7c81453a026835
* | | am d6360ea9: don\'t return a result from this non-ordered broadcast.Chris Wren2013-05-061-2/+0
|\| | | | | | | | | | | | | | * commit 'd6360ea9b9ebed2a7b571c0270ed1a00e123ca23': don't return a result from this non-ordered broadcast.
| * | don't return a result from this non-ordered broadcast.Chris Wren2013-05-061-2/+0
| | | | | | | | | | | | | | | Bug: 8832394 Change-Id: I5501370810a1753a5a94dc5b49859e277a421944
* | | am b69ea637: Reformat timezone name to better distinguish GMT from timezone.Sam Blitzstein2013-05-042-3/+3
|\| | | | | | | | | | | | | | * commit 'b69ea6371541b833662acbb835ae758316e1d0bb': Reformat timezone name to better distinguish GMT from timezone.
| * | Reformat timezone name to better distinguish GMT from timezone.Sam Blitzstein2013-05-032-3/+3
| | | | | | | | | | | | | | | Bug: 8794160 Change-Id: Ib57be9fb74a54296bc1a245479eabaf008a42e70
* | | am 95b51431: Merge "Null check for create event dialog fragment" into ↵James Kung2013-05-021-2/+12
|\| | | | | | | | | | | | | | | | | | | | ics-ub-calendar-denim * commit '95b51431844cd514dc2e59529f0439bf8bb6b09d': Null check for create event dialog fragment
| * | Merge "Null check for create event dialog fragment" into ics-ub-calendar-denimJames Kung2013-05-031-2/+12
| |\ \
| | * | Null check for create event dialog fragmentJames Kung2013-05-021-2/+12
| | | | | | | | | | | | | | | | | | | | Bug: 8777939 Change-Id: I9759d2c760c1d54ff3a4ce0007c2aea3fe6ed8f0
* | | | am 0000fa42: Making notification popup play nicely with guns.Sam Blitzstein2013-05-021-5/+42
|\| | | | | | | | | | | | | | | | | | | * commit '0000fa426da7fbfd35f16bf43556e861dfcf6667': Making notification popup play nicely with guns.
| * | | Making notification popup play nicely with guns.Sam Blitzstein2013-05-021-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug where dismissing notifications from the popup wasn't propagating that back to GUNS. Bug: 8780855 Change-Id: I1cee9b921307cc740e2dda74b2201951f9176b8e
* | | | Merge "Add timely fragment" into ics-ub-calendar-timelyIsaac Katzenelson2013-05-024-1/+188
|\ \ \ \ | |/ / / |/| | |
| * | | Add timely fragmentIsaac Katzenelson2013-05-014-1/+188
| | | | | | | | | | | | | | | | Change-Id: Ieef1dbc5faa048a896b0ea06404d32e415a8b3b3