Merge lp://qastaging/~albaguirre/unity-system-compositor/fix-1483127 into lp://qastaging/unity-system-compositor
Proposed by
Alberto Aguirre
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alexandros Frantzis | ||||
Approved revision: | 245 | ||||
Merged at revision: | 246 | ||||
Proposed branch: | lp://qastaging/~albaguirre/unity-system-compositor/fix-1483127 | ||||
Merge into: | lp://qastaging/unity-system-compositor | ||||
Diff against target: |
128 lines (+60/-8) 2 files modified
src/mir_screen.cpp (+7/-3) tests/unit-tests/test_mir_screen.cpp (+53/-5) |
||||
To merge this branch: | bzr merge lp://qastaging/~albaguirre/unity-system-compositor/fix-1483127 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandros Frantzis (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+268819@code.qastaging.launchpad.net |
Commit message
Allow proximity to turn on screen.
Allow proximity events to turn on screen only if the power key has not turned off the screen. A user may be on a call that is longer that the screen timeout but at the end of the call a far proximity event should still be able to turn the screen on.
Description of the change
Allow proximity to turn on screen.
Allow proximity events to turn on screen only if the power key has not turned off the screen. A user may be on a call that is longer that the screen timeout but at the end of the call a far proximity event should still be able to turn the screen on.
To post a comment you must log in.
PASSED: Continuous integration, rev:245 jenkins. qa.ubuntu. com/job/ unity-system- compositor- ci/265/ jenkins. qa.ubuntu. com/job/ unity-system- compositor- wily-amd64- ci/53 jenkins. qa.ubuntu. com/job/ unity-system- compositor- wily-armhf- ci/53 jenkins. qa.ubuntu. com/job/ unity-system- compositor- wily-armhf- ci/53/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-system- compositor- wily-i386- ci/53
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- system- compositor- ci/265/ rebuild
http://