Merge lp:~mterry/unity8/display-proximity into lp:unity8
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Michał Sawicz | ||||
Approved revision: | 229 | ||||
Merged at revision: | 233 | ||||
Proposed branch: | lp:~mterry/unity8/display-proximity | ||||
Merge into: | lp:unity8 | ||||
Diff against target: |
128 lines (+44/-11) 5 files modified
Shell.qml (+5/-3) plugins/Powerd/Powerd.cpp (+2/-2) plugins/Powerd/Powerd.h (+15/-1) tests/mocks/Powerd/Powerd.h (+15/-2) tests/qmltests/tst_Shell.qml (+7/-3) |
||||
To merge this branch: | bzr merge lp:~mterry/unity8/display-proximity | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michał Sawicz | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Listen to display-
Description of the change
Listen to display-
We don't need to listen to power changes. The experience we really care about is whether the user sees the screen go black. That's when we want to turn on the greeter and unfocus apps. Plus, this gives us access to the flags that powerd sends with a display-
When proximity is on, we don't want to show the greeter. Because the user likely has the phone up to their ear for a call and want to resume what they were doing after pulling away from the ear.
FAILED: Continuous integration, rev:223 jenkins. qa.ubuntu. com/job/ unity8- ci/697/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- saucy/2421 jenkins. qa.ubuntu. com/job/ generic- mediumtests- touch/99 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- saucy/1188 jenkins. qa.ubuntu. com/job/ unity8- saucy-armhf- ci/698 jenkins. qa.ubuntu. com/job/ unity8- saucy-armhf- ci/698/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity8- saucy-i386- ci/697 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy/2427 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy/2427/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- saucy/2055 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-armhf/ 101 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-armhf/ 101/artifact/ work/output/ *zip*/output. zip s-jenkins: 8080/job/ generic- mediumtests- runner- maguro/ 94 s-jenkins: 8080/job/ generic- mediumtests- runner- mako/90
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ unity8- ci/697/ rebuild
http://