Merge lp:~charlesk/indicator-datetime/rtm-14.09-lp-1410874-alarm-sounds-vs-calendar-sounds into lp:indicator-datetime/rtm-14.09
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Pat McGowan | ||||
Approved revision: | 394 | ||||
Merged at revision: | 393 | ||||
Proposed branch: | lp:~charlesk/indicator-datetime/rtm-14.09-lp-1410874-alarm-sounds-vs-calendar-sounds | ||||
Merge into: | lp:indicator-datetime/rtm-14.09 | ||||
Diff against target: |
281 lines (+128/-14) 6 files modified
include/notifications/sound.h (+1/-1) src/CMakeLists.txt (+3/-0) src/com.ubuntu.touch.AccountsService.Sound.xml (+42/-0) src/snap.cpp (+57/-6) src/sound.cpp (+12/-7) tests/manual (+13/-0) |
||||
To merge this branch: | bzr merge lp:~charlesk/indicator-datetime/rtm-14.09-lp-1410874-alarm-sounds-vs-calendar-sounds | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Antti Kaijanmäki (community) | Approve | ||
Review via email: mp+247229@code.launchpad.net |
Commit message
Don't play calendar alarm sounds if Silent Mode is enabled. Use the alarm sound role for both clock and calendar alarms.
Description of the change
== Change Description
1. Unconditionally set the alarm role for sounds played from indicator-datetime, whether they're clock alarms or calendar event alarms
2. Don't play calendar event alarms if AccountServices
== Checklist
> Are there any related MPs required for this MP to build/function as expected? Please list.
No prerequisites
> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)
Yes
> Did the code build without warnings?
Yes
> Did the tests run successfully?
Yes
> Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
> What device (or emulator) has your component test plan been executed successfully on?
Krillin 14.10 r198
> What manual tests are relevant for this MP?
indicator-
> Did you include a link to the MR Review Checklist Template to make your reviewer's life easier?
https:/
LGTM.