Merge lp://staging/~laney/ubuntu-system-settings/security-privacy-set-security-demo into lp://staging/ubuntu-system-settings

Proposed by Iain Lane
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 326
Merged at revision: 329
Proposed branch: lp://staging/~laney/ubuntu-system-settings/security-privacy-set-security-demo
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 500 lines (+140/-65)
6 files modified
plugins/battery/PageComponent.qml (+6/-4)
plugins/security-privacy/LockSecurity.qml (+70/-47)
plugins/security-privacy/PhoneLocking.qml (+9/-8)
plugins/security-privacy/securityprivacy.cpp (+39/-1)
plugins/security-privacy/securityprivacy.h (+16/-0)
schema/com.ubuntu.touch.system-settings.gschema.xml (+0/-5)
To merge this branch: bzr merge lp://staging/~laney/ubuntu-system-settings/security-privacy-set-security-demo
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email:

Commit message

Set the unlock type in a QSettings file (~/.unity8-greeter-demo)

Description of the change

Set the unlock type in a QSettings file

passwordValue support will come in a followup MP

To post a comment you must log in.
326. By Iain Lane


Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

That seems to work great!

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.


People subscribed via source and target branches