GSettings Ubuntu touch schemas

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

  1. lockscreen-password
  2. Merge into trunk
Proposed by Michael Terry
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 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

Bump version

59. By Michael Terry

Add initial suport for LockscreenPassword

Preview Diff

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

Subscribers

People subscribed via source and target branches