Merge lp:~unity-team/gsettings-ubuntu-touch-schemas/lockscreen-password into lp:gsettings-ubuntu-touch-schemas

Proposed by Michael Terry on 2016-01-12
Status: Work in progress
Proposed branch: lp:~unity-team/gsettings-ubuntu-touch-schemas/lockscreen-password
Merge into: lp:gsettings-ubuntu-touch-schemas
Diff against target: 42 lines (+22/-1)
2 files modified
accountsservice/com.ubuntu.AccountsService.SecurityPrivacy.xml (+16/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~unity-team/gsettings-ubuntu-touch-schemas/lockscreen-password
Reviewer Review Type Date Requested Status
Ubuntu Touch System Settings 2016-01-12 Pending
Review via email: mp+282374@code.launchpad.net

Commit message

WIP

Description of the change

WIP

To post a comment you must log in.

Unmerged revisions

60. By Michael Terry on 2016-01-12

Bump version

59. By Michael Terry on 2016-01-12

Add initial suport for LockscreenPassword

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'accountsservice/com.ubuntu.AccountsService.SecurityPrivacy.xml'
2--- accountsservice/com.ubuntu.AccountsService.SecurityPrivacy.xml 2014-08-19 15:20:41 +0000
3+++ accountsservice/com.ubuntu.AccountsService.SecurityPrivacy.xml 2016-01-12 21:12:52 +0000
4@@ -6,8 +6,23 @@
5 <annotation name="org.freedesktop.Accounts.Authentication.ReadAny"
6 value="com.ubuntu.AccountsService.GreeterReadAny"/>
7
8+ <!-- Possible values:
9+ '' - like 'system' but looks at PasswordDisplayHint below for how to
10+ render the prompt; deprecated and only used on upgrade
11+ 'system' - use standard unix password (passwd)
12+ 'none' - no password needed
13+ 'pin:***' - numeric password, processed by crypt(3)
14+ 'phrase:***' - no-restriction password, processed by crypt(3)
15+ -->
16+ <property name="LockscreenPassword" type="s" access="readwrite">
17+ <annotation name="org.freedesktop.Accounts.DefaultValue" value=""/>
18+ </property>
19+
20 <!-- 0: Keyboard password prompt (traditional entry)
21- 1: 4-digit numeric password prompt (like a PIN pad) -->
22+ 1: 4-digit numeric password prompt (like a PIN pad)
23+ This property is now deprecated and only used if LockscreenPassword
24+ above is empty.
25+ -->
26 <property name="PasswordDisplayHint" type="i" access="readwrite">
27 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
28 </property>
29
30=== modified file 'debian/changelog'
31--- debian/changelog 2015-06-08 15:25:08 +0000
32+++ debian/changelog 2016-01-12 21:12:52 +0000
33@@ -1,3 +1,9 @@
34+gsettings-ubuntu-touch-schemas (0.0.5) UNRELEASED; urgency=medium
35+
36+ * Add LockscreenPassword property to SecurityPrivacy schema
37+
38+ -- Michael Terry <mterry@ubuntu.com> Tue, 12 Jan 2016 16:10:16 -0500
39+
40 gsettings-ubuntu-touch-schemas (0.0.4+15.10.20150608-0ubuntu1) wily; urgency=medium
41
42 [ Tiago Salem Herrmann ]

Subscribers

People subscribed via source and target branches