summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Allow configuring the delay for snoozing calendar reminders.Danny Baumann2013-02-226-6/+135
| | | | | | | This allows both configuring the default snooze delay as well as ask for the delay whenever snoozing a reminder. Change-Id: Ib875c231535ff4f53dc7c97dd15a6a4b29f48fba
* Merge tag 'android-4.2.2_r1' of ↵mr1.1-stagingSteve Kondik2013-02-133-76/+64
|\ | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Calendar into 1.1 Android 4.2.2 release 1 Conflicts: res/values-nl/strings.xml Change-Id: I34dffaec7b7eacd428d7546c03a7f5f1b49700ea
| * Remove vibrate-on-silent-mode per UXMichael Chan2012-12-053-76/+64
| | | | | | | | | | | | | | | | | | | | | | | | Also show current ringtone (6265196) Cherry-picked from https://googleplex-android-review.googlesource.com/#/c/253780/ https://googleplex-android-review.googlesource.com/#/c/253801/ Bug: 7631982 Bug: 6265196 Change-Id: I7a9212d8672a225ab95c0fa2973ae616b393f005
* | Merge branch 'jb-mr1-release' of ↵cm-10.1-M1Steve Kondik2012-11-1835-592/+1199
|\| | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Calendar into HEAD Change-Id: I7d1aa6b528efe2d7df3abb3cb884c25df61037ab
| * Merge "Workaround Email bug that does not set email body correctly, when ↵Sara Ting2012-10-051-0/+7
| |\ | | | | | | | | | emailing guests." into jb-mr1-dev
| | * Workaround Email bug that does not set email body correctly, when emailing ↵Sara Ting2012-10-051-0/+7
| | | | | | | | | | | | | | | | | | | | | guests. Bug:7289773 Change-Id: I11a455a42c1d0d592f10cc6f6ad370eb86e610e2
| * | am 4dcabc96: Added touch slop for horizontal scrollingMichael Chan2012-10-031-3/+8
| |\ \ | | |/ | |/| | | | | | | * commit '4dcabc96044eb83be2320e753fee9b1dc266ec32': Added touch slop for horizontal scrolling
| | * Added touch slop for horizontal scrollingMichael Chan2012-10-021-3/+8
| | | | | | | | | | | | | | | Bug: 7215879 Change-Id: I0339fe1c60067f2353ddfac84084a928cee8ca47
| * | am 6fb86969: Fixed NPE in SelectSyncedCalendarsMultiAccountMichael Chan2012-09-282-7/+5
| |\| | | | | | | | | | | | | * commit '6fb869698103a0f897537fa7f4ebabe714db9d37': Fixed NPE in SelectSyncedCalendarsMultiAccount
| | * Fixed NPE in SelectSyncedCalendarsMultiAccountMichael Chan2012-09-282-7/+5
| | | | | | | | | | | | | | | Bug: 7252078 Change-Id: If2334dde784e7763f9221b59797224d5783687da
| * | am 196bc3a5: Merge "Fixed NPE in matrixCursorFromCursor" into ↵Michael Chan2012-09-261-2/+6
| |\| | | | | | | | | | | | | | | | | | | ics-ub-calendar-aqua * commit '196bc3a5abc035171ce81537531fef776427f393': Fixed NPE in matrixCursorFromCursor
| | * Merge "Fixed NPE in matrixCursorFromCursor" into ics-ub-calendar-aquaMichael Chan2012-09-261-2/+6
| | |\
| | | * Fixed NPE in matrixCursorFromCursorMichael Chan2012-09-261-2/+6
| | | | | | | | | | | | | | | | | | | | Bug: 7239584 Change-Id: I587b63587d020622c008fb7580cd7a713292c50d
| | * | Merge "Readding the priority setting, which got accidentally removed in the ↵Michael Chan2012-09-241-0/+8
| | |\ \ | | | | | | | | | | | | | | | previous CL." into ics-ub-calendar-aqua
| | | * | Readding the priority setting, which got accidentally removed in the ↵Sara Ting2012-09-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previous CL. Bug:7188074 Change-Id: Iaa4f12b8663db3e7d41186e623d9c71f72b701f7
| * | | | resolved conflicts for merge of 87136abf to ics-ub-calendar-burgundySara Ting2012-09-241-36/+65
| |\| | | | | | | | | | | | | | | | | | Change-Id: I4fa4b3aafc9bde27be9a078690edb202196cc1b0
| | * | | Merge "ICS notifications fix: de-prioritize expired digest, and use the same ↵Sara Ting2012-09-241-41/+62
| | |\| | | | | |/ | | |/| | | | | custom view for all our notifications." into ics-ub-calendar-aqua
| | | * ICS notifications fix: de-prioritize expired digest, and use the same custom ↵Sara Ting2012-09-201-41/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | view for all our notifications. Bug:7188074,7185828 Change-Id: Ib70b8530532e314a8088cb207f8910f01d3f16ad
| * | | am 2e9eaec7: Merge "Allow "tel:" as phone prefix; more white space ↵Sam Blitzstein2012-09-191-2/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | leniency." into ics-ub-calendar-aqua * commit '2e9eaec7547043275df06f7993640ca81c8245d3': Allow "tel:" as phone prefix; more white space leniency.
| | * | Allow "tel:" as phone prefix; more white space leniency.Sam Blitzstein2012-09-191-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow phone numbers to be prefixed with "tel:" specifically, for URI-style. Also allow a second space in the number, between the 6th and 7th digits: E.g. 555 555 5555. Bug: 7178434 Change-Id: Idf6b61d0bb0da6d6329216d6e832bd26dc37ff2c
| * | | am 844cac06: Skip local account types when picking default calendar.Sara Ting2012-09-182-1/+7
| |\| | | | | | | | | | | | | | | | | | * commit '844cac068835d7d8a80ec118da8019535c0d7450': Skip local account types when picking default calendar.
| | * | Skip local account types when picking default calendar.Sara Ting2012-09-182-1/+7
| | |/ | | | | | | | | | | | | Bug:7148804 Change-Id: I491151840bc874a634c57f52d0dddf5d4a0fb922
| * | am 8286d2f7: Fix default calendar used when creating/editing event for the ↵Sara Ting2012-09-132-4/+13
| |\| | | | | | | | | | | | | | | | | | | first time. * commit '8286d2f75e9c808f022c8c6b7431f50e7f60372f': Fix default calendar used when creating/editing event for the first time.
| | * Fix default calendar used when creating/editing event for the first time.Sara Ting2012-09-132-4/+13
| | | | | | | | | | | | | | | Bug:7148804 Change-Id: I99bfd9008eb0ec7697d2b6a6136cd2e203c19d96
| * | am 2c0c7744: Merge "Fix emailing guests from event info page when attendees ↵Sara Ting2012-09-122-5/+26
| |\| | | | | | | | | | | | | | | | | | | aren\'t synced down (too many), by emailing only the organizer." into ics-ub-calendar-aqua * commit '2c0c77449c27f508143be195820f12a3af8136ad': Fix emailing guests from event info page when attendees aren't synced down (too many), by emailing only the organizer.
| | * Merge "Fix emailing guests from event info page when attendees aren't synced ↵Sara Ting2012-09-122-5/+26
| | |\ | | | | | | | | | | | | down (too many), by emailing only the organizer." into ics-ub-calendar-aqua
| | | * Fix emailing guests from event info page when attendees aren't synced down ↵Sara Ting2012-09-122-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (too many), by emailing only the organizer. Bug:7153946 Change-Id: I3633c474ce245e92436ee9287725c3cae7a0b6e4
| * | | am e472146a: Merge "Stored recently fired alerts in SharedPrefs so multiple ↵Sara Ting2012-09-112-5/+167
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | calendar apps can coexist without eating each other\'s alerts." into ics-ub-calendar-aqua * commit 'e472146a2a1fa8663455ef396ac23dfd19045f6a': Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other's alerts.
| | * | Merge "Stored recently fired alerts in SharedPrefs so multiple calendar apps ↵Sara Ting2012-09-113-6/+168
| | |\ \ | | | | | | | | | | | | | | | can coexist without eating each other's alerts." into ics-ub-calendar-aqua
| | | * | Stored recently fired alerts in SharedPrefs so multiple calendar apps can ↵Sara Ting2012-09-113-6/+168
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | coexist without eating each other's alerts. Bug:6750428 Change-Id: I790b4beea1f25c7ef94381a2fd151416e0f72343
| * | | am a498f6ed: Modify doScroll to move based on the average of the touch pointsMichael Chan2012-09-111-10/+42
| |\| | | | | | | | | | | | | | | | | | * commit 'a498f6ed3628bd36576949acd8e0afd71fca8b02': Modify doScroll to move based on the average of the touch points
| | * | Modify doScroll to move based on the average of the touch pointsMichael Chan2012-09-111-10/+42
| | | | | | | | | | | | | | | | Change-Id: Id23158a43910875953077244eb7086dd38a3f7c5
| | * | Fixed back-key bug in day/week view. DO NOT MERGESam Blitzstein2012-09-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed buy causing incorrect back-key result in day/week view. Bug occurred only after having modified date using date-picker. Bug: 7064660 Change-Id: Ie8b75358f5ca5541cdc8b8052bc2514c5f4392d1
| * | | Fixed bug causing incorrect result from pressing back-key while in day/week ↵Sam Blitzstein2012-09-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | view after having modified the date in the date picker. Bug: 7064660 Change-Id: Ie8b75358f5ca5541cdc8b8052bc2514c5f4392d1
| * | | resolved conflicts for merge of 013fda07 to ics-ub-calendar-burgundySara Ting2012-08-312-25/+22
| |\| | | | | | | | | | | | | | Change-Id: Ia398c0dc2d7eed35e9d1f172e23e0f5c38923be3
| | * | Merge "Removed use of notification framework's cancelAll so we don't affect ↵Sara Ting2012-08-312-25/+22
| | |\ \ | | | | | | | | | | | | | | | SyncAdapter's alerts." into ics-ub-calendar-aqua
| | | * | Removed use of notification framework's cancelAll so we don't affect ↵Sara Ting2012-08-312-25/+22
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | SyncAdapter's alerts. Bug:7076340 Change-Id: If4e864099850389cda6e0e5786560102bab9aed6
| * | | Fix NPE from snoozing.Sara Ting2012-08-301-1/+2
| | | | | | | | | | | | | | | | | | | | Bug:7088308 Change-Id: I47e22011d1ecbf7e9ba85a7d0896c15470912a39
| * | | am 2b965215: Fixed ClassCastException in agenda viewMichael Chan2012-08-291-3/+3
| |\| | | | | | | | | | | | | | | | | | * commit '2b965215c52d8632951ccd126431195d529d39cd': Fixed ClassCastException in agenda view
| | * | Fixed ClassCastException in agenda viewMichael Chan2012-08-291-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 6738700 Change-Id: I0e6f8fbe56b2e021e49fdf5ad53e6ecd72125566
| * | | am f565bc11: Save version to shared prefs upon startup.Sara Ting2012-08-282-0/+6
| |\| | | | | | | | | | | | | | | | | | * commit 'f565bc11cf22e639c01ad5b9a6129e707991eb4e': Save version to shared prefs upon startup.
| | * | Save version to shared prefs upon startup.Sara Ting2012-08-282-0/+6
| | |/ | | | | | | | | | Change-Id: Id394cb7c78c373acd3b5a9aaae43e50f64767383
| * | am fa1149d1: Merge "Adding util method to get release version." into ↵Sara Ting2012-08-231-0/+18
| |\| | | | | | | | | | | | | | | | | | | ics-ub-calendar-aqua * commit 'fa1149d14cc5078af069b7c408f42200dc8b2889': Adding util method to get release version.
| | * Merge "Adding util method to get release version." into ics-ub-calendar-aquaSara Ting2012-08-231-0/+18
| | |\
| | | * Adding util method to get release version.Sara Ting2012-08-211-0/+18
| | | | | | | | | | | | | | | | Change-Id: I7b2f7ad1d179135aab211dabce5e64dcbe924f1b
| * | | am ea6cc9a6: Merge "Switch from switch to if-else to be compatible with the ↵Michael Chan2012-08-226-149/+129
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | new ADT" into ics-ub-calendar-aqua * commit 'ea6cc9a63ac8a7c7389dfa065c9af51619547a8b': Switch from switch to if-else to be compatible with the new ADT
| | * | Switch from switch to if-else to be compatible with the new ADTMichael Chan2012-08-176-149/+129
| | |/ | | | | | | | | | Change-Id: Idd1d803d3edc1eb0294a63480731b5d28a65c4e8
| * | Merge "Add autocompletion for title in edit-event." into ↵Sara Ting2012-08-141-2/+132
| |\ \ | | | | | | | | | | | | ics-ub-calendar-burgundy
| | * | Add autocompletion for title in edit-event.Sara Ting2012-08-131-2/+132
| | |/ | | | | | | | | | | | | | | | | | | Suggestions are existing event titles. Most recently inputted titles get priority. Bug: 6651978 Change-Id: Ic138d78a80a96c500fb04b91de65bde6544e25d2
| * / Notifications: made alarm scheduling testable, and a couple minor fixes.Sara Ting2012-08-105-61/+79
| |/ | | | | | | | | | | | | | | | | - Added tests for scheduling next notification refresh time - Fixed priority of single expired event notifications (fixed from DEFAULT to MIN) - Fixed automatic demoting of allday events (refresh time wasn't correct) Bug:6282451 Change-Id: I160736827fc0b1017e2d001cb0fdb8f7d0502339
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 22:09:49 +0000