summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge "Fixing gender-matching issues in some languages for a recurrence ↵Sam Blitzstein2013-05-012-16/+52
|\ \ \ \ | |_|/ / |/| | | | | | | string." into ics-ub-calendar-denim
| * | | Fixing gender-matching issues in some languages for a recurrence string.Sam Blitzstein2013-05-012-16/+52
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Some langauges were having gender-matching issues for strings like "Every fifth Tuesday", so the strings had to be refactored to allow for grammaticality across languages. Bug: 8708439 Change-Id: Ibe467b74566759c3286ba54d0a3eeea0952a7288
* / | Fixed save recurring event response through gmailJames Kung2013-05-011-0/+4
|/ / | | | | | | | | Bug: 8569944 Change-Id: I677d609dce74efaf1cda1006d0c924a3081b49b3
* / Fix events that recur weekly on a different start date.Sam Blitzstein2013-04-301-0/+77
|/ | | | | | | | | Fix bug where if you create an event that recurs weekly on days that are different from the weekday of your start date, the event was being created incorrectly. Bug: 8757470 Change-Id: Id3f3a94acebfbecd0c1ad2a964623c3315839f6d
* Merge "handle all the messages." into ics-ub-calendar-denimChris Wren2013-04-301-3/+0
|\
| * handle all the messages.Chris Wren2013-04-301-3/+0
| | | | | | | | | | Bug: 8732256 Change-Id: Iea9a61447a10737837873e96eb0b7f889fb8dfd0
* | Merge "also dismiss digest notifications." into ics-ub-calendar-denimChris Wren2013-04-302-1/+4
|\|
| * also dismiss digest notifications.Chris Wren2013-04-302-1/+4
| | | | | | | | | | Bug: 8683349 Change-Id: I93bcd6f31b0b60a4b098bca9e5036f293457dd7b
* | am 96a36f4c: Retain color palette icon on orientation changeJames Kung2013-04-293-8/+31
|\ \ | | | | | | | | | | | | * commit '96a36f4cb7803d50ecf47945b6a240926f48e7c3': Retain color palette icon on orientation change
| * | Retain color palette icon on orientation changeJames Kung2013-04-293-8/+31
| | | | | | | | | | | | | | | Bug: 8755983 Change-Id: I357122e03ebd447aaec023d65448faa92467a46b
* | | Merge "re-try notification subscriptions if they fail" into ↵Chris Wren2013-04-301-3/+4
|\ \ \ | | |/ | |/| | | | ics-ub-calendar-denim
| * | re-try notification subscriptions if they failChris Wren2013-04-291-3/+4
| | | | | | | | | | | | | | | Bug: 8754701 Change-Id: I6e3823b09b9e6d24f7b83155fb1968be65c48a52
* | | am 018f539c: Small recurrence picker layout bugs.Sam Blitzstein2013-04-292-2/+4
|\ \ \ | |/ / |/| / | |/ | | * commit '018f539c218940e0fad05c10552759e4fa2e77e4': Small recurrence picker layout bugs.
| * Small recurrence picker layout bugs.Sam Blitzstein2013-04-292-2/+4
| | | | | | | | | | | | | | | | | | | | Fixing look of recurrence label in edit event view when editing an already-recurring event. Removed "events" text which was accidentally showing in the end group label when it shouldn't have been. Bug: 8751056 Change-Id: Ic32f0d36b75bed17230c5f48e1bbe282155102bb
* | am f7b83d2c: Merge "Recurrence picker re-design from feedback" into ↵Sam Blitzstein2013-04-281-248/+392
|\| | | | | | | | | | | | | ics-ub-calendar-cream * commit 'f7b83d2c63307f9098beffb699e0a5569f21ba36': Recurrence picker re-design from feedback
| * Merge "Recurrence picker re-design from feedback" into ics-ub-calendar-creamSam Blitzstein2013-04-291-248/+392
| |\
| | * Recurrence picker re-design from feedbackJames Kung2013-04-271-248/+392
| | | | | | | | | | | | | | | Bug: 8696938 Change-Id: Ic088968a7a45538e88aeacb73bf938fd6673db8e