ubuntu-system-settings

Merge lp://staging/~ken-vandine/ubuntu-system-settings/dim-timeout-1437510 into lp://staging/ubuntu-system-settings

  1. dim-timeout-1437510
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 1389
Merged at revision: 1422
Proposed branch: lp://staging/~ken-vandine/ubuntu-system-settings/dim-timeout-1437510
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 63 lines (+18/-1)
2 files modified
plugins/battery/SleepValues.qml (+5/-1)
tests/autopilot/ubuntu_system_settings/tests/test_security.py (+13/-0)
To merge this branch: bzr merge lp://staging/~ken-vandine/ubuntu-system-settings/dim-timeout-1437510
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+256685@code.staging.launchpad.net

Commit message

Ensure dim-timeout is 10 seconds less than activity-timeout

Description of the change

Ensure dim-timeout is 10 seconds less than activity-timeout

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1389
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2065/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2316
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2316/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19762

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2065/rebuild

review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks Ken, that looks fine as a workaround, as you wrote on the bug ideally the system would do that for us. Not sure about the minimum value, we could just ensure it's > 10 as well, but I don't think it really makes a difference either way

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches