Merge lp:~mterry/gsettings-ubuntu-touch-schemas/enable-edges-while-locked into lp:gsettings-ubuntu-touch-schemas

[Michael Terry]

Add two fields to control the edges of the screen while locked. (LP: #1358340)

Add two fields to control the edges of the screen while locked. (LP: #1358340)

I also clarified the comment on a previous field, while I was there.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/40/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

looks fine, thanks

review: Approve

=== modified file 'accountsservice/com.ubuntu.AccountsService.SecurityPrivacy.xml'
--- accountsservice/com.ubuntu.AccountsService.SecurityPrivacy.xml	2014-07-06 04:24:53 +0000
+++ accountsservice/com.ubuntu.AccountsService.SecurityPrivacy.xml	2014-08-20 13:32:17 +0000
@@ -7,10 +7,18 @@
                 value="com.ubuntu.AccountsService.GreeterReadAny"/>
 
     <!-- 0: Keyboard password prompt (traditional entry)
-         1: Numeric password prompt (like a PIN pad) -->
+         1: 4-digit numeric password prompt (like a PIN pad) -->
     <property name="PasswordDisplayHint" type="i" access="readwrite">
       <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
     </property>
 
+    <property name="EnableLauncherWhileLocked" type="b" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+    </property>
+
+    <property name="EnableIndicatorsWhileLocked" type="b" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+    </property>
+
   </interface>
 </node>

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-15 19:39:55 +0000
+++ debian/changelog	2014-08-20 13:32:17 +0000
@@ -1,3 +1,10 @@
+gsettings-ubuntu-touch-schemas (0.0.3) UNRELEASED; urgency=medium
+
+  * Add EnableLauncherWhileLocked and EnableIndicatorsWhileLocked properties
+    to com.ubuntu.AccountsService.SecurityPrivacy (LP: #1358340)
+
+ -- Michael Terry <[e-mail]>  Tue, 19 Aug 2014 11:19:42 -0400
+
 gsettings-ubuntu-touch-schemas (0.0.2+14.10.20140815-0ubuntu1) utopic; urgency=low
 
   [ Alberto Aguirre ]