History log of /packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
137031dd7ff3f2dae9442916d1635f8483b12f53 18-Jun-2013 Paul Sliwowski <psliwowski@google.com> Add in-memory cache to dismiss alerts that we haven't seen yet.

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
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
e8084134fbbc5fa76182e6598855820a87ac4511 19-Apr-2013 Michael Chan <mchan@android.com> am 1851ecb4: Do not use backed up ringtone values

* commit '1851ecb450bbfa40ef375a914d1c31c793684894':
Do not use backed up ringtone values
1851ecb450bbfa40ef375a914d1c31c793684894 19-Apr-2013 Michael Chan <mchan@android.com> Do not use backed up ringtone values

Ringtone uri is device specific so it should not be backed up.
Restored value should not be used.

Bug: 8633937
Change-Id: Ia0cd442635169f58455637b27057d74f99e0d671
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
001bb62200e2d8dbe738c3d85d9c23d5c4aea50a 18-Apr-2013 Sam Blitzstein <sblitz@google.com> am 2e760f90: Use default ringtone if nothing is found in preference.

* commit '2e760f909aac60f9db66bb293377f8fabad08e51':
Use default ringtone if nothing is found in preference.
2e760f909aac60f9db66bb293377f8fabad08e51 18-Apr-2013 Sam Blitzstein <sblitz@google.com> Use default ringtone if nothing is found in preference.

Bug: 8655634
Change-Id: I2fbab40b912996331b5eac77d8c918998a66e25b
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
fec5bff4f2d3c50bc7d644b21acca37f320358e0 28-Mar-2013 Chris Wren <cwren@android.com> add global dismiss to calendar, open source part

Change-Id: If179adc814a1da977712c9dc804e81a2cc726bce
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
1bc7c4b149a3696dca055a3d7a45499851e55d50 26-Feb-2013 Sam Blitzstein <sblitz@google.com> Refactored strings for experimental reminder setting.

String was too long for setting of skipping reminders for events
that have not been responded to. Reformatted the setting from
checkbox into radio selection with more consice description.

Change-Id: Ic6a689648529212d3ae16359e5386ba0c0f4e587
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
0dfbaae6a1c083f9c76ad77a9b711420968672a4 14-Feb-2013 Sam Blitzstein <sblitz@google.com> Adding in experimental reminder setting.

Added setting to the experimental preferences to allow for reminder
notifications to only be issued for events to which you've responded
yes or maybe.
Additionally added experimental setting to allow for setting up
quiet hours, during which notifications will not make noise.

To access the experimental preferences, search your events for
"tardis", and then go into settings within the next 60 seconds.

Bug: 2493447
Bug: 2225570
Change-Id: I0a7cc06d2240e6ddbe36724fb079dfc8dd8ee8e7
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
9a9545d913bf968c7ccb77ad63fe49ccd6ac4948 03-Jan-2013 Sam Blitzstein <sblitz@google.com> Do not show LED for the notification of expired events.

Bug: 7941944
Change-Id: I1fa831ebd92f9c279fb17b50bd84867f54cbc5df
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
6d22e54ead985d9b8fba669e7a744e3805d3b610 04-Dec-2012 Sara Ting <sarating@google.com> Add delay after provider-changed event when refreshing notifications.

Bug:7652098
Change-Id: I1a0634b62b0a62f2b6ce2152a73a1bae8109ce44
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
ba8892447d10fdefc3bbc05dd89d9bbef269693a 27-Nov-2012 Sara Ting <sarating@google.com> Remove experimental path that forced some beta testers into the backup notification scheduling.

Bug:7383861
Change-Id: I2093c5f6eb6685f768db096212290bc20709f72f
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
0b674bef73eac24a4c41cfd5af8be516f4936844 20-Nov-2012 Michael Chan <mchan@android.com> Remove vibrate-on-silent-mode per UX (7458593)

Show current ringtone (6265196)

Bug: 6265196
Bug: 7458593
Change-Id: I847846154f0b3fefd69eec9a6992150e574a8074
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
f9d0e0438ac55b191936190730b66f5998481544 16-Nov-2012 Sara Ting <sarating@google.com> Merge "Adding alert scheduling to app, to allow unbundled app's alerts to work on more devices." into ics-ub-calendar-burgundy
3a07a68da6460c36a5dbec5b8828baa4355dbe04 31-Oct-2012 Sara Ting <sarating@google.com> Adding alert scheduling to app, to allow unbundled app's alerts to work on more devices.

