Merge lp:~vthompson/ubuntu-clock-app/fix-1366586 into lp:ubuntu-clock-app

[Victor Thompson]

Categorize Alarm sound

Media-hub allows categorization of the Audio or MediaPlayer component's sound stream. This allows the system to determine if any sound stream with the categorization of "multimedia", like the music app, needs to be paused while the new stream is playing.

The effect of this change is that the original sound stream (say the music app) is made quiet while the alarm is playing and resumes to normal volume once the alarm preview has stopped.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:93
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~vthompson/ubuntu-clock-app/fix-1366586/+merge/233921/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/454/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/263
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/263/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/101

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/454/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

code looks good. I just need to test this on the device.

[Nekhelesh Ramananthan (nik90)]

tested and works as expected! thnx for the patch.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2014-08-25 09:59:19 +0000
+++ app/alarm/AlarmSound.qml	2014-09-09 13:13:45 +0000
@@ -46,6 +46,7 @@
 
     Audio {
         id: previewAlarmSound
+        audioRole: MediaPlayer.alert
     }
 
     Flickable {