Merge lp:~tiagosh/telephony-service/vibrate_silent_mode into lp:telephony-service

[Tiago Salem Herrmann]

- Reduce vibration duration for text messages
- Fix vibration in silent mode options for calls/messages

- Reduce vibration duration for text messages
- Fix vibration in silent mode options for calls/messages

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:878
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/97

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/280/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'libtelephonyservice/greetercontacts.cpp'
--- libtelephonyservice/greetercontacts.cpp	2014-07-07 19:18:18 +0000
+++ libtelephonyservice/greetercontacts.cpp	2014-08-12 03:26:54 +0000
@@ -151,8 +151,8 @@
 
 bool GreeterContacts::incomingCallVibrate()
 {
-    if (silentMode() && getUserValue("com.ubuntu.touch.AccountsService.Sound", "IncomingCallVibrateSilentMode").toBool()) {
-        return true;
+    if (silentMode()) {
+        return getUserValue("com.ubuntu.touch.AccountsService.Sound", "IncomingCallVibrateSilentMode").toBool();
     }
     if (!mIncomingCallVibrate.isValid()) {
         mIncomingCallVibrate = getUserValue("com.ubuntu.touch.AccountsService.Sound", "IncomingCallVibrate");
@@ -162,8 +162,8 @@
 
 bool GreeterContacts::incomingMessageVibrate()
 {
-    if (silentMode() && getUserValue("com.ubuntu.touch.AccountsService.Sound", "IncomingMessageVibrateSilentMode").toBool()) {
-        return true;
+    if (silentMode()) {
+        return getUserValue("com.ubuntu.touch.AccountsService.Sound", "IncomingMessageVibrateSilentMode").toBool();
     }
     if (!mIncomingMessageVibrate.isValid()) {
         mIncomingMessageVibrate = getUserValue("com.ubuntu.touch.AccountsService.Sound", "IncomingMessageVibrate");

=== modified file 'libtelephonyservice/ringtone.cpp'
--- libtelephonyservice/ringtone.cpp	2014-07-07 19:18:18 +0000
+++ libtelephonyservice/ringtone.cpp	2014-08-12 03:26:54 +0000
@@ -29,7 +29,7 @@
     mCallAudioPlaylist.setPlaybackMode(QMediaPlaylist::Loop);
     mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(GreeterContacts::instance()->incomingCallSound()));
     mCallAudioPlaylist.setCurrentIndex(0);
-    mVibrateEffect.setDuration(1000);
+    mVibrateEffect.setDuration(500);
 }
 
 void RingtoneWorker::playIncomingCallSound()