Bug:7383861
Change-Id: I5dcffb8ac586966b21e938728be0393e6776f704
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
ad83b9aa618d52952f98bf8d7ec876140e7fb404 07-Nov-2012 Sam Blitzstein <sblitz@google.com> Allow LED indicator to show for notifications.

Bug: 7316908
Change-Id: I77ea9054082fc93b42c35915f3e00465fda8a6ac
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
5f67f476e37d2e58b45c9dd2439ff02d6cc66b68 25-Oct-2012 Sara Ting <sarating@google.com> am daafbe94: Merge "Minimize chance of race condition bug that misses alarms by clearing/rescheduling alarms." into ics-ub-calendar-aqua

* commit 'daafbe94f4455afe25eb862ab80c1af72a1695bb':
Minimize chance of race condition bug that misses alarms by clearing/rescheduling alarms.
708745373284ae3e816fad16554ecb95574b5ef3 18-Oct-2012 Sara Ting <sarating@google.com> Minimize chance of race condition bug that misses alarms by clearing/rescheduling alarms.

This was properly fixed in the provider but this tries to minimize the bug until that fix is rolled out everywhere.

Bug:7221716
Change-Id: I4cb32b48caf31c8372770b74d7983e54480b755a
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
c4a5fab28fcc7c3e9b2bc7cee379d2cd8a42fc9b 12-Sep-2012 Sara Ting <sarating@google.com> am e472146a: Merge "Stored recently fired alerts in SharedPrefs so multiple 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.
e472146a2a1fa8663455ef396ac23dfd19045f6a 12-Sep-2012 Sara Ting <sarating@google.com> Merge "Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other's alerts." into ics-ub-calendar-aqua
d1fa3c0e0a8f45538c867c4f56bb629e1219ed23 31-Aug-2012 Sara Ting <sarating@google.com> Stored recently fired alerts in SharedPrefs so multiple calendar apps can coexist without eating each other's alerts.

Bug:6750428
Change-Id: I790b4beea1f25c7ef94381a2fd151416e0f72343
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
7a2de3d0ba146217e19d8dba74ff82000b0e676f 01-Sep-2012 Sara Ting <sarating@google.com> resolved conflicts for merge of 013fda07 to ics-ub-calendar-burgundy

Change-Id: Ia398c0dc2d7eed35e9d1f172e23e0f5c38923be3
948c590ced6854d2fbe9dc765db4ae8d63646664 31-Aug-2012 Sara Ting <sarating@google.com> Removed use of notification framework's cancelAll so we don't affect SyncAdapter's alerts.

Bug:7076340
Change-Id: If4e864099850389cda6e0e5786560102bab9aed6
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
487d52c2789114e0ee3e7ce85694611b8d59dd70 25-May-2012 Sara Ting <sarating@google.com> Notifications: made alarm scheduling testable, and a couple minor fixes.

- 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
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
b5a2a61208857805cc053c6ac476d30100289279 23-May-2012 Sara Ting <sarating@google.com> Only fetch vibrate pref once per group of alerts.

Change-Id: Ic7f3f065c6d5aaa221eba4cd91341d5b25e53455
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
bce26a2a19499790595e48ca36b43eb130e4a3fb 18-May-2012 Sara Ting <sarating@google.com> Notifications: adding more tests.

Also fixed one minor issue where with recurring allday events, we didn't pick the next day's one 15 min into today.

Change-Id: Id9ef504e52d9f4ab0fa2eea09bc7404b8994238f
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
21af116207d5728a312e534b898933bb07f96292 17-May-2012 Sara Ting <sarating@google.com> Notification tests for rebalancing priority buckets.

Change-Id: I3f6e1a1a52de70304fa4a9d49d0f2c4e3e535a3a
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
25b09db869f377b131052447f62ad02e2505cd87 16-May-2012 Michael Chan <chanm@google.com> Add tests for notification

