Merge lp:~mzanetti/unity/8-lockscreen-design-tweaks into lp:unity/8.0
Proposed by
Michael Zanetti
Status: | Merged |
---|---|
Approved by: | Nicolas d'Offay |
Approved revision: | no longer in the source branch. |
Merged at revision: | 42 |
Proposed branch: | lp:~mzanetti/unity/8-lockscreen-design-tweaks |
Merge into: | lp:unity/8.0 |
Diff against target: |
66 lines (+15/-3) 3 files modified
Greeter/Lockscreen.qml (+7/-1) Shell.qml (+1/-1) tests/qmltests/Greeter/tst_Lockscreen.qml (+7/-1) |
To merge this branch: | bzr merge lp:~mzanetti/unity/8-lockscreen-design-tweaks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Nicolas d'Offay (community) | Approve | ||
Review via email: mp+171089@code.launchpad.net |
Commit message
don't clear lockscreen directly after login, its still visible in the fading animation. Clear it when it is requested to be shown instead
this also removes a colon that design didn't like and updates tests to make sure the above works
To post a comment you must log in.
On output: /home/phablet/ shell/Greeter/ Lockscreen. qml:46: TypeError: Cannot call method 'clear' of null
file://
Perhaps also a good idea to add some commentary regarding the reset() function since it's usage looks a bit suspect.