Merge lp:~mterry/telephony-service/notification-timeout into lp:telephony-service

Proposed by Michael Terry on 2015-08-06
Status: Needs review
Proposed branch: lp:~mterry/telephony-service/notification-timeout
Merge into: lp:telephony-service
Diff against target: 11 lines (+1/-1)
1 file modified
indicator/textchannelobserver.cpp (+1/-1)
To merge this branch: bzr merge lp:~mterry/telephony-service/notification-timeout
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-08-06
Ubuntu Phablet Team 2015-08-06 Pending
Review via email: mp+267196@code.launchpad.net

Commit message

Use the NOTIFICATION reason when asking Unity System Compositor to wake up the screen for an MMS. This means the screen will only be on 15s instead of 60s.

This is a follow-on from USC adding support for the NOTIFICATION reason [1]. We don't need to bump our dependency version since USC will treat unknown reasons as normal reasons (from my look through the code).

[1] https://code.launchpad.net/~afrantzis/unity-system-compositor/notification-timeouts/+merge/264853

Description of the change

Use the NOTIFICATION reason when asking Unity System Compositor to wake up the screen for an MMS. This means the screen will only be on 15s instead of 60s.

This is a follow-on from USC adding support for the NOTIFICATION reason [1]. We don't need to bump our dependency version since USC will treat unknown reasons as normal reasons (from my look through the code).

[1] https://code.launchpad.net/~afrantzis/unity-system-compositor/notification-timeouts/+merge/264853

Unmerged revisions

1110. By Michael Terry on 2015-08-06

Use NOTIFICATION reason when turning screen on for an mms or other telepathy message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'indicator/textchannelobserver.cpp'
2--- indicator/textchannelobserver.cpp 2015-06-11 16:38:02 +0000
3+++ indicator/textchannelobserver.cpp 2015-08-06 14:04:51 +0000
4@@ -406,7 +406,7 @@
5 QDBusConnection::systemBus());
6 QList<QVariant> args;
7 args.append("on");
8- args.append(0);
9+ args.append(4); // NOTIFICATION
10 unityIface.callWithArgumentList(QDBus::NoBlock, "setScreenPowerMode", args);
11 }
12

Subscribers

People subscribed via source and target branches