Merge lp:~mzanetti/unity8/fix-lockscreen-wallpaper into lp:unity8
Status: | Merged |
---|---|
Approved by: | Michael Terry |
Approved revision: | 1428 |
Merged at revision: | 1438 |
Proposed branch: | lp:~mzanetti/unity8/fix-lockscreen-wallpaper |
Merge into: | lp:unity8 |
Diff against target: |
177 lines (+47/-30) 5 files modified
qml/Components/Lockscreen.qml (+15/-0) qml/Greeter/Greeter.qml (+1/-1) qml/Greeter/GreeterContent.qml (+1/-18) qml/Notifications/NotificationMenuItemFactory.qml (+1/-0) qml/Shell.qml (+29/-11) |
To merge this branch: | bzr merge lp:~mzanetti/unity8/fix-lockscreen-wallpaper |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Michael Terry | Approve | ||
Olga Kemmet (community) | design | Approve | |
Review via email: mp+241067@code.launchpad.net |
Commit message
unify Greeter and Lockscreen wallpaper again
This moves the actual reading of accountsservice into Shell.qml so we only have to read it once. Also this drops the GSettings for wallpaper as it hasn't been used any more (we can't change that in systemsettings any more anyways)
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
no
* Did you perform an exploratory manual test run of your code change and any related functionality?
yes
* Did you make sure that your branch does not contain spurious tags?
yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
* If you changed the UI, has there been a design review?
Yes. did a hangout with kemmko.
FAILED: Continuous integration, rev:1422 jenkins. qa.ubuntu. com/job/ unity8- ci/4848/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 49 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- vivid/25 jenkins. qa.ubuntu. com/job/ unity8- vivid-amd64- ci/13 jenkins. qa.ubuntu. com/job/ unity8- vivid-i386- ci/13 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 51 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 49 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 49/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 15553
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/4848/ rebuild
http://