Bug: 6282451
Change-Id: I53816be140f9f331cf84cd4ebb4c5d0d535df645
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
52a36f23d90cd1e95ba3ffd9657c7bfa974443d9 16-May-2012 Sara Ting <sarating@google.com> AlertReceiver now listens to PROVIDER_CHANGED so event changes will refresh the notification bar.

Bug: 6282451
Change-Id: I16cde055c1f7a522d571da06d1fc711f9d3ea80d
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
62d3b564f193615395617fd193b6b8487ba8cf0f 16-May-2012 Sara Ting <sarating@google.com> Fixing notification priority buckets for all day events.

Bug:6282451
Change-Id: I5ff2aaca09065182d254fe1999033de3b810ffc6
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
bb57710243ba4ac813b1795d9dbbdb90d40d1f6f 12-May-2012 Sara Ting <sarating@google.com> Change notification ID mapping to an arbitrary assignment from 1 to max notifications, to solve problem of dangling notifications.

Bug:6282451
Change-Id: Ida6b053ea6b9542a024f7883a3198a44872fd4f8
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
e48ff1a949943d62bf4d8fe92a6cc95774218aeb 16-May-2012 Sara Ting <sarating@google.com> Further changes to individual notifications.

Fix so only new alerts show the ticker. Notifications stay high priority until 15 min in or 1/4 the event duration. All day events changed to medium priority.

Bug:6495096
Change-Id: I4454171e94c0fb278148da85ec3603ff0d8853ed
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
806d003fc19abc05d4b8435393f2b0d1ef52e232 12-May-2012 Sara Ting <sarating@google.com> Fix so single expired event dismisses when tapped.

Bug:6480075
Change-Id: Ib5c55b13a6deb8e10d43e5b737755c42b11f4fd1
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
d6ebaac35c16bf127e500d342ef0cbe619ac29fd 11-May-2012 Sara Ting <sarating@google.com> Added more logging and moved the prefs fetching code into a separate class.

Bug:6282451
Change-Id: I9dcf42cc2629b50c088f32c1d76f1596ee30dec2
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
7e4c339fb171f542ff8d5d4916c649f9597aa926 11-May-2012 Sara Ting <sarating@google.com> Only play notification ringer once per group of alerts.

Bug:6282451
Change-Id: I5be9d9c69349f999db5e4d8085c972b685ea1319
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
d8abe4ec4f0dd7f4edf9e9ab31766bab85cdf9bd 10-May-2012 Sara Ting <sarating@google.com> Order the high priority events by ascending start time. Order older concurrent events by descending start time.

Bug:6282451
Change-Id: I7a1a65501caed56e019c82e3ec17138d0cba2ad0
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
8748724e382ca014067a3ceb5ff4eacbd9c4021a 10-May-2012 Sara Ting <sarating@google.com> Using MIN priority does not collapse the notification by default so make expired digest notification a basic one for now, instead of InboxStyle.

Bug:6282451
Change-Id: Ic979d940f88b22e6005d24eddf77dc86866e9e00
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
76180232681f9a3091fda763e364ee2e40765c9b 10-May-2012 Sara Ting <sarating@google.com> Just split up updateAlertNotification(); it was getting too long.

Change-Id: I9729956a3f2083600d9e61a6021ebaec6048ac27
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
60edea82999b3a4d9a2c29d04c7ea611c86f4b78 09-May-2012 Sara Ting <sarating@google.com> Fix snoozing from notification, and have notifications change state as the event starts/ends.

For example, as an event ends, its notification will move into the expired digest one.

Bug:6282451
Change-Id: I81842d21f3f7b79e8aa4959164be14860cab6fe2
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
57dd943e5598d4778698d3c94a112f124aa7c0d1 08-May-2012 Sara Ting <sarating@google.com> Notification fixes: fix duplicate notifications, and reverse digest ordering.

Changed notification hash ID to use eventId & startTime instead of alertId to avoid multiple notifications for the same event. And reversed the digest order so newer events appear first.

Bug:6282451
Change-Id: I8cf4c4b4af1a5692a26bd4550f7cbfac05c69da0
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
42ba5efed5945b0e96735ec9ca4b388ae35b56f7 04-May-2012 Sara Ting <sarating@google.com> Fancy notifications: future and concurrent alerts are now individual expandable notifications, with expired ones being in the digest.

Bug: 6282451

