Merge lp:~mterry/ubuntu-system-settings/shutdown-dialog-in-wizard into lp:ubuntu-system-settings
Status: | Merged |
---|---|
Approved by: | Michael Terry |
Approved revision: | 1135 |
Merged at revision: | 1172 |
Proposed branch: | lp:~mterry/ubuntu-system-settings/shutdown-dialog-in-wizard |
Merge into: | lp:ubuntu-system-settings |
Diff against target: |
74 lines (+52/-0) 1 file modified
wizard/qml/main.qml (+52/-0) |
To merge this branch: | bzr merge lp:~mterry/ubuntu-system-settings/shutdown-dialog-in-wizard |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Daniel d'Andrada (community) | Approve | ||
Ubuntu Touch System Settings | Pending | ||
Review via email: mp+238497@code.launchpad.net |
Commit message
When the power button is held down, show the shutdown dialog like we do in the unity8 shell.
Description of the change
When the power button is held down, show the shutdown dialog like we do in the unity8 shell.
This will need a slight change in unity8 to set the domain explicitly for translations, so it can be imported from the wizard like this.
== Checklist ==
* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
* Did you build your software in a clean sbuild/pbuilder chroot or ppa?
NA, just qml changes
* Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
NA, just qml changes
* Has your component "TestPlan” been executed successfully on emulator, N4?
Yes
* Has a 5 minute exploratory testing run been executed on N4?
Yes
* If you changed the packaging (debian), did you subscribe a core-dev to this MP?
NA
* If you changed the UI, did you subscribe the design-reviewers to this MP?
NA
* What components might get impacted by your changes?
Just the wizard
* Have you requested review by the teams of these owning components?
I guess that's me
FAILED: Continuous integration, rev:1132 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/1639/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/5976 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 4102 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- i386-ci/ 831 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/5617 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7228 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7228/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 14740 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 3463 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/4434 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/4434/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/1639/ rebuild
http://