summaryrefslogtreecommitdiffstats
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-213-10/+28
|\ \ | | | | | | | | | ics-ub-calendar-timely
| * | Display error when a viewed event has been deleted.Paul Sliwowski2013-05-213-10/+28
| |/ | | | | | | | | | | | | | | | | | | 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
* | Merge "Fixed leak cursor in AlertReciever" into ics-ub-calendar-timelyPaul Sliwowski2013-05-211-12/+10
|\ \
| * | 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
* / Import translations. DO NOT MERGEBaligh Uddin2013-05-201-1/+1
|/ | | | | Change-Id: I6e7809cdcc34ee94a1a8dc45c5f5e1f5db500eb3 Auto-generated-cl: translation import
* am 0a77d682: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-05-170-0/+0
|\ | | | | | | | | | | | | ics-ub-calendar-denim * commit '0a77d682376df881bced0ff203559ca05e6df415': Import translations. DO NOT MERGE
| * Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denimBaligh Uddin2013-05-177-13/+13
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-05-177-13/+13
| | | | | | | | | | | | | | | Change-Id: Iad22d64def28a7a71ad9c3cfb745c4a530d10548 Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-timelyBaligh Uddin2013-05-177-13/+13
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-177-13/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: If19c5753b90c43f917effb8049155a5171a89cf9 Auto-generated-cl: translation import
* | | | 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 d37fa4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin2013-05-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | ics-ub-calendar-denim * commit 'd37fa4c93a821ff1ecf878ed1feb0f1af3c70d79': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denimBaligh Uddin2013-05-1322-62/+62
| |\ \ \
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-1322-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I61798722abf83903ae2170c479436324020f6c35 Auto-generated-cl: translation import
* | | | | Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-timelyBaligh Uddin2013-05-1322-62/+62
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-1322-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4af911056f46fce136e195b64c59ac165cde747f Auto-generated-cl: translation import
* | | | | | am 8f0d70bf: Merge "Solution for recurrence spinner issues" into ↵James Kung2013-05-133-32/+16
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | ics-ub-calendar-denim * commit '8f0d70bfa2e4595a4f5f74be80de106411ea140a': Solution for recurrence spinner issues
| * | | | Merge "Solution for recurrence spinner issues" into ics-ub-calendar-denimJames Kung2013-05-133-32/+16
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Solution for recurrence spinner issuesJames Kung2013-05-103-32/+16
| | | | | | | | | | | | | | | | | | | | Bug: 8895602 Change-Id: I22b71def459fe8fc9ccf6b60144a5341d4db4655
* | | | am 1c52e5ef: (-s ours) am 52b8824a: (-s ours) Merge "Reformat timezone name ↵Isaac Katzenelson2013-05-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | to better distinguish GMT from timezone. DO NOT MERGE" into ics-ub-calendar-cream * commit '1c52e5ef49f2a6e5391a24dbed93c5fa5fb22084': Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGE
| * | | am 52b8824a: (-s ours) Merge "Reformat timezone name to better distinguish ↵Isaac Katzenelson2013-05-100-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GMT from timezone. DO NOT MERGE" into ics-ub-calendar-cream * commit '52b8824a974590bb0df509ce7f9c1b32178c1248': Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGE
| | * \ \ Merge "Reformat timezone name to better distinguish GMT from timezone. DO ↵Isaac Katzenelson2013-05-062-3/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | NOT MERGE" into ics-ub-calendar-cream
| | | * | | Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGESam Blitzstein2013-05-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge of https://googleplex-android-review.googlesource.com/#/c/305860/ into Cream. Bug: 8794160 Change-Id: I90c95cc14fc37ef95432fb7c5b099acc825e191b
* | | | | | am bdaaee94: (-s ours) am 3a1b3030: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bdaaee94274ff09f5a45f744c91e45f4388882fc': Import translations. DO NOT MERGE
| * | | | | am 3a1b3030: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a1b303046d33639a0025e50ee11e08a5589d5b9': Import translations. DO NOT MERGE
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-063-3/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I21b78f679640acd302a670f7932d8cff20659f6c Auto-generated-cl: translation import
* | | | | am ff9d22d6: (-s ours) am b3f4b48e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff9d22d62717c615ae6af0c52a31f79460084286': Import translations. DO NOT MERGE
| * | | | am b3f4b48e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'b3f4b48ec734146650f0755c8143aaebd487118b': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-0327-77/+121
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic1ea193fe061a47faec5c1d4fab2a77a7baaa3c4 Auto-generated-cl: translation import
* | | | | am bfb9f78a: (-s ours) am a2dc0a70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfb9f78a9b502c835d056817dfe303f77ca4a6b5': Import translations. DO NOT MERGE
| * | | | am a2dc0a70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a2dc0a70e5c01edf78f8a1980301be697dec94c9': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-0174-224/+372
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib096d46a6c04132be1294ff1aae78f97bf7385f2 Auto-generated-cl: translation import
* | | | | 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 a191a694: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-090-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'a191a694a075e1f2ee8b2755e9fe379194529f9c': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-05-083-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I38955a98ee7d845a17d0fc24f47305631b6f7fa9 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-083-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I3c0b7c2c0baabfb2700cddbd50394af7bc92b0ac Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-timelyBaligh Uddin2013-05-075-109/+149
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-075-109/+149
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I73a273ebe181afa9fee04b185f3c663a3b95be28 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 17:23:48 +0000