Merge lp:~nik90/ubuntu-clock-app/update-default-alarm-sound into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Changed default alarm sound to "Alarm clock"

Changed default alarm sound to "Alarm clock".

Please do note that this sound file will not land in Ubuntu Vivid. It will be part of the stable phone images from OTA-6. So when testing on vivid desktop, expect the alarm sound to be invalid as it won't be present in the /usr/share/sounds/ubuntu/ringtones folder.

If clock app update lands before OTA-6, that's fine since indicator-datetime will automatically play the next available alarm sound (Suru Arpeggio).

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

PASSED: Continuous integration, rev:333
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/749/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/94

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

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

I tested it on my BQ E4.5 phone with new alarm sound, and it is not ringing.

Only vibration is working.
So this changes is not backward compatible.

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/update-default-alarm-sound]

334. By Nekhelesh Ramananthan on 2015-08-13

Merged lp:ubuntu-clock-app

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

PASSED: Continuous integration, rev:334
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/750/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/95

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

> I tested it on my BQ E4.5 phone with new alarm sound, and it is not ringing.
>
> Only vibration is working.
> So this changes is not backward compatible.

I just tested this on my Nexus 4 running the latest image (not stable) and when I tried an invalid sound, it just defaults to "Suru arpgeggio" sound when the alarm rings. Not sure why yours didnt ring. Can you try again with clock app from trunk and this branch?

[Bartosz Kosiorek (gang65)]

It is working for me correctly. Previously I have volume of alarm tone set to low, which was causing these problems.

review: Approve

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2015-06-03 22:49:29 +0000
+++ app/alarm/EditAlarmPage.qml	2015-08-13 17:00:34 +0000
@@ -207,7 +207,7 @@
                   When folder model is completely loaded, proceed to perform
                   the following operations,
 
-                  if new alarm, then set the sound name as "Suru arpeggio" and
+                  if new alarm, then set the sound name as "Alarm clock" and
                   retrieve the sound path from the folder model to assign to
                   the alarm model sound property.
 
@@ -298,7 +298,7 @@
             objectName: "alarmSound"
 
             // Default Alarm Sound for new alarms
-            property string _soundName: "Suru arpeggio"
+            property string _soundName: "Alarm clock"
 
             text: i18n.tr("Sound")
             onClicked: pageStack.push(Qt.resolvedUrl("AlarmSound.qml"), {

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-12 21:01:20 +0000
+++ debian/changelog	2015-08-13 17:00:34 +0000
@@ -9,6 +9,7 @@
   * Fixed the confusing behavior of the confirmation button (LP: #1408015)
   * Added README.mergeproposal checklist to help with the review process.
   * Fix alarm interval information being inconsistent (LP: #1466000)
+  * Changed default alarm sound (LP: #1354370)
 
   [Victor Thompson]
   * Show all README files in QtCreator