Merge lp:~afrantzis/unity8/power-state-change-reason-snap-decision into lp:unity8

[Alexandros Frantzis]

Use power state change reason SnapDecision to turn screen on when a SnapDecision arrives

Using this value allows USC to handle proximity correctly for snap decision prompts.

* Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~afrantzis/unity-system-compositor/voice-call-proximity/+merge/272744

but this MP can be built and run without the USC changes fine, we just won't get the improved proximity handling.

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

n/a

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1988
http://jenkins.qa.ubuntu.com/job/unity8-ci/6381/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/758
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/411
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/988
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/620
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/621
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3590
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4411
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23763
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/758
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/758/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23764

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6381/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

What about the "call_done" enum value that you introduced in https://code.launchpad.net/~afrantzis/unity-system-compositor/voice-call-proximity/+merge/272744? Shouldn't this be added here as well to avoid future breakage?

Otherwise the change looks good to me

review: Needs Information

[Alexandros Frantzis (afrantzis)]

Unity8 doesn't need to know about this value (at the moment), but I have no problem adding it if it's preferred to have fully synced enumerations.

[Lukáš Tinkl (lukas-kde)]

I would personally prefer these values to stay in sync

[lp:~afrantzis/unity8/power-state-change-reason-snap-decision]

1989. By Alexandros Frantzis on 2015-09-30

Add power state change reason "CallDone" for enum completeness

[Alexandros Frantzis (afrantzis)]

> I would personally prefer these values to stay in sync

Fixed.

[Lukáš Tinkl (lukas-kde)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1989
http://jenkins.qa.ubuntu.com/job/unity8-ci/6388/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4431
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/766
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/996
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4428
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23799
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/766
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/766/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23798

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6388/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1989
http://jenkins.qa.ubuntu.com/job/unity8-ci/6398/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4458
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1006
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4455
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4455/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23857
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/777
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/777/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23859

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6398/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Powerd/Powerd.h'
--- plugins/Powerd/Powerd.h	2015-08-10 22:29:28 +0000
+++ plugins/Powerd/Powerd.h	2015-09-30 12:23:25 +0000
@@ -38,6 +38,8 @@
         PowerKey        = 2, // Display changed state due to user pressing power key
         Proximity       = 3, // Display changed state due to proximity events
         Notification    = 4, // Display changed state due to user notification
+        SnapDecision    = 5, // Display changed state due to snap decision prompt
+        CallDone        = 6, // Display changed state due to voice call end
     };
 
     enum Status {

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2015-09-23 11:16:10 +0000
+++ qml/Notifications/Notification.qml	2015-09-30 12:23:25 +0000
@@ -90,7 +90,7 @@
         // Turn on screen as needed (Powerd.Notification means the screen
         // stays on for a shorter amount of time)
         if (type == Notification.SnapDecision) {
-            Powerd.setStatus(Powerd.On, Powerd.Unknown);
+            Powerd.setStatus(Powerd.On, Powerd.SnapDecision);
         } else if (type != Notification.Confirmation) {
             Powerd.setStatus(Powerd.On, Powerd.Notification);
         }