Merge lp://staging/~laney/ubuntu-system-settings/reset-background into lp://staging/ubuntu-system-settings
Proposed by
Iain Lane
Status: | Rejected |
---|---|
Rejected by: | Sebastien Bacher |
Proposed branch: | lp://staging/~laney/ubuntu-system-settings/reset-background |
Merge into: | lp://staging/ubuntu-system-settings |
Prerequisite: | lp://staging/~laney/ubuntu-system-settings/reset-api |
Diff against target: |
18 lines (+9/-0) 1 file modified
plugins/background/MainPage.qml (+9/-0) |
To merge this branch: | bzr merge lp://staging/~laney/ubuntu-system-settings/reset-background |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Touch System Settings | Pending | ||
Review via email: mp+210261@code.staging.launchpad.net |
Commit message
[background] Support resetting to default
Description of the change
I wanted to show that we can start adding reset support to plugins now.
It's a little bit hard to test this because content hub is broken when you launch from the command line and the reset plugin is hidden by default. I suggest you hack reset.settings to make it shown by default.
To post a comment you must log in.
PASSED: Continuous integration, rev:505 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/690/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty/ 3789 jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty- touch/3376 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- trusty- amd64-ci/ 206 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- trusty- armhf-ci/ 194 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- trusty- i386-ci/ 193 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-trusty/ 3330 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/3807 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/3807/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/3378 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/3378/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- mako/5746 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 4630
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/690/ rebuild
http://