Change-Id: I8ebe72fe1cbd41448c4ff3a0b9043bd1a179ff00
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
4e9544570d6df4cf4e8ae2f3ca9ff47b84bf899d 28-Apr-2012 Sara Ting <sarating@google.com> Use expanded digest notification for multiple alerts.

Bug: 6282451
Change-Id: I17b0df15ac1068d0af2fc9123aecaa716130ceff
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
9881907c47b2658fa85954bfb339c4b1eab9fc8e 02-Mar-2012 Isaac Katzenelson <isaack@android.com> Support notification one click to view event and snoozing

Bug: 5934678 Alert - Avoid notification list if there's only one notification. Go straight to event details.
Change-Id: I5251888acc417aa4c12f9408c82f24cdf93a6ccf
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
f58faf32bbce943eb4791cef2ad6c327e3724cc7 14-Feb-2012 Michael Chan <chanm@google.com> Enable logging for notifications

Change-Id: If8a1538ee5dda1a3ac2fb407d0ffb88874707a22
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
43ffa461b738692925a94c005c90ff60757455a7 01-Nov-2011 RoboErik <epastern@google.com> b/5532157 Treat notifications correctly based on setting

If notifications are turned off we should dismiss our notifications.
If notifications are turned on we should clear all unhandled
notifications that have already ended.
If notifications are off when we get an update we shouldn't do
anything with it.

Change-Id: I7eade163cc30b9ded7649f07af102cdc3bfa6c34
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
fa292a0db2a6f04255c75a57908b17ba48a96183 30-Jun-2011 RoboErik <epastern@google.com> API comment updates

Change-Id: I811289804f84ec0afefaee290d48bb4d57c53ec7
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
a27a886892fe3ec5edbc63c0b58e0a988623011a 24-Jun-2011 RoboErik <epastern@google.com> api comment fixes

Change-Id: I711673a21a5314cd3ddf374fd764bda79cb0c6da
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
a7c0390d9c5dd4ff730de505682687fae5f5ced0 14-Jun-2011 RoboErik <epastern@google.com> Rename Calendar.java to CalendarContract.java

Change-Id: Ia6692454099322f6891b326b2c1ad919c13026b7
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
3dd7e40b48c91913b02cab6b06ce5a07a9654709 11-Feb-2011 Michael Chan <mchan@android.com> b/3431141 Fixed the problem where secondary alerts are quiet

This affects all events with multiple alerts.
Only the first one makes a sound.
The ones after that fire silently without vibration.

Change-Id: I10b1cb56fbd5aafd0cbdaea8c3009c50583c2046
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
7321a0630aca3e5093d12f0e4f55da77620f53ed 21-Jan-2011 Michael Chan <mchan@android.com> b/3355202 New look for calendar notifications
b/3258583 ... with start time.
b/3379034 Expand touch target of alerts to the full width of the listview

Change-Id: I0958b4c433edbd2d497d41d7200758b9e2cefb3f
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
434a9393da9b86bc7327d2075f6a09491c8b128d 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of d73aa540 to master

Change-Id: I3b223e66be473b1597337a2774edb103cacc957b
4b441bd6544fe6d11be75f974a41afd8fa040a4f 16-Sep-2010 Daisuke Miyakawa <dmiyakawa@google.com> Make settings screen support two pane mode.

1) Rename CalendarPreferenceActivity to GeneralPreferences, and
add CalendarSettingsActivity for top-level Activity.

We should retain previous logs for CalendarPreferenceActivity,
and we shouldn't call it "Activity" any more, as it is Fragment.

I'm not sure whether the new "CalendarSettingsActivity" should
be named so, or renaming it to "CalendarPreferenceActivity"
to keep consistency around naming.

2) Add necessary xmls.

Some of them are derived from Settings app, which already has
new two pane structure, so refering its logic seems enough for now.

Change-Id: I6a0b04bb824d06c2842cbd8127e2860c45350987
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java
23e7da3eacee7bceb105cdfc7b5329c7a43846d5 28-Jul-2010 Mason Tang <masontang@google.com> Moved alerts-related classes into a separate package

Change-Id: I2022efdbae9ceba6e6a0df35ade151c779cc8df7
/packages/apps/Calendar/src/com/android/calendar/alerts/AlertService.java