Merge lp:~jonas-drange/gsettings-ubuntu-touch-schemas/fingerprint into lp:gsettings-ubuntu-touch-schemas

[Jonas G. Drange]

allow the user to enable/disable fingerprint auth

[Michael Terry (mterry)]

You probably want to bump the version so that any package that uses this property can version their dependency.

[Michael Terry (mterry)]

UGH. You did and I just totally missed that part of the diff. :P

[Michael Terry (mterry)]

Trunk is up to 0.0.6. This needs to bump to 0.0.7

review: Needs Fixing

[lp:~jonas-drange/gsettings-ubuntu-touch-schemas/fingerprint]

68. By Jonas G. Drange on 2016-06-09

sync with trunk

69. By Jonas G. Drange on 2016-06-09

bump version due to newer upstream

70. By Jonas G. Drange on 2016-06-14

add fingerprint name map

[Michael Terry (mterry)]

Seems good.

review: Approve

[Robert Bruce Park (robru)]

Extreme nitpick inline

[lp:~jonas-drange/gsettings-ubuntu-touch-schemas/fingerprint]

71. By Jonas G. Drange on 2016-06-15

remove brackets

=== 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-06-15 12:12:18 +0000
@@ -12,6 +12,10 @@
       <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
     </property>
 
+    <property name="EnableFingerprintIdentification" type="b" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/>
+    </property>
+
     <property name="EnableLauncherWhileLocked" type="b" access="readwrite">
       <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
     </property>

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-14 13:09:42 +0000
+++ debian/changelog	2016-06-15 12:12:18 +0000
@@ -1,3 +1,11 @@
+gsettings-ubuntu-touch-schemas (0.0.7+16.04.20160609-0ubuntu1) UNRELEASED; urgency=medium
+
+  Jonas G. Drange
+  * Add EnableFingerprintIdentification to security accounts-service schema
+  * Add fingerprint-names to system gsettings schema
+
+ -- Jonas G. Drange <[e-mail]>  Wed, 14 June 2016 11:58:29 +0200
+
 gsettings-ubuntu-touch-schemas (0.0.6+16.04.20160414-0ubuntu1) xenial; urgency=medium
 
   [ Michael Terry ]
@@ -206,7 +214,7 @@
 
 gsettings-ubuntu-touch-schemas (0.0.1+13.10.20130730-0ubuntu2) saucy; urgency=low
 
-  * Change the default sounds for calls and messages, depends on 
+  * Change the default sounds for calls and messages, depends on
     ubuntu-touch-sounds so we are sure users get the files with the defaults
 
  -- Sebastien Bacher <[e-mail]>  Mon, 14 Oct 2013 16:36:03 +0200

=== modified file 'schemas/com.ubuntu.touch.system.gschema.xml.in.in'
--- schemas/com.ubuntu.touch.system.gschema.xml.in.in	2014-09-11 18:21:55 +0000
+++ schemas/com.ubuntu.touch.system.gschema.xml.in.in	2016-06-15 12:12:18 +0000
@@ -53,5 +53,10 @@
       <default>45</default>
       <summary>Timeout in seconds for dimming the screen if there is no user activity. A value of 0 disables auto-dimming.</summary>
     </key>
+    <key name="fingerprint-names" type="a{ss}">
+        <_summary>Fingerprint names</_summary>
+        <default>{}</default>
+        <_description>Mapping of unique fingerprint ids to names set by the user.</_description>
+    </key>
   </schema>
 </schemalist>