Merge lp:~jonas-drange/ubuntu-settings-components/fingerprint into lp:~registry/ubuntu-settings-components/trunk

[Jonas G. Drange]

components for allowing a user to manage fingerprints

* Are there any related MPs required for this MP to build/function as expected? Please list.
 Yes, fingerprint bindings.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
 TBD
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 N/A
 * If you changed the UI, has there been a design review?
 TBD
 * If you changed localized strings, has the POT file been updated?
 TBD

Rationale: https://docs.google.com/document/d/1d8gEataSjJMRacQbdSy0W4pSFA9q1UKA660CvXk-wNI/edit

[lp:~jonas-drange/ubuntu-settings-components/fingerprint]

111. By Jonas G. Drange on 2016-03-17

mature the example

112. By Jonas G. Drange on 2016-03-18

merge trunk

113. By Jonas G. Drange on 2016-03-18

comp page

114. By Jonas G. Drange on 2016-03-22

add fingerprint qml test

115. By Jonas G. Drange on 2016-03-23

add qml tests

116. By Jonas G. Drange on 2016-03-29

use predicted signals and methods from discussions with tvoss

117. By Jonas G. Drange on 2016-03-30

remove dangling function keyword

118. By Jonas G. Drange on 2016-03-30

PageHeader crashes, use title instead

119. By Jonas G. Drange on 2016-03-31

conform to spec

120. By Jonas G. Drange on 2016-03-31

doc, sort props

[lp:~jonas-drange/ubuntu-settings-components/fingerprint]

121. By Jonas G. Drange on 2016-05-04

implement some of the qml binding features

122. By Jonas G. Drange on 2016-05-06

add mocking

123. By Jonas G. Drange on 2016-05-09

add mocked biometryd

124. By Jonas G. Drange on 2016-05-09

rewrite tests to use mocking

125. By Jonas G. Drange on 2016-05-10

working enrollment test

126. By Jonas G. Drange on 2016-05-16

make enrollment work once again, albeit with deprecated animations

127. By Jonas G. Drange on 2016-05-20

init provider

128. By Jonas G. Drange on 2016-05-21

use qrc to put the paths in the binary (compressed)

129. By Jonas G. Drange on 2016-05-21

undo test comment

130. By Jonas G. Drange on 2016-05-21

small fixes, make renderPath private

131. By Jonas G. Drange on 2016-05-21

remove debug stuff in fingerprint page

132. By Jonas G. Drange on 2016-05-21

remove debug stuff in fingerprint page

133. By Jonas G. Drange on 2016-05-21

add test for fingerprint visual

134. By Jonas G. Drange on 2016-05-22

fix a lot of details

135. By Jonas G. Drange on 2016-05-22

some comments

136. By Jonas G. Drange on 2016-05-23

new paths from design

137. By Jonas G. Drange on 2016-05-23

add svg dep

138. By Jonas G. Drange on 2016-05-24

move paths to assets instead, add everything to qrc to get it compressed.

139. By Jonas G. Drange on 2016-05-24

use png as drop shadows

140. By Jonas G. Drange on 2016-05-24

fix broken transparent pngs

141. By Jonas G. Drange on 2016-05-24

buttons per spec

142. By Jonas G. Drange on 2016-05-24

biometryd is a depend of the binary package

143. By Jonas G. Drange on 2016-05-25

sync with trunk

144. By Jonas G. Drange on 2016-05-26

remove spurious mockoperation

145. By Jonas G. Drange on 2016-05-27

reverse X axis

146. By Jonas G. Drange on 2016-05-27

animated enrollment

147. By Jonas G. Drange on 2016-06-02

clean up cancel logic, add available to mock and test it

148. By Jonas G. Drange on 2016-06-02

add circular segment, completing the done animation

149. By Jonas G. Drange on 2016-06-02

remove unused asset

150. By Jonas G. Drange on 2016-06-06

add direction visual

151. By Jonas G. Drange on 2016-06-08

add red translucent rectangle for each scanner mask

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

drop svg dep

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

update pot

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

size op only on available

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

fix some design issues

156. By Jonas G. Drange on 2016-06-10

have failed and success screens on same page

157. By Jonas G. Drange on 2016-06-10

first stab at smart rotation

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

complete directionvisual

[lp:~jonas-drange/ubuntu-settings-components/fingerprint]

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

start working on name story

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

first part of named templates

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

refactor tests, and add the last piece of the naming

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

update pot

Unmerged revisions

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

update pot

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

refactor tests, and add the last piece of the naming

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

first part of named templates

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

start working on name story

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

complete directionvisual

157. By Jonas G. Drange on 2016-06-10

first stab at smart rotation

156. By Jonas G. Drange on 2016-06-10

have failed and success screens on same page

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

fix some design issues

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

size op only on available

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

update pot

=== modified file 'debian/control'
--- debian/control	2016-03-01 15:37:36 +0000
+++ debian/control	2016-06-15 10:46:42 +0000
@@ -27,7 +27,10 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: qml-module-qtquick-layouts,
+Depends: gsettings-ubuntu-schemas (>= 0.0.7),
+         qml-module-biometryd,
+         qml-module-qtquick-layouts,
+         qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1),
          suru-icon-theme,
          ${misc:Depends},
@@ -35,4 +38,4 @@
 Breaks: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),
 Replaces: qtdeclarative5-ubuntu-settings-components-assets (<< 0.3),
 Description: Ubuntu Settings Components
- Ubuntu settings components for Unity
 \ No newline at end of file
+ Ubuntu settings components for Unity
 
=== added file 'examples/Fingerprint.qml'
--- examples/Fingerprint.qml	1970-01-01 00:00:00 +0000
+++ examples/Fingerprint.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.2
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Settings.Components 0.1
+import Ubuntu.Settings.Fingerprint 0.1
+
+MainView {
+    width: units.gu(50)
+    height: units.gu(90)
+
+    PageStack {
+        id: pageStack
+
+        Component.onCompleted: push(fingerprintPage)
+
+        Component {
+            id: fingerprintPage
+            Fingerprints {
+                onRequestPasscode: passcodeSet = !passcodeSet
+            }
+        }
+    }
+}
 
=== modified file 'plugins/Ubuntu/Settings/CMakeLists.txt'
--- plugins/Ubuntu/Settings/CMakeLists.txt	2016-02-05 23:42:02 +0000
+++ plugins/Ubuntu/Settings/CMakeLists.txt	2016-06-15 10:46:42 +0000
@@ -1,3 +1,4 @@
 add_subdirectory(Components)
+add_subdirectory(Fingerprint)
 add_subdirectory(Menus)
 add_subdirectory(Vpn)
 
=== added directory 'plugins/Ubuntu/Settings/Fingerprint'
=== added file 'plugins/Ubuntu/Settings/Fingerprint/CMakeLists.txt'
--- plugins/Ubuntu/Settings/Fingerprint/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/CMakeLists.txt	2016-06-15 10:46:42 +0000
@@ -0,0 +1,15 @@
+project(UbuntuSettingsFingerprintQml)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+add_definitions(-DUBUNTUSETTINGSFINGERPRINT_LIBRARY)
+QT5_ADD_RESOURCES(assets assets.qrc)
+add_library(UbuntuSettingsFingerprintQml MODULE
+    plugin.cpp
+    ubuntusettingsfingerprint.cpp
+    ${assets}
+)
+qt5_use_modules(UbuntuSettingsFingerprintQml Core Qml Quick)
+add_usc_plugin(Ubuntu.Settings.Fingerprint 0.1 Ubuntu/Settings/Fingerprint TARGETS UbuntuSettingsFingerprintQml)
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/CircularSegment.qml'
--- plugins/Ubuntu/Settings/Fingerprint/CircularSegment.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/CircularSegment.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by  Florian Boucault <[e-mail]>
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+ShaderEffect {
+    implicitWidth: units.gu(20)
+    implicitHeight: units.gu(20)
+    height: width
+
+    property color color: "#3EB34F"
+    property real thickness: units.dp(3)
+    property real angleStop: 90
+
+    property real _texturePixel: 1/width
+    property real _thicknessTex: thickness/width
+    property real _angleStopRadians: angleStop * (Math.PI / 180)
+
+    fragmentShader: "
+        varying mediump vec2 qt_TexCoord0;
+        uniform lowp float qt_Opacity;
+        uniform lowp vec4 color;
+        uniform lowp float _texturePixel;
+        uniform lowp float _thicknessTex;
+        uniform lowp float _angleStopRadians;
+
+        void main() {
+            mediump vec2 center = vec2(0.5);
+            mediump float circleX = (qt_TexCoord0.x - center.x);
+            mediump float circleY = (qt_TexCoord0.y - center.y);
+            mediump float distanceToCenter = circleX*circleX + circleY*circleY;
+            const mediump float PI = 3.1415926535897932384626433832795;
+            mediump float angle = atan(-circleX, circleY) + PI;
+
+            mediump float radius = 0.5;
+            mediump float radiusSquare = radius * radius;
+            mediump float radiusInner = radius - _thicknessTex;
+            mediump float radiusInnerSquare = radiusInner * radiusInner;
+
+            lowp vec4 fillColor = mix(vec4(0),
+                                      mix(color, vec4(0), smoothstep(distanceToCenter-_texturePixel, distanceToCenter+_texturePixel, radiusInnerSquare)),
+                                      smoothstep(distanceToCenter-_texturePixel, distanceToCenter+_texturePixel, radiusSquare));
+            fillColor = mix(fillColor, vec4(0), step(_angleStopRadians, angle));
+            gl_FragColor = fillColor * qt_Opacity;
+        }
+    "
+}
+
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/DirectionVisual.qml'
--- plugins/Ubuntu/Settings/Fingerprint/DirectionVisual.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/DirectionVisual.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import Biometryd 0.0
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Settings.Fingerprint 0.1
+
+Item {
+    property int direction: FingerprintReader.NotAvailable
+    opacity: direction !== FingerprintReader.NotAvailable ? 1 : 0
+    Behavior on opacity { UbuntuNumberAnimation {} }
+
+    UbuntuNumberAnimation {
+        id: rotationAnimation
+        alwaysRunToEnd: true
+
+        target: directionContainer
+        property: "rotation"
+
+        function normalizeAngle(v) {
+            if (v < 0)
+                return 360 + v;
+            else
+                return v % 360;
+        }
+
+        onStopped: {
+            directionContainer.rotation = normalizeAngle(directionContainer.rotation);
+        }
+    }
+
+    onDirectionChanged: {
+        var v1 = rotation;
+        var v2;
+        var length;
+
+        switch (direction) {
+        case FingerprintReader.North:
+            v2 = 0; break;
+        case FingerprintReader.NorthEast:
+            v2 = 45; break;
+        case FingerprintReader.East:
+            v2 = 90; break;
+        case FingerprintReader.SouthEast:
+            v2 = 135; break;
+        case FingerprintReader.South:
+            v2 = 180; break;
+        case FingerprintReader.SouthWest:
+            v2 = 225; break;
+        case FingerprintReader.West:
+            v2 = 270; break;
+        case FingerprintReader.NorthWest:
+            v2 = 315; break;
+        }
+
+        length = Math.min(Math.abs(v1 - v2),
+                     Math.abs(v1 - 360 - v2),
+                     Math.abs(v1 + 360 - v2));
+
+        if (length !== 180)
+            length = length % 180;
+
+        if (((length + v1) % 360) === v2)
+            v1 = v1 + length;
+        else
+            v1 = v1 -length;
+
+        rotationAnimation.from = rotation;
+        rotationAnimation.to = v1;
+        rotationAnimation.start();
+    }
+
+    Icon {
+        id: directionArrow
+        objectName: "fingerprintDirectionLabel"
+        anchors {
+            top: parent.top
+            topMargin: -units.gu(2)
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: units.gu(5)
+        height: width
+
+        name: "down"
+        color: theme.palette.normal.activity
+    }
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml'
--- plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3
+
+Page {
+    id: root
+    property string name
+    property string templateId
+
+    signal requestDeletion(string templateId)
+    signal requestRename(string templateId, string name)
+
+    function deletionFailed() {
+        PopupUtils.open(deletionFailed);
+        state = "";
+    }
+
+    header: PageHeader {
+        objectName: "templateHeader"
+        title: nameInput.text.length > 0 ? nameInput.text : name
+        flickable: flickable
+    }
+
+    states: [
+        State {
+            name: "deleting"
+            PropertyChanges {
+                target: nameInput
+                enabled: false
+            }
+            PropertyChanges {
+                target: deleteButton
+                enabled: false
+            }
+        }
+    ]
+
+    Flickable {
+        id: flickable
+        anchors {
+            fill: parent
+            topMargin: units.gu(2)
+        }
+        boundsBehavior: (contentHeight > root.height) ?
+                         Flickable.DragAndOvershootBounds :
+                         Flickable.StopAtBounds
+        contentHeight: contentItem.childrenRect.height
+
+        Column {
+            spacing: units.gu(2)
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: units.gu(3)
+            }
+
+            Label {
+                id: nameLabel
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: i18n.dtr("ubuntu-settings-components", "Fingerprint Name")
+                font.weight: Font.Light
+            }
+
+            TextField {
+                id: nameInput
+                objectName: "nameInput"
+                anchors.left: parent.left
+                anchors.right: parent.right
+                inputMethodHints: Qt.ImhNoPredictiveText
+                style: TextFieldStyle {}
+                text: name
+                onTextChanged: {
+                    if (text)
+                        requestRename(templateId, text)
+                }
+                onAccepted: {
+                    if (text) {
+                        requestRename(templateId, text);
+                        pageStack.pop();
+                    }
+                }
+            }
+
+            Button {
+                id: deleteButton
+                objectName: "templateDelete"
+                text: i18n.dtr("ubuntu-settings-components", "Delete Fingerprint")
+                onClicked: {
+                    root.state = "deleting";
+                    requestDeletion(templateId)
+                }
+                width: parent.width
+            }
+        }
+    }
+
+    Component {
+        id: deletionFailed
+
+        Dialog {
+            id: deletionFailedDialog
+            objectName: "fingerprintDeletionFailedDialog"
+            text: i18n.dtr("ubuntu-settings-components",
+                           "Sorry, the fingerprint could not be deleted.")
+
+            Button {
+                objectName: "fingerprintDeleteionFailedOk"
+                onClicked: PopupUtils.close(deletionFailedDialog)
+                text: i18n.dtr("ubuntu-settings-components", "OK")
+            }
+        }
+    }
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/FingerprintVisual.qml'
--- plugins/Ubuntu/Settings/Fingerprint/FingerprintVisual.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/FingerprintVisual.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ *             Florian Boucault <[e-mail]>
+ */
+
+import QtQuick 2.4
+import Ubuntu.Settings.Fingerprint 0.1
+
+SegmentedImage {
+    id: segmentedImage
+
+    property var masks: []
+
+    // http://stackoverflow.com/a/1830844/538866
+    function isNumeric (n) {
+        return !isNaN(parseFloat(n)) && isFinite(n);
+    }
+
+    function getMasksToEnroll () {
+        var outMasks = [];
+        if (masks && masks.length) {
+            masks.forEach(function (mask, i) {
+                // Format is "<source>/[x1,y1,w1,h1],…,[xn,yn,wn,hn]"
+                // If any value is non-numeric, we drop the mask.
+                if (!isNumeric(mask.x) || !isNumeric(mask.y) || !isNumeric(mask.width)
+                    || !isNumeric(mask.height))
+                    return;
+
+                // Translate the box so as to mirror the mask
+                mask.x = (1 - (mask.x + mask.width));
+
+                outMasks.push(mask);
+            });
+        }
+        return outMasks;
+    }
+
+    onMasksChanged: segmentedImage.enrollMasks(getMasksToEnroll())
+
+    textureSource: "qrc:/assets/fingerprint_segmented.png"
+    boxesSource: "qrc:/assets/fingerprint_boxes.json"
+
+    Repeater {
+        model: segmentedImage.masks
+
+        Rectangle {
+            visible: UbuntuSettingsFingerprint.debug
+            color: "red"
+            opacity: 0.25
+            x: modelData.x * segmentedImage.implicitWidth
+            y: modelData.y * segmentedImage.implicitHeight
+            width: modelData.width * segmentedImage.implicitWidth
+            height: modelData.height * segmentedImage.implicitHeight
+
+            Component.onCompleted: console.log('Scanner mask (x, y, w, h):', x, y, width, height)
+        }
+    }
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml'
--- plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,440 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import Biometryd 0.0
+import GSettings 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Settings.Fingerprint 0.1
+
+Page {
+    id: root
+    objectName: "fingerprintPage"
+
+    header: PageHeader {
+        title: i18n.dtr("ubuntu-settings-components", "Fingerprint ID")
+        flickable: content
+    }
+
+    property var _ts: Biometryd.defaultDevice.templateStore
+    property var _enrollmentOperation: null
+    property var _clearanceOperation: null
+    property var _removalOperation: null
+    property var _listOperation: null
+    property var _setupPage: null
+    property var _fpInstancePage: null
+    property var _settings: sysSettings
+
+    property Dialog _diag: null
+    property bool passcodeSet: false
+
+    function enroll () {
+        _enrollmentOperation = _ts.enroll(user);
+        _enrollmentOperation.start(enrollmentObserver);
+    }
+
+    function cancel () {
+        if (_enrollmentOperation !== null)
+            _enrollmentOperation.cancel();
+    }
+
+    function clear() {
+        _clearanceOperation = _ts.clear(user);
+        _clearanceOperation.start(clearanceObserver);
+    }
+
+    function removeTemplate(templateId) {
+        var names = sysSettings.fingerprintNames;
+        delete names[templateId];
+        sysSettings.fingerprintNames = names;
+    }
+
+    function renameTemplate(templateId, newName) {
+        var names = sysSettings.fingerprintNames;
+        names[templateId] = newName;
+        sysSettings.fingerprintNames = names;
+    }
+
+    function addTemplate(templateId, name) {
+        var names = sysSettings.fingerprintNames;
+        names[templateId] = name;
+        sysSettings.fingerprintNames = names;
+    }
+
+    function createTemplateName() {
+        var map = sysSettings.fingerprintNames;
+        var currentNames = [];
+        var newName;
+        for (var k in map) {
+            if (map.hasOwnProperty(k))
+                currentNames.push(map[k]);
+        }
+
+        var i = 0;
+        do {
+            newName = i18n.dtr("ubuntu-settings-components",
+                               "Finger %1").arg(++i); // Start at 1
+        } while (currentNames.indexOf(newName) >= 0);
+        return newName;
+    }
+
+    // Assign names to unnamed fingerprints. This exist because we can't
+    // guarantee that all fingerprints get names (i.e. enrollment can complete
+    // after System Settings closes).
+    function assignNames(templateIds) {
+        var names = sysSettings.fingerprintNames;
+        for (var i = 0; i < templateIds.length; i++) {
+            if ( !(templateIds[i] in names) || !names[templateIds[i]])
+                names[templateIds[i]] = createTemplateName();
+                sysSettings.fingerprintNames = names;
+        }
+    }
+
+    signal requestPasscode()
+
+    Component.onCompleted: {
+        // Start a list operation immediately.
+        if (Biometryd.available) {
+            _listOperation = _ts.list(user);
+            _listOperation.start(listObserver);
+        }
+    }
+
+    Component.onDestruction: {
+        if (_enrollmentOperation !== null)
+            _enrollmentOperation.cancel();
+
+        if (_clearanceOperation !== null)
+            _clearanceOperation.cancel();
+
+        if (_removalOperation !== null)
+            _removalOperation.cancel();
+
+        if (_listOperation !== null)
+            _listOperation.cancel();
+    }
+
+    states: [
+        State {
+            name: "noPasscode"
+            PropertyChanges {
+                target: setupPasscode
+                visible: true
+            }
+            PropertyChanges {
+                target: setupFingerprint
+                enabled: false
+            }
+            PropertyChanges {
+                target: fingerprintsList
+                enabled: false
+            }
+            when: !passcodeSet
+        },
+        State {
+            name: "noScanner"
+            PropertyChanges {
+                target: setupFingerprint
+                enabled: false
+            }
+            PropertyChanges {
+                target: fingerprintsList
+                visible: false
+            }
+            when: !Biometryd.available
+        }
+    ]
+
+    Flickable {
+        id: content
+        anchors.fill: parent
+        boundsBehavior: (contentHeight > root.height) ?
+                            Flickable.DragAndOvershootBounds :
+                            Flickable.StopAtBounds
+        contentHeight: contentItem.childrenRect.height
+
+        Column {
+            anchors { left: parent.left; right: parent.right }
+            // spacing: units.gu(3)
+
+            Column {
+                id: setupPasscode
+                anchors { left: parent.left; right: parent.right }
+                visible: false
+
+                ListItem {
+                    height: setPcodeLayout.height + (divider.visible ? divider.height : 0)
+                    ListItemLayout {
+                        id: setPcodeLayout
+                        title.text: i18n.dtr(
+                            "ubuntu-settings-components",
+                            "Passcode required"
+                        )
+                        subtitle.text: i18n.dtr(
+                            "ubuntu-settings-components",
+                            "You must set a passcode to use fingerprint ID"
+                        )
+                        Button {
+                            objectName: "fingerprintSetPasscodeButton"
+                            onClicked: root.requestPasscode()
+                            text: i18n.dtr(
+                                "ubuntu-settings-components",
+                                "Set Passcode…"
+                            )
+                        }
+                    }
+                }
+            }
+
+            Column {
+                id: fingerprints
+                anchors { left: parent.left; right: parent.right }
+
+                Repeater {
+                    id: fingerprintsList
+                    property bool enabled: true
+                    objectName: "fingerprintsList"
+                    model: {
+                        var map = sysSettings.fingerprintNames;
+                        var m = [];
+                        for (var k in map) {
+                            if (map.hasOwnProperty(k)) {
+                                m.push({
+                                    templateId: k,
+                                    name: map[k]
+                                });
+                            }
+                        }
+                        m.sort(function (a, b) {
+                            if (a.name < b.name) return -1;
+                            if (a.name > b.name) return 1;
+                            if (a.name == b.name) return 0;
+                        });
+                        return m;
+                    }
+
+                    ListItem {
+                        height: fpLayout.height + (divider.visible ? divider.height : 0)
+                        onClicked: _fpInstancePage = pageStack.push(
+                                Qt.resolvedUrl("Fingerprint.qml"), {
+                                name: modelData.name,
+                                templateId: modelData.templateId
+                            }
+                        )
+                        enabled: fingerprintsList.enabled
+
+                        ListItemLayout {
+                            id: fpLayout
+                            objectName: "fingerprintInstance-" + index
+                            title.text: modelData.name
+
+                            ProgressionSlot {}
+                        }
+                    }
+                }
+            }
+
+            Column {
+                id: setupFingerprint
+
+                anchors { left: parent.left; right: parent.right }
+                objectName: "fingerprintSetupEntry"
+                property bool enabled: true
+                spacing: units.gu(2)
+
+                ListItem {
+                    height: addFpLayout.height + (divider.visible ? divider.height : 0)
+                    onClicked: {
+                        _setupPage = pageStack.push(Qt.resolvedUrl("Setup.qml"));
+                        root.enroll();
+                    }
+                    enabled: parent.enabled
+
+                    ListItemLayout {
+                        id: addFpLayout
+                        objectName: "fingerprintAddListItemLayout"
+                        title.text: i18n.dtr(
+                            "ubuntu-settings-components",
+                            "Add fingerprint"
+                        )
+
+                        ProgressionSlot {}
+                    }
+                }
+
+                Button {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    enabled: fingerprintsList.model.length > 0
+                    objectName: "fingerprintRemoveAllButton"
+                    onClicked: _diag = PopupUtils.open(removeAllAlert)
+                    text: i18n.dtr("ubuntu-settings-components",
+                                   "Remove All…")
+                }
+            }
+        }
+    }
+
+    Component {
+        id: removeAllAlert
+
+        Dialog {
+            id: removeAllAlertDialog
+
+            objectName: "fingerprintRemoveAllDialog"
+            text: i18n.dtr(
+                "ubuntu-settings-components",
+                "Are you sure you want to forget all stored fingerprints?"
+            )
+
+            RowLayout {
+                anchors { left: parent.left; right: parent.right }
+                spacing: units.gu(2)
+
+                Button {
+                    onClicked: PopupUtils.close(removeAllAlertDialog)
+                    text: i18n.dtr("ubuntu-settings-components", "Cancel")
+                    Layout.fillWidth: true
+                }
+
+                Button {
+                    objectName: "fingerprintRemoveAllConfirmationButton"
+                    onClicked: root.clear()
+                    text: i18n.dtr("ubuntu-settings-components", "Remove")
+                    Layout.fillWidth: true
+                }
+            }
+        }
+    }
+
+    Component {
+        id: fingerprintReaderBroken
+
+        Dialog {
+            id: fingerprintReaderBrokenDialog
+            objectName: "fingerprintReaderBrokenDialog"
+            text: i18n.dtr("ubuntu-settings-components",
+                           "Sorry, the reader doesn’t seem to be working.")
+
+            Button {
+                objectName: "fingerprintReaderBrokenDialogOK"
+                onClicked: PopupUtils.close(fingerprintReaderBrokenDialog)
+                text: i18n.dtr("ubuntu-settings-components", "OK")
+            }
+        }
+    }
+
+    Connections {
+        target: _setupPage
+        onEnroll: root.enroll()
+        onCancel: root.cancel()
+    }
+
+    Connections {
+        target: _fpInstancePage
+
+        onRequestDeletion: {
+            _removalOperation = _ts.remove(user, templateId);
+            _removalOperation.start(removalObserver);
+        }
+        onRequestRename: renameTemplate(templateId, name)
+    }
+
+    Observer {
+        id: enrollmentObserver
+        objectName: "enrollmentObserver"
+        onFailed: {
+            if (_setupPage)
+                _setupPage.enrollmentFailed(reason);
+            _enrollmentOperation = null;
+            console.error("Enrollment failed", reason);
+        }
+        onProgressed: _setupPage.enrollmentProgressed(percent, details)
+        onSucceeded: {
+            if (!(result in sysSettings.fingerprintNames))
+                root.addTemplate(result, root.createTemplateName());
+            if (_setupPage)
+                _setupPage.enrollmentCompleted();
+            _enrollmentOperation = null;
+        }
+        onCanceled: _enrollmentOperation = null
+    }
+
+    Observer {
+        id: clearanceObserver
+        objectName: "clearanceObserver"
+        onFailed: {
+            _clearanceOperation = null;
+            if (_diag) PopupUtils.close(_diag);
+            _diag = PopupUtils.open(fingerprintReaderBroken);
+            console.error("Biometry clearance failed:", reason);
+        }
+        onSucceeded: {
+            _clearanceOperation = null;
+            if (_diag) PopupUtils.close(_diag);
+            sysSettings.fingerprintNames = {};
+        }
+        onCanceled: _clearanceOperation = null
+    }
+
+    Observer {
+        id: removalObserver
+        objectName: "removalObserver"
+        onFailed: {
+            _removalOperation = null;
+            if (_fpInstancePage)
+                _fpInstancePage.deletionFailed()
+            console.error("Biometryd template deletion failed:", reason);
+        }
+        onSucceeded: {
+            _removalOperation = null;
+            if (pageStack.currentPage === _fpInstancePage)
+                pageStack.pop();
+            root.removeTemplate(result);
+        }
+        onCanceled: _removalOperation = null
+    }
+
+    Observer {
+        id: listObserver
+        objectName: "listObserver"
+        onFailed: {
+            _listOperation = null;
+            if (_diag) PopupUtils.close(_diag);
+            _diag = PopupUtils.open(fingerprintReaderBroken);
+            console.error("Biometryd list failed:", reason);
+        }
+        onSucceeded: {
+            _listOperation = null;
+            root.assignNames(result);
+        }
+        onCanceled: _listOperation = null
+    }
+
+    User {
+        id: user
+        uid: UbuntuSettingsFingerprint.uid
+    }
+
+    GSettings {
+        id: sysSettings
+        objectName: "systemSettings"
+        schema.id: "com.ubuntu.touch.system"
+    }
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/SegmentBoundingBoxes.qml'
--- plugins/Ubuntu/Settings/Fingerprint/SegmentBoundingBoxes.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/SegmentBoundingBoxes.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by  Florian Boucault <[e-mail]>
+ */
+
+import QtQuick 2.4
+
+QtObject {
+    id: segmentBoundingBoxes
+
+    property string source
+    onSourceChanged: parseBoundingBoxes(source)
+
+    property var boundingBoxes: []
+    property real width
+    property real height
+    property int count: boundingBoxes.length
+
+    // The API cannot be used reliably before this signal has been emitted.
+    signal ready()
+
+    function parseBoundingBoxes(source) {
+        var xhr = new XMLHttpRequest;
+        xhr.open("GET", source);
+        xhr.onreadystatechange = function() {
+            if (xhr.readyState == XMLHttpRequest.DONE) {
+                var b = [];
+                var json = JSON.parse(xhr.responseText);
+                boundingBoxes = json["boxes"];
+                width = json["width"];
+                height = json["height"];
+                ready();
+            }
+        }
+        xhr.send();
+    }
+
+    function intersects(box1, box2) {
+        // TODO: optimize
+        var x11 = box1[0];
+        var y11 = box1[1];
+        var x12 = box1[0] + box1[2];
+        var y12 = box1[1] + box1[3];
+        var x21 = box2[0];
+        var y21 = box2[1];
+        var x22 = box2[0] + box2[2];
+        var y22 = box2[1] + box2[3];
+        var x_overlap = Math.max(0, Math.min(x12,x22) - Math.max(x11,x21));
+        var y_overlap = Math.max(0, Math.min(y12,y22) - Math.max(y11,y21));
+        return (x_overlap / Math.min(box1[2], box2[2]) > 0.25
+             && y_overlap / Math.min(box1[3], box2[3]) > 0.25);
+    }
+
+    function computeIntersections(hitBox) {
+        var absoluteHitBox = [hitBox[0] * width, hitBox[1] * height,
+                              hitBox[2] * width, hitBox[3] * height];
+
+        var intersections = [];
+        for (var i in boundingBoxes) {
+            var boundingBox = boundingBoxes[i];
+            if (intersects(absoluteHitBox, boundingBox)) {
+                intersections.push(i);
+            }
+        }
+
+        return intersections;
+    }
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/SegmentRenderer.qml'
--- plugins/Ubuntu/Settings/Fingerprint/SegmentRenderer.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/SegmentRenderer.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by  Florian Boucault <[e-mail]>
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+ShaderEffect {
+    id: segmentRenderer
+
+    implicitWidth: texture.width
+    implicitHeight: texture.height
+
+    function animate(segments) {
+        for (var i in segments) {
+            var progressPixel = progressTexture.children[segments[i]];
+            if (progressPixel.progress == 0.0) {
+                progressPixel.animation.start();
+            }
+        }
+    }
+
+    property string source
+    property int segmentsCount
+    property color backgroundColor: theme.palette.normal.base
+    property color fillColor: theme.palette.normal.activity
+    property Image texture: Image {
+        source: segmentRenderer.source
+    }
+    property var progressTexture: progressTexture
+    property int progressTextureSize: progressTexture.size
+
+    fragmentShader: "
+        varying mediump vec2 qt_TexCoord0;
+        uniform lowp float qt_Opacity;
+        uniform lowp vec4 backgroundColor;
+        uniform lowp vec4 fillColor;
+        uniform lowp sampler2D texture;
+        uniform lowp sampler2D progressTexture;
+        uniform lowp int progressTextureSize;
+
+        void main() {
+            lowp vec4 p = texture2D(texture, qt_TexCoord0);
+            lowp float segment = p.r * 255.0;
+            lowp vec4 segmentProgress = step(0.9, segment) * texture2D(progressTexture, vec2((segment - 1.0 + 0.5) / float(progressTextureSize), 0.5));
+            lowp vec4 color = mix(fillColor, backgroundColor, step(segmentProgress.r, p.g));
+            gl_FragColor = vec4(color.rgb, 1.0) * p.b * qt_Opacity;
+        }
+    "
+
+    // TODO: not the most efficient; could be replaced with an image provider
+    Row {
+        id: progressTexture
+
+        property int size: 128
+        layer.enabled: true
+        layer.sourceRect: Qt.rect(0, 0, size, 1)
+        layer.textureSize: Qt.size(size, 1)
+        layer.wrapMode: ShaderEffectSource.ClampToEdge
+        visible: false
+
+        Repeater {
+            model: segmentRenderer.segmentsCount
+            Rectangle {
+                id: progressPixel
+                width: 1
+                height: 1
+                color: Qt.rgba(progress, progress, progress, 1.0)
+                property real progress
+                property NumberAnimation animation: NumberAnimation {
+                    target: progressPixel
+                    property: "progress"
+                    from: 0.0
+                    to: 1.0
+                    duration: UbuntuAnimation.SleepyDuration
+                    easing: UbuntuAnimation.StandardEasing
+                }
+            }
+        }
+    }
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/SegmentedImage.qml'
--- plugins/Ubuntu/Settings/Fingerprint/SegmentedImage.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/SegmentedImage.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by  Florian Boucault <[e-mail]>
+ */
+
+import QtQuick 2.4
+
+Item {
+    id: segImg
+    property alias textureSource: segmentRenderer.source
+    property alias boxesSource: segmentBoundingBoxes.source
+
+    implicitWidth: segmentRenderer.implicitWidth
+    implicitHeight: segmentRenderer.implicitHeight
+
+    // Ready to enroll.
+    signal ready()
+
+    function enrollMasks(masks) {
+        if (masks && masks.length) {
+            var segments = [];
+            masks.forEach(function (mask, i) {
+                var hitBox = [mask.x, mask.y, mask.width, mask.height];
+                segments = segments.concat(segmentBoundingBoxes.computeIntersections(hitBox));
+            });
+            segmentRenderer.animate(segments);
+        }
+    }
+
+    SegmentRenderer {
+        id: segmentRenderer
+        segmentsCount: segmentBoundingBoxes.count
+    }
+
+    SegmentBoundingBoxes {
+        id: segmentBoundingBoxes
+        onReady: segImg.ready()
+    }
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/Setup.qml'
--- plugins/Ubuntu/Settings/Fingerprint/Setup.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/Setup.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,388 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import Biometryd 0.0
+import QtGraphicalEffects 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.3
+import Ubuntu.Settings.Fingerprint 0.1
+
+Page {
+    id: root
+
+    objectName: "fingerprintSetupPage"
+
+    signal enroll()
+    signal cancel()
+
+    function enrollmentFailed(error) {
+        root.state = "failed";
+    }
+
+    function enrollmentCompleted() {
+        root.state = "done";
+    }
+
+    function enrollmentProgressed(progress, hints) {
+        root.state = "reading";
+        imageDefault.masks = hints[FingerprintReader.masks];
+        progressLabel.progress = 100 * progress;
+        directionContainer.direction = hints[FingerprintReader.suggestedNextDirection] || FingerprintReader.NotAvailable;
+    }
+
+    states: [
+        State {
+            name: ""
+            StateChangeScript {
+                script: statusLabel.setText(statusLabel.initialText)
+            }
+        },
+        State {
+            name: "reading"
+            StateChangeScript {
+                script: statusLabel.setText(
+                    i18n.dtr("ubuntu-settings-components",
+                             "Lift and press your finger again.")
+                )
+            }
+            PropertyChanges {
+                target: imageDefault
+                opacity: 1
+            }
+            PropertyChanges {
+                target: progressLabel
+                opacity: 1
+            }
+        },
+        State {
+            name: "longer"
+            StateChangeScript {
+                script: statusLabel.setText(
+                    i18n.dtr("ubuntu-settings-components",
+                             "Keep your finger on the reader for longer.")
+                )
+            }
+        },
+        State {
+            name: "failed"
+            PropertyChanges {
+                target: imageDefault
+                opacity: 0
+            }
+            PropertyChanges {
+                target: imageFailed
+                opacity: 1
+            }
+            PropertyChanges {
+                target: cancelButton
+                text: i18n.dtr("ubuntu-settings-components", "Back");
+            }
+            PropertyChanges {
+                target: doneButton
+                visible: false
+            }
+            StateChangeScript {
+                script: statusLabel.setText(
+                    i18n.dtr("ubuntu-settings-components",
+                             "Sorry, the reader doesn’t seem to be working."),
+                    true // No animation
+                )
+            }
+            StateChangeScript {
+                script: imageFailed.start()
+            }
+            PropertyChanges {
+                target: directionContainer
+                opacity: 0
+            }
+        },
+        State {
+            name: "done"
+            PropertyChanges {
+                target: imageDefault
+                opacity: 0
+            }
+            PropertyChanges {
+                target: imageDone
+                opacity: 1
+            }
+            PropertyChanges {
+                target: cancelButton
+                visible: false
+            }
+            StateChangeScript {
+                script: statusLabel.setText(
+                    i18n.dtr("ubuntu-settings-components", "All done!"),
+                    true // No animation
+                )
+            }
+            PropertyChanges {
+                target: doneButton
+                enabled: true
+                text: i18n.dtr("ubuntu-settings-components", "OK")
+            }
+            StateChangeScript {
+                script: imageDone.start()
+            }
+            PropertyChanges {
+                target: directionContainer
+                opacity: 0
+            }
+        }
+    ]
+
+    header: PageHeader {
+        visible: false
+    }
+
+    Item {
+        anchors.fill: parent
+
+        Item {
+            id: fingerprintBox
+            anchors.centerIn: parent
+            width: units.gu(26)
+            height: units.gu(29)
+
+            Item {
+                id: imageContainer
+                anchors.centerIn: parent
+                width: imageDefault.implicitWidth
+                height: imageDefault.implicitHeight
+
+                // Default image.
+                FingerprintVisual {
+                    id: imageDefault
+                    objectName: "fingerprintDefaultVisual"
+                    anchors.centerIn: parent
+
+                    Behavior on opacity { UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.SlowDuration
+                        easing: UbuntuAnimation.StandardEasing
+                    }}
+                }
+
+                // Failed image.
+                CircularSegment {
+                    id: imageFailed
+                    objectName: "fingerprintFailedVisual"
+                    opacity: 0
+                    color: "#ED3146"
+                    width: directionContainer.width - units.dp(3)
+
+                    anchors.centerIn: parent
+
+                    function start () {
+                        failAngstopAnim.start();
+                        failThichAnim.start();
+                    }
+
+                    NumberAnimation on angleStop {
+                        id: failAngstopAnim
+                        running: false
+                        from: 0
+                        to: 360
+                        duration: UbuntuAnimation.SlowDuration
+                        easing: UbuntuAnimation.StandardEasing
+                    }
+
+                    NumberAnimation on thickness {
+                        id: failThichAnim
+                        running: false
+                        from: 0
+                        to: units.dp(3)
+                        duration: UbuntuAnimation.SlowDuration
+                        easing: UbuntuAnimation.StandardEasing
+                    }
+
+                    Icon {
+                        name: "close"
+                        color: "#ED3146"
+                        width: units.gu(18)
+                        anchors.centerIn: parent
+                    }
+
+                    Behavior on opacity { UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.SlowDuration
+                        easing: UbuntuAnimation.StandardEasing
+                    }}
+                }
+
+                // Done image.
+                CircularSegment {
+                    id: imageDone
+                    objectName: "fingerprintDoneVisual"
+                    opacity: 0
+                    width: directionContainer.width - units.dp(3)
+
+                    anchors.centerIn: parent
+
+                    function start () {
+                        angstopAnim.start();
+                        thickAnim.start();
+                    }
+
+                    NumberAnimation on angleStop {
+                        id: angstopAnim
+                        running: false
+                        from: 0
+                        to: 360
+                        duration: UbuntuAnimation.SlowDuration
+                        easing: UbuntuAnimation.StandardEasing
+                    }
+
+                    NumberAnimation on thickness {
+                        id: thickAnim
+                        running: false
+                        from: 0
+                        to: units.dp(3)
+                        duration: UbuntuAnimation.SlowDuration
+                        easing: UbuntuAnimation.StandardEasing
+                    }
+
+                    Icon {
+                        name: "tick"
+                        color: "#3EB34F"
+                        width: units.gu(18)
+                        anchors.centerIn: parent
+                    }
+
+                    Behavior on opacity { UbuntuNumberAnimation {
+                        duration: UbuntuAnimation.SlowDuration
+                        easing: UbuntuAnimation.StandardEasing
+                    }}
+                }
+
+                DirectionVisual {
+                    id: directionContainer
+                    objectName: "fingerprintDirectionVisual"
+                    anchors.centerIn: parent
+
+                    width: Math.sqrt(
+                        imageContainer.width*imageContainer.width
+                        + imageContainer.height*imageContainer.height
+                    )
+                    height: width
+                }
+            }
+        }
+
+        StatusLabel {
+            id: statusLabel
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(2.9)
+                right: parent.right
+                rightMargin: units.gu(2.9)
+                top: parent.top
+                topMargin: units.gu(5)
+            }
+            initialText: i18n.dtr("ubuntu-settings-components",
+                                  "Place your finger on the home button.")
+            objectName: "fingerprintStatusLabel"
+        }
+
+
+        Label {
+            id: progressLabel
+            objectName: "fingerprintProgressLabel"
+            property int progress: 0
+            anchors {
+                top: fingerprintBox.bottom
+                topMargin: units.gu(1.5)
+                horizontalCenter: parent.horizontalCenter
+            }
+            text: i18n.dtr("ubuntu-settings-components", "%1%").arg((progress).toFixed());
+            opacity: 0
+            horizontalAlignment: Text.AlignHCenter
+            fontSize: "large"
+            color: theme.palette.normal.backgroundTertiaryText
+
+            Behavior on opacity { UbuntuNumberAnimation {} }
+            Behavior on progress {
+                NumberAnimation {
+                    duration: UbuntuAnimation.SlowDuration
+                    easing: UbuntuAnimation.StandardEasing
+                }
+            }
+        }
+
+        Rectangle {
+            id: actions
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+
+            // Color and height values are copied from the Wizard.
+            color: "#f5f5f5"
+            height: units.gu(5)
+
+            AbstractButton {
+                id: cancelButton
+                property alias text: cancelButtonText.text
+                objectName: "fingerprintSetupCancelButton"
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(3)
+                    verticalCenter: parent.verticalCenter
+                }
+                height: parent.height
+                width: units.gu(10)
+                onClicked: {
+                    root.cancel();
+                    pageStack.pop();
+                }
+
+                Label {
+                    id: cancelButtonText
+                    anchors.verticalCenter: parent.verticalCenter
+                    text: i18n.dtr("ubuntu-settings-components", "Cancel")
+                }
+            }
+
+            AbstractButton {
+                id: doneButton
+                property alias text: doneButtonText.text
+                objectName: "fingerprintSetupDoneButton"
+                anchors {
+                    right: parent.right
+                    rightMargin: units.gu(3)
+                    verticalCenter: parent.verticalCenter
+                }
+                enabled: false
+                height: parent.height
+                width: units.gu(10)
+                onClicked: pageStack.pop()
+
+                Label {
+                    id: doneButtonText
+                    anchors {
+                        verticalCenter: parent.verticalCenter
+                        right: parent.right
+                    }
+                    font.bold: parent.enabled
+                    text: i18n.dtr("ubuntu-settings-components", "Next")
+                }
+            }
+        }
+    }
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/StatusLabel.qml'
--- plugins/Ubuntu/Settings/Fingerprint/StatusLabel.qml	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/StatusLabel.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: root
+
+    property string initialText
+    property int origX: 0
+    readonly property alias text: label.text
+
+    signal slideStarted()
+    signal slideCompleted()
+
+    Component.onCompleted: origX = label.x
+
+    function setText(text, noAnimation) {
+        if (noAnimation === true) {
+            label.text = text;
+            return;
+        }
+
+        function outStoppedHandler () {
+            label.text = text;
+            label.x = units.gu(50)
+            inAnim.start();
+            outAnim.stopped.disconnect(outStoppedHandler);
+        }
+        outAnim.stopped.connect(outStoppedHandler);
+        outAnim.start();
+    }
+
+    Label {
+        id: label
+
+        font.pixelSize: units.gu(3.3)
+        horizontalAlignment: Text.AlignHCenter
+        height: units.gu(4)
+        text: initialText
+        width: parent.width
+        wrapMode: Text.WordWrap
+    }
+
+    NumberAnimation {
+        id: outAnim
+
+        alwaysRunToEnd: true
+        duration: UbuntuAnimation.FastDuration
+        easing: UbuntuAnimation.StandardEasing
+        onStarted: root.slideStarted()
+        property: "x"
+        target: label
+        to: -units.gu(50)
+    }
+
+    NumberAnimation {
+        id: inAnim
+
+        alwaysRunToEnd: true
+        duration: UbuntuAnimation.FastDuration
+        easing: UbuntuAnimation.StandardEasing
+        onStopped: root.slideCompleted()
+        property: "x"
+        target: label
+        to: root.origX
+    }
+}
 
=== added directory 'plugins/Ubuntu/Settings/Fingerprint/assets'
=== added file 'plugins/Ubuntu/Settings/Fingerprint/assets.qrc'
--- plugins/Ubuntu/Settings/Fingerprint/assets.qrc	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/assets.qrc	2016-06-15 10:46:42 +0000
@@ -0,0 +1,11 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>assets/[e-mail]</file>
+    <file>assets/[e-mail]</file>
+    <file>assets/[e-mail]</file>
+    <file>assets/[e-mail]</file>
+
+    <file>assets/[e-mail]</file>
+    <file>assets/fingerprint_boxes.json</file>
+</qresource>
+</RCC>
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/assets/fingerprint_boxes.json'
--- plugins/Ubuntu/Settings/Fingerprint/assets/fingerprint_boxes.json	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/assets/fingerprint_boxes.json	2016-06-15 10:46:42 +0000
@@ -0,0 +1,1 @@
+{"width": 451, "boxes": [[291, 515, 104, 50], [269, 510, 96, 34], [227, 506, 62, 16], [198, 505, 72, 60], [144, 498, 46, 67], [200, 467, 133, 32], [214, 449, 87, 28], [67, 432, 25, 104], [396, 420, 31, 89], [177, 395, 22, 103], [133, 390, 15, 96], [266, 375, 8, 31], [1, 356, 7, 42], [336, 355, 27, 114], [221, 350, 95, 105], [243, 323, 17, 106], [155, 317, 68, 248], [110, 317, 43, 243], [22, 314, 12, 155], [199, 310, 13, 127], [302, 296, 83, 223], [276, 295, 20, 136], [311, 275, 30, 189], [177, 266, 8, 114], [88, 263, 34, 287], [221, 249, 9, 86], [441, 238, 9, 169], [110, 231, 9, 70], [44, 226, 16, 280], [310, 225, 8, 181], [199, 223, 53, 86], [370, 217, 37, 288], [249, 208, 25, 153], [177, 201, 61, 49], [281, 195, 15, 85], [133, 183, 16, 196], [177, 178, 96, 29], [155, 167, 35, 134], [345, 166, 18, 173], [200, 156, 81, 31], [1, 149, 17, 192], [386, 145, 18, 60], [305, 142, 36, 118], [66, 139, 26, 277], [149, 134, 168, 77], [111, 132, 45, 85], [88, 130, 36, 120], [350, 118, 35, 162], [165, 111, 134, 28], [262, 92, 85, 64], [414, 91, 35, 133], [129, 89, 119, 36], [22, 88, 42, 211], [92, 67, 256, 62], [47, 64, 75, 149], [349, 47, 80, 360], [132, 44, 257, 90], [13, 41, 56, 95], [66, 22, 273, 60], [198, 1, 215, 76], [74, 1, 109, 39]], "height": 566}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]'
 Binary files plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	1970-01-01 00:00:00 +0000 and plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	2016-06-15 10:46:42 +0000 differ
=== added file 'plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]'
 Binary files plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	1970-01-01 00:00:00 +0000 and plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	2016-06-15 10:46:42 +0000 differ
=== added file 'plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]'
--- plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	2016-06-15 10:46:42 +0000
@@ -0,0 +1,7 @@
+border.top: 222
+border.right: 222
+border.bottom: 222
+border.left: 222
+horizontalTileMode: Round
+verticalTileMode: Round
+source: "[e-mail]"
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]'
 Binary files plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	1970-01-01 00:00:00 +0000 and plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	2016-06-15 10:46:42 +0000 differ
=== added file 'plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]'
--- plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/assets/[e-mail]	2016-06-15 10:46:42 +0000
@@ -0,0 +1,7 @@
+border.top: 260
+border.right: 260
+border.bottom: 260
+border.left: 260
+horizontalTileMode: Round
+verticalTileMode: Round
+source: "[e-mail]"
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/plugin.cpp'
--- plugins/Ubuntu/Settings/Fingerprint/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/plugin.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "ubuntusettingsfingerprint.h"
+
+#include <QtQml/qqml.h>
+
+static QObject* fp_singletonprovider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    return new UbuntuSettingsFingerprint;
+}
+
+void UbuntuSettingsFingerprintPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterSingletonType<UbuntuSettingsFingerprint>(
+        uri, 0, 1, "UbuntuSettingsFingerprint", fp_singletonprovider
+    );
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/plugin.h'
--- plugins/Ubuntu/Settings/Fingerprint/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/plugin.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBUNTUSETTINGSFINGERPRINT_PLUGIN_H
+#define UBUNTUSETTINGSFINGERPRINT_PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class UbuntuSettingsFingerprintPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // UBUNTUSETTINGSFINGERPRINT_PLUGIN_H
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/qmldir'
--- plugins/Ubuntu/Settings/Fingerprint/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/qmldir	2016-06-15 10:46:42 +0000
@@ -0,0 +1,7 @@
+module Ubuntu.Settings.Fingerprint
+plugin UbuntuSettingsFingerprintQml
+
+Fingerprint 0.1 Fingerprint.qml
+Fingerprints 0.1 Fingerprints.qml
+FingerprintVisual 0.1 FingerprintVisual.qml
+Setup 0.1 Setup.qml
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/ubuntusettingsfingerprint.cpp'
--- plugins/Ubuntu/Settings/Fingerprint/ubuntusettingsfingerprint.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/ubuntusettingsfingerprint.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+#include <unistd.h>
+#include <sys/types.h>
+#include <QProcessEnvironment>
+
+#include "ubuntusettingsfingerprint.h"
+
+UbuntuSettingsFingerprint::UbuntuSettingsFingerprint(QObject* parent)
+    : QObject(parent)
+{
+}
+
+qlonglong UbuntuSettingsFingerprint::uid() const
+{
+    return qlonglong(getuid());
+}
+
+bool UbuntuSettingsFingerprint::debug() const
+{
+    return QProcessEnvironment::systemEnvironment().contains(
+        QLatin1String("USC_FINGERPRINT_DEBUG")
+    );
+}
 
=== added file 'plugins/Ubuntu/Settings/Fingerprint/ubuntusettingsfingerprint.h'
--- plugins/Ubuntu/Settings/Fingerprint/ubuntusettingsfingerprint.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/ubuntusettingsfingerprint.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+#ifndef UBUNTUSETTINGSFINGERPRINT_H
+#define UBUNTUSETTINGSFINGERPRINT_H
+
+#include <QObject>
+
+class UbuntuSettingsFingerprint : public QObject
+{
+    Q_OBJECT
+public:
+    explicit UbuntuSettingsFingerprint(QObject* parent = 0);
+
+    Q_PROPERTY(qlonglong uid READ uid CONSTANT)
+    Q_PROPERTY(bool debug READ debug CONSTANT)
+
+    qlonglong uid() const;
+    bool debug() const;
+};
+
+#endif // UBUNTUSETTINGSFINGERPRINT_H
 
=== added directory 'plugins/Ubuntu/Settings/Fingerprint/utils'
=== added file 'plugins/Ubuntu/Settings/Fingerprint/utils/segment.py'
--- plugins/Ubuntu/Settings/Fingerprint/utils/segment.py	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Settings/Fingerprint/utils/segment.py	2016-06-15 10:46:42 +0000
@@ -0,0 +1,84 @@
+#!/usr/bin/python2
+"""
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by  Florian Boucault <[e-mail]>
+ */
+"""
+
+import os.path
+import argparse
+import json
+import cv2
+
+parser = argparse.ArgumentParser(
+    description='Generates segmented version of img and extracts bbs.'
+)
+parser.add_argument('input_image', type=str,
+                    help='path to the image to segment')
+args = parser.parse_args()
+
+input_image = os.path.abspath(args.input_image)
+print("Segmenting %s..." % input_image)
+filename, _ = os.path.splitext(os.path.basename(input_image))
+split = filename.split('@')
+if len(split) != 1:
+    output_image = "%s_segmented@%s.png" % (split[0], split[1])
+    output_boxes = "%s_boxes.json" % split[0]
+else:
+    output_image = "%s_segmented.png" % filename
+    output_boxes = "%s_boxes.json" % filename
+
+img = cv2.imread(input_image, -1)
+img_boxes = img.copy()
+gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
+ret, thresh = cv2.threshold(gray, 0, 255, cv2.THRESH_BINARY)
+contours, hierarchy = cv2.findContours(
+    thresh, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_NONE
+)
+
+print("Detected %d segments." % len(contours))
+
+bounding_boxes = []
+for index, contour in enumerate(contours):
+    x, y, w, h = cv2.boundingRect(contour)
+    bounding_boxes.append((x, y, w, h))
+#  print(x, y, w, h)
+    cv2.rectangle(img_boxes,
+                  (x, y),
+                  (x + w, y + h),
+                  (255, 20, 20, 255), 1)
+    cv2.drawContours(thresh, contours, index, (index + 1),
+                     cv2.cv.CV_FILLED)
+    cv2.drawContours(thresh, contours, index, (index + 1), 2)
+
+b, g, r, a = cv2.split(img)
+img = cv2.merge([a, g, thresh])
+
+cv2.imwrite(output_image, img)
+print("Written segmented version of '%s' to '%s'" % (
+    args.input_image, output_image)
+)
+
+description = {"width": img.shape[1],
+               "height": img.shape[0],
+               "boxes": bounding_boxes}
+with open(output_boxes, 'w') as outfile:
+    json.dump(description, outfile)
+print("Written bounding boxes to '%s'" % output_boxes)
+
+cv2.imshow('image', img_boxes)
+cv2.waitKey(0)
+cv2.destroyAllWindows()
 
=== modified file 'po/ubuntu-settings-components.pot'
--- po/ubuntu-settings-components.pot	2016-05-19 17:52:21 +0000
+++ po/ubuntu-settings-components.pot	2016-06-15 10:46:42 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-settings-components\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-25 15:44+0200\n"
+"POT-Creation-Date: 2016-06-15 12:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -21,6 +21,105 @@
 msgid "Quick reply with:"
 msgstr ""
 
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml:80
+msgid "Fingerprint Name"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml:107
+msgid "Delete Fingerprint"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml:124
+msgid "Sorry, the fingerprint could not be deleted."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml:129
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:338
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:138
+#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:148
+msgid "OK"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:32
+msgid "Fingerprint ID"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:93
+#, qt-format
+msgid "Finger %1"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:188
+msgid "Passcode required"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:192
+msgid "You must set a passcode to use fingerprint ID"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:199
+msgid "Set Passcode…"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:275
+msgid "Add fingerprint"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:288
+msgid "Remove All…"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:303
+msgid "Are you sure you want to forget all stored fingerprints?"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:312
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:358
+#: plugins/Ubuntu/Settings/Vpn/DialogFile.qml:161
+#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:135
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:104
+msgid "Cancel"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:319
+#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:84
+msgid "Remove"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml:333
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:103
+msgid "Sorry, the reader doesn’t seem to be working."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:61
+msgid "Lift and press your finger again."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:78
+msgid "Keep your finger on the reader for longer."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:94
+msgid "Back"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:131
+msgid "All done!"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:297
+msgid "Place your finger on the home button."
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:311
+#, qt-format
+msgid "%1%"
+msgstr ""
+
+#: plugins/Ubuntu/Settings/Fingerprint/Setup.qml:383
+msgid "Next"
+msgstr ""
+
 #: plugins/Ubuntu/Settings/Menus/CalendarMenu.qml:57
 #, qt-format
 msgctxt "%1=month name, %2=4-digit year"
@@ -48,12 +147,6 @@
 msgid "Message"
 msgstr ""
 
-#: plugins/Ubuntu/Settings/Vpn/DialogFile.qml:161
-#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:134
-#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:104
-msgid "Cancel"
-msgstr ""
-
 #: plugins/Ubuntu/Settings/Vpn/DialogFile.qml:170
 msgid "Accept"
 msgstr ""
@@ -358,14 +451,10 @@
 msgid "Your Wi-Fi/mobile provider can track your use of any other services. "
 msgstr ""
 
-#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:26
+#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:25
 msgid "Set up VPN"
 msgstr ""
 
-#: plugins/Ubuntu/Settings/Vpn/VpnEditor.qml:147
-msgid "OK"
-msgstr ""
-
 #: plugins/Ubuntu/Settings/Vpn/VpnList.qml:62
 msgid "Delete configuration"
 msgstr ""
@@ -380,10 +469,6 @@
 msgid "VPN"
 msgstr ""
 
-#: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:84
-msgid "Remove"
-msgstr ""
-
 #: plugins/Ubuntu/Settings/Vpn/VpnPreviewDialog.qml:96
 msgid "Change"
 msgstr ""
 
=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2016-03-09 14:04:14 +0000
+++ tests/qmltests/CMakeLists.txt	2016-06-15 10:46:42 +0000
@@ -1,6 +1,8 @@
 # add_qml_test macro
 include(QmlTest)
 
+add_subdirectory(mocks)
+
 set(qmltest_DEFAULT_TARGETS qmluitests)
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
 set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
@@ -40,3 +42,8 @@
 add_qml_test(Vpn VpnPptpEditor)
 add_qml_test(Vpn VpnPreviewDialogCertificateChecks)
 add_qml_test(Vpn VpnPreviewDialog ENVIRONMENT NO_SSL_CERTIFICATE_CHECK=1)
+
+add_qml_test(Fingerprint Fingerprints IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/mocks)
+add_qml_test(Fingerprint FingerprintNames IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/mocks)
+add_qml_test(Fingerprint FingerprintSetup IMPORT_PATHS ${CMAKE_CURRENT_BINARY_DIR}/mocks)
+add_qml_test(Fingerprint FingerprintVisual)
 
=== added directory 'tests/qmltests/Fingerprint'
=== added file 'tests/qmltests/Fingerprint/tst_FingerprintNames.qml'
--- tests/qmltests/Fingerprint/tst_FingerprintNames.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Fingerprint/tst_FingerprintNames.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,364 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Test 0.1
+import Ubuntu.Settings.Fingerprint 0.1
+import Ubuntu.Components 1.3
+import Biometryd 0.0
+import GSettings 1.0
+
+Item {
+    id: testRoot
+    width: units.gu(50)
+    height: units.gu(90)
+
+    PageStack {
+        id: pageStack
+    }
+
+    Component {
+        id: fingerprintsComponent
+
+        Fingerprints {
+            anchors.fill: parent
+            visible: false
+        }
+    }
+
+    Component {
+        id: fingerprintComponent
+
+        Fingerprint {
+            anchors.fill: parent
+            visible: false
+        }
+    }
+
+    Component {
+        id: gsettingsComponent
+
+        GSettings {
+            schema.id: "com.ubuntu.touch.system"
+        }
+    }
+
+    UbuntuTestCase {
+        name: "TestOverview"
+        when: windowShown
+
+        property var pageInstance: null
+        property var gsettingsInstance: null
+
+        function getTemplateEntry(i) {
+            var id = "fingerprintInstance-" + i;
+            return findChild(pageInstance, id);
+        }
+
+        function getListObserver() {
+            return findInvisibleChild(pageInstance, "listObserver");
+        }
+
+        function getRemovalObserver() {
+            return findInvisibleChild(pageInstance, "removalObserver");
+        }
+
+        function getClearanceObserver() {
+            return findInvisibleChild(pageInstance, "clearanceObserver");
+        }
+
+        function getEnrollmentObserver() {
+            return findInvisibleChild(pageInstance, "enrollmentObserver");
+        }
+
+        function initTestCase() {
+            Biometryd.setAvailable(true);
+        }
+
+        function init() {
+            gsettingsInstance = gsettingsComponent.createObject(testRoot);
+            pageInstance = fingerprintsComponent.createObject(testRoot, {
+                _settings: gsettingsInstance,
+                passcodeSet: true
+            });
+            pageStack.push(pageInstance);
+        }
+
+        function test_listSort() {
+            GSettingsController.setFingerprintNames({
+                "first": "A finger",
+                "second": "Big finger",
+                "last": "Zmall finger",
+            });
+            compare(getTemplateEntry(0).title.text, "A finger");
+            compare(getTemplateEntry(1).title.text, "Big finger");
+            compare(getTemplateEntry(2).title.text, "Zmall finger");
+        }
+
+        function test_remoteRemoval() {
+            GSettingsController.setFingerprintNames({
+                "tmplId": "name"
+            });
+            verify(getTemplateEntry(0));
+
+            GSettingsController.setFingerprintNames({});
+            verify(!getTemplateEntry(0));
+        }
+
+        function test_remoteAddition() {
+            GSettingsController.setFingerprintNames({
+                "tmplId": "name"
+            });
+            verify(getTemplateEntry(0));
+
+            GSettingsController.setFingerprintNames({
+                "tmplId": "name",
+                "tmplId2": "name2"
+            });
+            verify(getTemplateEntry(0));
+            verify(getTemplateEntry(1));
+        }
+
+        function test_remoteRename() {
+            GSettingsController.setFingerprintNames({
+                "tmplId": "My finger",
+            });
+            compare(getTemplateEntry(0).title.text, "My finger");
+            GSettingsController.setFingerprintNames({
+                "tmplId": "Your finger",
+            });
+            compare(getTemplateEntry(0).title.text, "Your finger");
+        }
+
+        function test_localRemoval() {
+            GSettingsController.setFingerprintNames({
+                "tmplId": "name"
+            });
+            verify(getTemplateEntry(0));
+            pageInstance.removeTemplate("tmplId");
+            verify(!getTemplateEntry(0));
+        }
+
+        function test_localAddition() {
+            pageInstance.addTemplate("tmplId", "My finger");
+            verify(getTemplateEntry(0));
+            compare(getTemplateEntry(0).title.text, "My finger");
+        }
+
+        function test_localRename() {
+            GSettingsController.setFingerprintNames({
+                "tmplId": "My finger"
+            });
+            pageInstance.renameTemplate("tmplId", "Your finger");
+            verify(getTemplateEntry(0));
+            compare(getTemplateEntry(0).title.text, "Your finger");
+        }
+
+        function test_createTemplateName() {
+            GSettingsController.setFingerprintNames({
+                "tmplId": i18n.dtr("ubuntu-settings-components", "Finger %1").arg(1)
+            });
+            compare(pageInstance.createTemplateName(), i18n.dtr("ubuntu-settings-components", "Finger %1").arg(2));
+            pageInstance.renameTemplate("tmplId", i18n.dtr("ubuntu-settings-components", "Finger %1").arg(2));
+            compare(pageInstance.createTemplateName(), i18n.dtr("ubuntu-settings-components", "Finger %1").arg(1));
+        }
+
+        function test_assignNames() {
+            var templateIds = ["tmplId0", "tmplId1", "tmplId2"];
+
+            // This name shouldn't be overwritten
+            GSettingsController.setFingerprintNames({
+                "tmplId1": "My finger"
+            });
+
+            getListObserver().mockList(templateIds, "");
+
+            verify(getTemplateEntry(0));
+            compare(getTemplateEntry(0).title.text, i18n.dtr("ubuntu-settings-components", "Finger %1").arg(1));
+
+            verify(getTemplateEntry(1));
+            compare(getTemplateEntry(1).title.text, i18n.dtr("ubuntu-settings-components", "Finger %1").arg(2));
+
+            verify(getTemplateEntry(2));
+            compare(getTemplateEntry(2).title.text, "My finger");
+        }
+
+        function test_serviceRemoval() {
+            GSettingsController.setFingerprintNames({
+                "tmplId": "A finger"
+            });
+            getRemovalObserver().mockRemoval("tmplId", "");
+            verify(!getTemplateEntry(0));
+            compare(GSettingsController.fingerprintNames(), {});
+        }
+
+        function test_serviceEnrollment() {
+            GSettingsController.setFingerprintNames({
+                "tmplId1": "Existing finger"
+            });
+            getEnrollmentObserver().mockEnroll("tmplId2", "");
+
+            verify(getTemplateEntry(0));
+            compare(getTemplateEntry(0).title.text, "Existing finger");
+
+            verify(getTemplateEntry(1));
+            compare(getTemplateEntry(1).title.text, i18n.dtr("ubuntu-settings-components", "Finger %1").arg(1));
+        }
+
+        function test_serviceEnrollmentFirstRun() {
+            var targetName = i18n.dtr("ubuntu-settings-components", "Finger %1").arg(1);
+
+            // A test where the template id is 0.
+            getEnrollmentObserver().mockEnroll(0, "");
+
+            verify(getTemplateEntry(0));
+            compare(getTemplateEntry(0).title.text, targetName);
+        }
+
+        function test_serviceEnrollmentReusesId() {
+            // Test a case where enrollment processes re-uses the template id
+            // Hopefully this will never happen, but it currently does in testing,
+            // so test it.
+            var targetName = i18n.dtr("ubuntu-settings-components", "Finger %1").arg(1);
+
+            getEnrollmentObserver().mockEnroll(0, "");
+            verify(getTemplateEntry(0));
+            compare(getTemplateEntry(0).title.text, targetName);
+
+            // Re-enroll same id, make sure it doesn't change the name
+            getEnrollmentObserver().mockEnroll(0, "");
+            verify(getTemplateEntry(0));
+            compare(getTemplateEntry(0).title.text, targetName);
+
+        }
+
+        function test_serviceClearance() {
+            GSettingsController.setFingerprintNames({
+                "tmplId1": "A finger",
+                "tmplId2": "My finger"
+            });
+            getClearanceObserver().mockClearance("");
+
+            verify(!getTemplateEntry(0));
+            compare(GSettingsController.fingerprintNames(), {});
+        }
+
+        function cleanup() {
+            pageStack.pop();
+            GSettingsController.setFingerprintNames({});
+            gsettingsInstance.destroy();
+            gsettingsInstance = null;
+            pageInstance.destroy();
+            pageInstance = null;
+        }
+    }
+
+    SignalSpy {
+        id: requestDeletionSpy
+        signalName: "requestDeletion"
+    }
+
+    SignalSpy {
+        id: requestRenameSpy
+        signalName: "requestRename"
+    }
+
+    UbuntuTestCase {
+        name: "TestTemplate"
+        when: windowShown
+
+        property var templateInstance: null
+
+        function getDeleteButton() {
+            return findChild(templateInstance, "templateDelete");
+        }
+
+        function getHeader() {
+            return findChild(templateInstance, "templateHeader");
+        }
+
+        function getNameInput() {
+            return findChild(templateInstance, "nameInput");
+        }
+
+        function getFailedDialog() {
+            return findChild(testRoot, "fingerprintDeletionFailedDialog");
+        }
+
+        function getFailedDialogOk() {
+            return findChild(testRoot, "fingerprintDeleteionFailedOk");
+        }
+
+        function init() {
+            templateInstance = fingerprintComponent.createObject(testRoot);
+            pageStack.push(templateInstance);
+            requestRenameSpy.target = templateInstance;
+            requestDeletionSpy.target = templateInstance;
+        }
+
+        function cleanup() {
+            requestRenameSpy.clear();
+            requestDeletionSpy.clear();
+            pageStack.pop();
+            templateInstance.destroy();
+            templateInstance = null;
+        }
+
+        function test_name() {
+            templateInstance.name = "My finger";
+            compare(getHeader().title, "My finger");
+            compare(getNameInput().text, "My finger");
+        }
+
+        function test_requestDeletion() {
+            templateInstance.templateId = "tmplId";
+            var button = getDeleteButton();
+            mouseClick(button, button.width / 2, button.height / 2);
+            requestDeletionSpy.wait();
+            compare(requestDeletionSpy.count, 1);
+            compare(requestDeletionSpy.signalArguments[0][0], "tmplId");
+        }
+
+        function test_requestRename() {
+            templateInstance.templateId = "tmplId";
+            templateInstance.name = "My finger";
+            requestRenameSpy.clear();
+
+            getNameInput().text = "Your finger";
+            requestRenameSpy.wait();
+            compare(requestRenameSpy.count, 1);
+            compare(requestRenameSpy.signalArguments[0][0], "tmplId");
+            compare(requestRenameSpy.signalArguments[0][1], "Your finger");
+        }
+
+        function test_deletionFailed() {
+            templateInstance.deletionFailed();
+            tryCompareFunction(function () {
+                return !!getFailedDialog();
+            }, true);
+
+            var button = getFailedDialogOk();
+            mouseClick(button, button.width / 2, button.height / 2);
+
+            tryCompareFunction(function () {
+                return !!getFailedDialog();
+            }, false);
+        }
+    }
+}
 
=== added file 'tests/qmltests/Fingerprint/tst_FingerprintSetup.qml'
--- tests/qmltests/Fingerprint/tst_FingerprintSetup.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Fingerprint/tst_FingerprintSetup.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,236 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Settings.Fingerprint 0.1
+import Ubuntu.Test 0.1
+import Biometryd 0.0
+
+Item {
+    id: testRoot
+    width: units.gu(50)
+    height: units.gu(90)
+
+    Component {
+        id: setupComponent
+
+        Setup {
+            anchors.fill: parent
+            visible: false
+        }
+    }
+
+    PageStack {
+        id: pageStack
+    }
+
+    SignalSpy {
+        id: statusLabelSpy
+        signalName: "slideCompleted"
+    }
+
+    SignalSpy {
+        id: enrollmentObserverProgressedSpy
+        signalName: "progressed"
+    }
+
+    SignalSpy {
+        id: enrollmentObserverSucceededSpy
+        signalName: "succeeded"
+    }
+
+    SignalSpy {
+        id: enrollmentObserverFailedSpy
+        signalName: "failed"
+    }
+
+    UbuntuTestCase {
+        name: "SetupUI"
+        when: windowShown
+
+        property var setupInstance: null
+
+        function init() {
+            Biometryd.setAvailable(true);
+            setupInstance = setupComponent.createObject(testRoot);
+            pageStack.push(setupInstance);
+
+            statusLabelSpy.target = getStatusLabel();
+        }
+
+        function cleanup() {
+            statusLabelSpy.clear();
+
+            pageStack.pop();
+            setupInstance.destroy();
+            setupInstance = null
+        }
+
+        function getStatusLabel() {
+            return findChild(setupInstance, "fingerprintStatusLabel");
+        }
+
+        function getFailedVisual() {
+            return findChild(setupInstance, "fingerprintFailedVisual");
+        }
+
+        function getDefaultVisual() {
+            return findChild(setupInstance, "fingerprintDefaultVisual");
+        }
+
+        function getDoneVisual() {
+            return findChild(setupInstance, "fingerprintDoneVisual");
+        }
+
+        function getProgressLabel() {
+            return findChild(setupInstance, "fingerprintProgressLabel");
+        }
+
+        function test_initialState() {
+            var targetText = i18n.dtr("ubuntu-settings-components", "Place your finger on the home button.");
+            compare(getStatusLabel().text, targetText);
+
+            tryCompare(getDefaultVisual(), "opacity", 1);
+            tryCompare(getFailedVisual(), "opacity", 0);
+            tryCompare(getDoneVisual(), "opacity", 0);
+        }
+
+        function test_startedState() {
+            var targetText = i18n.dtr("ubuntu-settings-components", "Lift and press your finger again.");
+            setupInstance.enrollmentProgressed(0.5, {});
+            statusLabelSpy.wait();
+            compare(getStatusLabel().text, targetText);
+
+            tryCompare(getDefaultVisual(), "opacity", 1);
+            tryCompare(getFailedVisual(), "opacity", 0);
+            tryCompare(getDoneVisual(), "opacity", 0);
+        }
+
+        function test_failedStatus() {
+            var targetText = i18n.dtr("ubuntu-settings-components", "Sorry, the reader doesn’t seem to be working.");
+            setupInstance.enrollmentFailed("test failure");
+            compare(getStatusLabel().text, targetText);
+
+            tryCompare(getDefaultVisual(), "opacity", 0);
+            tryCompare(getFailedVisual(), "opacity", 1);
+            tryCompare(getDoneVisual(), "opacity", 0);
+        }
+
+        function test_successfulState() {
+            var targetText = i18n.dtr("ubuntu-settings-components", "All done!");
+
+            setupInstance.enrollmentCompleted();
+            compare(getStatusLabel().text, targetText);
+
+            tryCompare(getDefaultVisual(), "opacity", 0);
+            tryCompare(getFailedVisual(), "opacity", 0);
+            tryCompare(getDoneVisual(), "opacity", 1);
+
+            var button = findChild(pageStack, "fingerprintSetupDoneButton");
+            compare(button.enabled, true, "button was disabled when done");
+        }
+
+        function test_notDone() {
+            var button = findChild(pageStack, "fingerprintSetupDoneButton");
+            compare(button.enabled, false, "button was enabled initially");
+        }
+
+        function test_statusLabel() {
+            getStatusLabel().setText("foo");
+            statusLabelSpy.wait();
+            compare(getStatusLabel().text, "foo");
+        }
+
+        function test_direction_data() {
+            return [
+                { tag: "empty", visual: { visible: false, rotation: 0 }},
+                { tag: "not available", dir: FingerprintReader.NotAvailable, visual: { visible: false, rotation: 0 }},
+                { tag: "SouthWest", dir: FingerprintReader.SouthWest, visual: { visible: true, rotation: 225 }},
+                { tag: "South", dir: FingerprintReader.South, visual: { visible: true, rotation: 180 }},
+                { tag: "SouthEast", dir: FingerprintReader.SouthEast, visual: { visible: true, rotation: 135 }},
+                { tag: "NorthWest", dir: FingerprintReader.NorthWest, visual: { visible: true, rotation: 315 }},
+                { tag: "North", dir: FingerprintReader.North, visual: { visible: true, rotation: 0 }},
+                { tag: "NorthEast", dir: FingerprintReader.NorthEast, visual: { visible: true, rotation: 45 }},
+                { tag: "East", dir: FingerprintReader.East, visual: { visible: true, rotation: 90 }},
+                { tag: "West", dir: FingerprintReader.West, visual: { visible: true, rotation: 270 }}
+            ]
+        }
+
+        function test_direction(data) {
+            var vis = findChild(setupInstance, "fingerprintDirectionVisual");
+            var hints = {};
+            hints[FingerprintReader.suggestedNextDirection] = data.dir;
+
+            setupInstance.enrollmentProgressed(0.5, hints);
+
+            tryCompare(vis, "opacity", data.visual.visible ? 1 : 0)
+            compare(vis.opacity, data.visual.visible ? 1 : 0);
+            compare(vis.rotation, data.visual.rotation);
+        }
+
+        function test_progressHidden() {
+            var pl = getProgressLabel();
+            compare(pl.opacity, 0);
+        }
+
+        function test_progressVisible() {
+            var pl = getProgressLabel();
+            setupInstance.enrollmentProgressed(0.5, {});
+            tryCompare(pl, "opacity", 1);
+            tryCompare(pl, "text", i18n.dtr("ubuntu-settings-components", "%1%").arg(50));
+        }
+
+        function test_progressReadable() {
+            setupInstance.enrollmentProgressed(0.6666666667, {});
+            tryCompare(getProgressLabel(), "text", i18n.dtr("ubuntu-settings-components", "%1%").arg(66));
+        }
+
+        // This is a visual test where we can confirm that the arrow
+        // rotates using the orthodromic distance.
+        function test_directions() {
+            var hints = {};
+
+            hints[FingerprintReader.suggestedNextDirection] = FingerprintReader.North;
+            setupInstance.enrollmentProgressed(0.6666666667, hints);
+            wait(200)
+            hints[FingerprintReader.suggestedNextDirection] = FingerprintReader.East;
+            setupInstance.enrollmentProgressed(0.6666666667, hints);
+            wait(200)
+            hints[FingerprintReader.suggestedNextDirection] = FingerprintReader.South;
+            setupInstance.enrollmentProgressed(0.6666666667, hints);
+            wait(200)
+            hints[FingerprintReader.suggestedNextDirection] = FingerprintReader.West;
+            setupInstance.enrollmentProgressed(0.6666666667, hints);
+            wait(200)
+            hints[FingerprintReader.suggestedNextDirection] = FingerprintReader.SouthEast;
+            setupInstance.enrollmentProgressed(0.6666666667, hints);
+            wait(200)
+            hints[FingerprintReader.suggestedNextDirection] = FingerprintReader.NorthEast;
+            setupInstance.enrollmentProgressed(0.6666666667, hints);
+            wait(200)
+            hints[FingerprintReader.suggestedNextDirection] = FingerprintReader.NorthWest;
+            setupInstance.enrollmentProgressed(0.6666666667, hints);
+            wait(200)
+            hints[FingerprintReader.suggestedNextDirection] = FingerprintReader.NorthEast;
+            setupInstance.enrollmentProgressed(0.6666666667, hints);
+            wait(200)
+        }
+    }
+}
 
=== added file 'tests/qmltests/Fingerprint/tst_FingerprintVisual.qml'
--- tests/qmltests/Fingerprint/tst_FingerprintVisual.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Fingerprint/tst_FingerprintVisual.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Settings.Fingerprint 0.1
+import Ubuntu.Test 0.1
+
+Item {
+    id: testRoot
+    width: units.gu(50)
+    height: units.gu(90)
+
+    SignalSpy {
+        id: visualReadySpy
+        signalName: "ready"
+    }
+
+    Component {
+        id: fingerprintVisualComp
+
+        FingerprintVisual {
+            id: vis
+            objectName: "fingerprintVisual"
+            width: 400
+            height: width * 1.227
+        }
+    }
+
+
+    UbuntuTestCase {
+        name: "FingerprintVisual"
+        when: windowShown
+
+        function init() {
+            visualReadySpy.target = fingerprintVisualComp.createObject(testRoot);
+            visualReadySpy.wait()
+        }
+
+        function cleanup() {
+            findChild(testRoot, "fingerprintVisual").destroy();
+        }
+
+        function test_masks_data() {
+            return [
+                { masks: null, targetMasks: [], tag: "null" },
+                { masks: [], targetMasks: [], tag: "no masks" },
+                {
+                    masks: [{x: 0, y: 0, width: 0, height: 0 }],
+                    targetMasks: [{x: 0, y: 0, width: 0, height: 0}],
+                    tag: "0"
+                },
+                {
+                    masks: [
+                        {x: null, y: "-a", width: "0x1", height: true },
+                        {},
+                    ],
+                    targetMasks: [],
+                    tag: "bad values"
+                },
+
+                // Masks for manual, visual checks.
+                {
+                    masks: [
+                        {x: 0, y: 0, width: 0.5, height: 0.5 }
+                    ],
+                    visualCheck: true,
+                    tag: "top right corner"
+                },
+                {
+                    masks: [
+                        {x: 0.5, y: 0, width: 0.5, height: 0.5 }
+                    ],
+                    visualCheck: true,
+                    tag: "top left corner"
+                },
+                {
+                    masks: [
+                        {x: 0, y: 0.5, width: 0.5, height: 0.5 }
+                    ],
+                    visualCheck: true,
+                    tag: "bottom right corner"
+                },
+                {
+                    masks: [
+                        {x: 0.5, y: 0.5, width: 0.5, height: 0.5 }
+                    ],
+                    visualCheck: true,
+                    tag: "bottom left corner"
+                },
+                {
+                    masks: [
+                        {x: 0, y: 0, width: 0.5, height: 0.5 },
+                        {x: 0.5, y: 0, width: 0.5, height: 0.5 },
+                        {x: 0, y: 0.5, width: 0.5, height: 0.5 },
+                        {x: 0.5, y: 0.5, width: 0.5, height: 0.5 }
+                    ],
+                    visualCheck: true,
+                    tag: "all corners"
+                }
+            ]
+        }
+
+        function test_masks (data) {
+            var vis = findChild(testRoot, "fingerprintVisual");
+            vis.masks = data.masks;
+            if (data.visualCheck) {
+                wait(1000);
+            } else {
+                var actualMasks = vis.getMasksToEnroll();
+                var targetMasks = data.targetMasks;
+                compare(actualMasks.length, targetMasks.length);
+            }
+        }
+    }
+}
 
=== added file 'tests/qmltests/Fingerprint/tst_Fingerprints.qml'
--- tests/qmltests/Fingerprint/tst_Fingerprints.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Fingerprint/tst_Fingerprints.qml	2016-06-15 10:46:42 +0000
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Jonas G. Drange <[e-mail]>
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Test 0.1
+import Ubuntu.Settings.Fingerprint 0.1
+import Biometryd 0.0
+import GSettings 1.0
+
+Item {
+    id: testRoot
+    width: units.gu(50)
+    height: units.gu(90)
+
+    Component {
+        id: fingerprintsComponent
+
+        Fingerprints {
+            anchors.fill: parent
+        }
+    }
+
+    SignalSpy {
+        id: spy
+    }
+
+    UbuntuTestCase {
+        name: "FingerprintPanel"
+        when: windowShown
+
+        property var fingerprintsInstance: null
+
+        function init() {
+            Biometryd.setAvailable(true);
+            fingerprintsInstance = fingerprintsComponent.createObject(testRoot);
+        }
+
+        function cleanup() {
+            spy.clear();
+            spy.target = null;
+            spy.signalName = "";
+            fingerprintsInstance.destroy();
+            GSettingsController.setFingerprintNames({});
+        }
+
+        function getClearanceObserver() {
+            return findInvisibleChild(fingerprintsInstance, "clearanceObserver");
+        }
+
+        function getListObserver() {
+            return findInvisibleChild(fingerprintsInstance, "listObserver");
+        }
+
+        function getEnrollmentObserver() {
+            return findInvisibleChild(fingerprintsInstance, "enrollmentObserver");
+        }
+
+        function getRemovalObserver() {
+            return findInvisibleChild(fingerprintsInstance, "removalObserver");
+        }
+
+        function getBrokenDialog() {
+            return findChild(testRoot, "fingerprintReaderBrokenDialog");
+        }
+
+        function getBrokenDialogOk() {
+            return findChild(testRoot, "fingerprintReaderBrokenDialogOK");
+        }
+
+        function getAddFingerprintItem() {
+            return findChild(fingerprintsInstance, "fingerprintAddListItemLayout");
+        }
+
+        function getRemoveAllButton() {
+            return findChild(fingerprintsInstance, "fingerprintRemoveAllButton");
+        }
+
+        function getFingerprintsList() {
+            return findChild(fingerprintsInstance, "fingerprintsList");
+        }
+
+        function getSetupEntry() {
+            return findChild(fingerprintsInstance, "fingerprintSetupEntry");
+        }
+
+        function test_failures_data() {
+            return [
+                { tag: "clearance", observer: getClearanceObserver, mock: "mockClearance", mockArgs: ["failed"] },
+                { tag: "list", observer: getListObserver, mock: "mockList", mockArgs: [[], "failed"] }
+            ]
+        }
+
+        function test_failures(data) {
+            var obs = data.observer();
+            spy.signalName = "failed";
+            spy.target = obs;
+            obs[data.mock].apply(null, data.mockArgs);
+            spy.wait();
+            var errorDiag = getBrokenDialog();
+            var ok = getBrokenDialogOk();
+            mouseClick(ok, ok.width / 2, ok.height / 2);
+
+            // Halt testing until dialog has been destroyed.
+            tryCompareFunction(function() {
+                return getBrokenDialog();
+            }, null);
+        }
+
+        function test_noPasscode() {
+            fingerprintsInstance.passcodeSet = false;
+            compare(fingerprintsInstance.state, "noPasscode");
+
+            var setButton = findChild(fingerprintsInstance, "fingerprintSetPasscodeButton");
+            compare(setButton.visible, true);
+
+            var setupEntry = getSetupEntry();
+            compare(setupEntry.enabled, false);
+
+            var fingerprintsList = getFingerprintsList();
+            compare(fingerprintsList.enabled, false);
+        }
+
+        function test_noScanner() {
+            fingerprintsInstance.passcodeSet = true;
+            Biometryd.setAvailable(false);
+            compare(fingerprintsInstance.state, "noScanner");
+
+            var addItem = getAddFingerprintItem();
+            compare(addItem.enabled, false);
+
+            var removeButton = getRemoveAllButton();
+            compare(removeButton.enabled, false);
+
+            var fingerprintsList = getFingerprintsList();
+            compare(fingerprintsList.visible, false);
+        }
+
+        function test_passcode() {
+            fingerprintsInstance.passcodeSet = true;
+            compare(fingerprintsInstance.state, "");
+            var setButton = findChild(fingerprintsInstance, "fingerprintSetPasscodeButton");
+            compare(setButton.visible, false);
+            var setupEntry = getSetupEntry();
+            compare(setupEntry.enabled, true);
+        }
+
+        function test_changePasscode() {
+            fingerprintsInstance.passcodeSet = false;
+            var setButton = findChild(fingerprintsInstance, "fingerprintSetPasscodeButton");
+
+            spy.signalName = "requestPasscode"
+            spy.target = fingerprintsInstance;
+            mouseClick(setButton, setButton.width / 2, setButton.height / 2);
+            spy.wait();
+
+            compare(spy.count, 1);
+        }
+
+        function test_setup() {
+            fingerprintsInstance.passcodeSet = false;
+            var add = getAddFingerprintItem();
+            var remove = getRemoveAllButton();
+            compare(add.enabled, false);
+            compare(remove.enabled, false);
+        }
+
+        function test_noRemove() {
+            fingerprintsInstance.passcodeSet = true;
+            GSettingsController.setFingerprintNames({});
+            var remove = getRemoveAllButton();
+            compare(remove.enabled, false);
+        }
+
+        function test_remove() {
+            fingerprintsInstance.passcodeSet = true;
+            GSettingsController.setFingerprintNames({"tmplId": "A Finger"});
+
+            var remove = getRemoveAllButton();
+            mouseClick(remove, remove.width / 2, remove.height / 2);
+            var diag = findChild(testRoot, "fingerprintRemoveAllDialog");
+            var confirm = findChild(diag, "fingerprintRemoveAllConfirmationButton");
+            compare(confirm.visible, true);
+            mouseClick(confirm, confirm.width / 2, confirm.height / 2);
+
+            var obs = getClearanceObserver();
+            spy.signalName = "succeeded";
+            spy.target = obs;
+            obs.mockClearance("");
+            spy.wait();
+            compare(spy.count, 1);
+
+            // Wait for dialog destruction (which is required for other tests)
+            // to function.
+            tryCompareFunction(function() {
+                return findChild(testRoot, "fingerprintRemoveAllDialog");
+            }, null);
+        }
+
+        function test_enrollmentSucceeded() {
+            var obs = getEnrollmentObserver();
+            var targetFingerprintName = i18n.dtr("ubuntu-settings-components", "Finger %1").arg(1);
+            spy.signalName = "succeeded";
+            spy.target = obs;
+            obs.mockEnroll("tmplId", "");
+            spy.wait();
+            compare(spy.count, 1);
+            compare(spy.signalArguments[0][0], "tmplId");
+
+            tryCompareFunction(function() {
+                return GSettingsController.fingerprintNames()["tmplId"];
+            }, targetFingerprintName);
+        }
+    }
+}
 
=== added directory 'tests/qmltests/mocks'
=== added directory 'tests/qmltests/mocks/Biometryd'
=== added file 'tests/qmltests/mocks/Biometryd/CMakeLists.txt'
--- tests/qmltests/mocks/Biometryd/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/CMakeLists.txt	2016-06-15 10:46:42 +0000
@@ -0,0 +1,20 @@
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(MOCK_BIOMETRYD_SOURCES
+    plugin.cpp
+    MockDevice.cpp
+    MockFingerprintReader.cpp
+    MockObserver.cpp
+    MockOperation.cpp
+    MockService.cpp
+    MockTemplateStore.cpp
+    MockUser.cpp
+)
+
+add_library(MockBiometryd MODULE ${MOCK_BIOMETRYD_SOURCES})
+
+qt5_use_modules(MockBiometryd Qml Quick Core)
+
+add_usc_mock(Biometryd 0.0 Biometryd TARGETS MockBiometryd)
 
=== added file 'tests/qmltests/mocks/Biometryd/MockDevice.cpp'
--- tests/qmltests/mocks/Biometryd/MockDevice.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockDevice.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockDevice.h"
+
+MockDevice::MockDevice(QObject *parent)
+    : QObject(parent)
+    , m_ts(new MockTemplateStore(this))
+{
+}
+
+MockTemplateStore* MockDevice::templateStore()
+{
+    return m_ts;
+}
+
+#include "MockDevice.moc"
 
=== added file 'tests/qmltests/mocks/Biometryd/MockDevice.h'
--- tests/qmltests/mocks/Biometryd/MockDevice.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockDevice.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_DEVICE_H
+#define MOCK_DEVICE_H
+
+#include <QObject>
+#include "MockTemplateStore.h"
+
+class MockDevice : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockDevice)
+
+public:
+    explicit MockDevice(QObject *parent = 0);
+    Q_PROPERTY(MockTemplateStore* templateStore READ templateStore CONSTANT)
+
+    MockTemplateStore* templateStore();
+
+private:
+    MockTemplateStore* m_ts;
+};
+
+#endif // MOCK_DEVICE_H
 
=== added file 'tests/qmltests/mocks/Biometryd/MockFingerprintReader.cpp'
--- tests/qmltests/mocks/Biometryd/MockFingerprintReader.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockFingerprintReader.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockFingerprintReader.h"
+
+MockFingerprintReader::MockFingerprintReader(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QString MockFingerprintReader::isFingerPresent() const
+{
+    return "isFingerPresent";
+}
+
+QString MockFingerprintReader::hasMainClusterIdentified() const
+{
+    return "hasMainClusterIdentified";
+}
+
+QString MockFingerprintReader::suggestedNextDirection() const
+{
+    return "suggestedNextDirection";
+}
+
+QString MockFingerprintReader::estimatedFingerSize() const
+{
+    return "estimatedFingerSize";
+}
+
+QString MockFingerprintReader::masks() const
+{
+    return "masks";
+}
+
+#include "MockFingerprintReader.moc"
 
=== added file 'tests/qmltests/mocks/Biometryd/MockFingerprintReader.h'
--- tests/qmltests/mocks/Biometryd/MockFingerprintReader.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockFingerprintReader.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_FINGERPRINTREADER_H
+#define MOCK_FINGERPRINTREADER_H
+
+#include <QObject>
+#include <QString>
+#include <QVariant>
+#include <QList>
+#include <QRect>
+
+class MockFingerprintReader : public QObject
+
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockFingerprintReader)
+    Q_ENUMS(Direction)
+    Q_PROPERTY(QString isFingerPresent READ isFingerPresent)
+    Q_PROPERTY(QString hasMainClusterIdentified READ hasMainClusterIdentified)
+    Q_PROPERTY(QString suggestedNextDirection READ suggestedNextDirection)
+    Q_PROPERTY(QString masks READ masks)
+
+public:
+    explicit MockFingerprintReader(QObject *parent = 0);
+
+    enum class Direction
+    {
+        NotAvailable,
+        SouthWest,
+        South,
+        SouthEast,
+        NorthWest,
+        North,
+        NorthEast,
+        East,
+        West
+    };
+
+    Q_INVOKABLE QString isFingerPresent() const;
+    Q_INVOKABLE QString hasMainClusterIdentified() const;
+    Q_INVOKABLE QString suggestedNextDirection() const;
+    Q_INVOKABLE QString estimatedFingerSize() const;
+    Q_INVOKABLE QString masks() const;
+
+
+Q_SIGNALS:
+    void succeeded(const QVariant &result);
+    void failed(const QString &reason);
+};
+
+#endif // MOCK_FINGERPRINTREADER_H
 
=== added file 'tests/qmltests/mocks/Biometryd/MockObserver.cpp'
--- tests/qmltests/mocks/Biometryd/MockObserver.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockObserver.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockObserver.h"
+
+class Result : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(unsigned int uid READ uid CONSTANT)
+
+public:
+    explicit Result(unsigned int uid, QObject *parent = 0)
+        : QObject(parent), m_uid(uid)
+    {}
+
+    unsigned int uid() const { return m_uid; }
+
+private:
+    unsigned int m_uid;
+};
+
+MockObserver::MockObserver(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void MockObserver::mockSize(int size, const QString &error)
+{
+    if (error.isEmpty())
+        Q_EMIT succeeded(QVariant::fromValue(size));
+    else
+        Q_EMIT failed(error);
+}
+
+void MockObserver::mockEnroll(const QString &templateId, const QString &error)
+{
+    if (error.isEmpty())
+        Q_EMIT succeeded(templateId);
+    else
+        Q_EMIT failed(error);
+}
+
+void MockObserver::mockEnrollProgress(double percent,
+                                      const QVariantMap& details)
+{
+    Q_EMIT progressed(percent, details);
+}
+
+void MockObserver::mockClearance(const QString &error)
+{
+    if (error.isEmpty())
+        Q_EMIT succeeded(QVariant());
+    else
+        Q_EMIT failed(error);
+}
+
+void MockObserver::mockRemoval(const QString &templateId,
+                               const QString &error)
+{
+    if (error.isEmpty())
+        Q_EMIT succeeded(templateId);
+    else
+        Q_EMIT failed(error);
+}
+
+void MockObserver::mockList(const QStringList &templateIds,
+                            const QString &error)
+{
+    if (error.isEmpty())
+        Q_EMIT succeeded(templateIds);
+    else
+        Q_EMIT failed(error);
+}
+
+#include "MockObserver.moc"
 
=== added file 'tests/qmltests/mocks/Biometryd/MockObserver.h'
--- tests/qmltests/mocks/Biometryd/MockObserver.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockObserver.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_OBSERVER_H
+#define MOCK_OBSERVER_H
+
+#include <QObject>
+#include <QString>
+#include <QVariant>
+
+class MockObserver : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockObserver)
+
+public:
+    explicit MockObserver(QObject *parent = 0);
+
+    Q_INVOKABLE void mockSize(int size, const QString &error); // only in mock
+    Q_INVOKABLE void mockEnroll(const QString &templateId,
+                                const QString &error); // only in mock
+    Q_INVOKABLE void mockEnrollProgress(double percent,
+                                        const QVariantMap& details); // only in mock
+    Q_INVOKABLE void mockClearance(const QString &error); // only in mock
+    Q_INVOKABLE void mockRemoval(const QString &templateId,
+                                 const QString &error); // only in mock
+    Q_INVOKABLE void mockList(const QStringList &templateIds,
+                              const QString &error); // only in mock
+
+
+Q_SIGNALS:
+    void progressed(double percent, const QVariantMap& details);
+    void succeeded(const QVariant &result);
+    void failed(const QString &reason);
+    void canceled(const QString& reason);
+    void started();
+};
+
+#endif // MOCK_OBSERVER_H
 
=== added file 'tests/qmltests/mocks/Biometryd/MockOperation.cpp'
--- tests/qmltests/mocks/Biometryd/MockOperation.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockOperation.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockOperation.h"
+
+MockOperation::MockOperation(QObject *parent) : QObject(parent)
+{
+}
+
+bool MockOperation::start(MockObserver *observer)
+{
+    Q_UNUSED(observer);
+    return true;
+}
+
+bool MockOperation::cancel()
+{
+    return true;
+}
+
+#include "MockOperation.moc"
 
=== added file 'tests/qmltests/mocks/Biometryd/MockOperation.h'
--- tests/qmltests/mocks/Biometryd/MockOperation.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockOperation.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_OPERATION_H
+#define MOCK_OPERATION_H
+
+#include <QObject>
+
+class MockObserver;
+
+class MockOperation : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockOperation)
+
+public:
+    explicit MockOperation(QObject *parent = 0);
+
+    Q_INVOKABLE bool start(MockObserver* observer);
+    Q_INVOKABLE bool cancel();
+};
+
+#endif // MOCK_OPERATION_H
 
=== added file 'tests/qmltests/mocks/Biometryd/MockService.cpp'
--- tests/qmltests/mocks/Biometryd/MockService.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockService.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockService.h"
+
+MockService::MockService(QObject *parent)
+    : QObject(parent)
+    , m_device(new MockDevice(this))
+    , m_available(false)
+{
+}
+
+MockDevice* MockService::defaultDevice()
+{
+    return m_device;
+}
+
+bool MockService::isAvailable() const
+{
+    return m_available;
+}
+
+void MockService::setAvailable(const bool available)
+{
+    m_available = available;
+    Q_EMIT (availableChanged(available));
+}
+
+#include "MockService.moc"
 
=== added file 'tests/qmltests/mocks/Biometryd/MockService.h'
--- tests/qmltests/mocks/Biometryd/MockService.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockService.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_SERVICE_H
+#define MOCK_SERVICE_H
+
+#include <QObject>
+
+#include "MockDevice.h"
+
+class MockService : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockService)
+
+public:
+    explicit MockService(QObject *parent = 0);
+    Q_PROPERTY(MockDevice* defaultDevice READ defaultDevice CONSTANT)
+    Q_PROPERTY(bool available READ isAvailable NOTIFY availableChanged)
+
+    MockDevice* defaultDevice();
+    bool isAvailable() const;
+    Q_INVOKABLE void setAvailable(const bool available); // mock only
+
+Q_SIGNALS:
+    void availableChanged(bool);
+
+private:
+    MockDevice* m_device;
+    bool m_available;
+};
+
+#endif // MOCK_SERVICE_H
 
=== added file 'tests/qmltests/mocks/Biometryd/MockTemplateStore.cpp'
--- tests/qmltests/mocks/Biometryd/MockTemplateStore.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockTemplateStore.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockTemplateStore.h"
+
+MockTemplateStore::MockTemplateStore(QObject *parent)
+{
+    Q_UNUSED(parent);
+}
+
+MockSizeQuery* MockTemplateStore::size(MockUser* user)
+{
+    Q_UNUSED(user);
+    return new MockSizeQuery(this);
+}
+
+MockEnrollment* MockTemplateStore::enroll(MockUser* user)
+{
+    Q_UNUSED(user);
+    return new MockEnrollment(this);
+}
+
+MockClearance* MockTemplateStore::clear(MockUser* user)
+{
+    Q_UNUSED(user);
+    return new MockClearance(this);
+}
+
+MockRemoval* MockTemplateStore::remove(MockUser* user,
+                                       const QString &templateId)
+{
+    Q_UNUSED(user);
+    Q_UNUSED(templateId);
+    return new MockRemoval(this);
+}
+
+MockList* MockTemplateStore::list(MockUser* user)
+{
+    Q_UNUSED(user);
+    return new MockList(this);
+}
+
+#include "MockTemplateStore.moc"
 
=== added file 'tests/qmltests/mocks/Biometryd/MockTemplateStore.h'
--- tests/qmltests/mocks/Biometryd/MockTemplateStore.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockTemplateStore.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_TEMPLATESTORE_H
+#define MOCK_TEMPLATESTORE_H
+
+#include <QObject>
+#include "MockOperation.h"
+
+class MockUser;
+
+class MockSizeQuery : public MockOperation
+{
+    Q_OBJECT
+public:
+    MockSizeQuery(QObject *parent) :  MockOperation(parent)
+    {
+    }
+};
+
+class MockEnrollment : public MockOperation
+{
+    Q_OBJECT
+public:
+    MockEnrollment(QObject *parent) :  MockOperation(parent)
+    {
+    }
+};
+
+class MockClearance : public MockOperation
+{
+    Q_OBJECT
+public:
+    MockClearance(QObject *parent) :  MockOperation(parent)
+    {
+    }
+};
+
+class MockRemoval : public MockOperation
+{
+    Q_OBJECT
+public:
+    MockRemoval(QObject *parent) :  MockOperation(parent)
+    {
+    }
+};
+
+class MockList : public MockOperation
+{
+    Q_OBJECT
+public:
+    MockList(QObject *parent) :  MockOperation(parent)
+    {
+    }
+};
+
+class MockTemplateStore : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockTemplateStore)
+
+public:
+    explicit MockTemplateStore(QObject *parent = 0);
+
+    Q_INVOKABLE MockSizeQuery* size(MockUser* user);
+    Q_INVOKABLE MockEnrollment* enroll(MockUser* user);
+    Q_INVOKABLE MockClearance* clear(MockUser* user);
+    Q_INVOKABLE MockRemoval* remove(MockUser* user,
+                                    const QString &templateId);
+    Q_INVOKABLE MockList* list(MockUser* user);
+};
+
+#endif // MOCK_TEMPLATESTORE_H
 
=== added file 'tests/qmltests/mocks/Biometryd/MockUser.cpp'
--- tests/qmltests/mocks/Biometryd/MockUser.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockUser.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MockUser.h"
+
+MockUser::MockUser(QObject *parent) : QObject(parent)
+{
+}
+
+int MockUser::uid() const
+{
+    return m_uid;
+}
+
+void MockUser::setUid(const int &uid)
+{
+    m_uid = uid;
+}
+
+#include "MockUser.moc"
 
=== added file 'tests/qmltests/mocks/Biometryd/MockUser.h'
--- tests/qmltests/mocks/Biometryd/MockUser.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/MockUser.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_USER_H
+#define MOCK_USER_H
+
+#include <QObject>
+
+class MockUser : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(MockUser)
+
+public:
+    explicit MockUser(QObject *parent = 0);
+    Q_PROPERTY(int uid READ uid WRITE setUid)
+
+    int uid() const;
+    void setUid(const int &uid);
+
+private:
+    int m_uid = 0;
+};
+
+#endif // MOCK_USER_H
 
=== added file 'tests/qmltests/mocks/Biometryd/plugin.cpp'
--- tests/qmltests/mocks/Biometryd/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/plugin.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+
+#include "MockDevice.h"
+#include "MockFingerprintReader.h"
+#include "MockObserver.h"
+#include "MockOperation.h"
+#include "MockService.h"
+#include "MockTemplateStore.h"
+#include "MockUser.h"
+
+#include <QtQml>
+
+void BackendPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Biometryd"));
+
+    qmlRegisterType<MockObserver>(uri, 0, 0, "Observer");
+    qmlRegisterType<MockUser>(uri, 0, 0, "User");
+
+    qmlRegisterUncreatableType<MockDevice>(uri, 0, 0, "Device", "Rely on Biometryd.instance");
+
+    qmlRegisterUncreatableType<MockOperation>(uri, 0, 0, "Operation", "Rely on Biometryd.instance");
+    qmlRegisterUncreatableType<MockSizeQuery>(uri, 0, 0, "SizeQuery", "Rely on Biometryd.instance");
+    qmlRegisterUncreatableType<MockEnrollment>(uri, 0, 0, "Enrollment", "Rely on Biometryd.instance");
+    qmlRegisterUncreatableType<MockClearance>(uri, 0, 0, "Clearance", "Rely on Biometryd.instance");
+    qmlRegisterUncreatableType<MockTemplateStore>(uri, 0, 0, "TemplateStore", "Rely on Biometryd.instance");
+    qmlRegisterUncreatableType<MockRemoval>(uri, 0, 0, "Removal", "Rely on Biometryd.instance");
+    qmlRegisterUncreatableType<MockList>(uri, 0, 0, "List", "Rely on Biometryd.instance");
+
+    qmlRegisterSingletonType<MockService>(
+        uri, 0, 0, "Biometryd",
+        [](QQmlEngine*, QJSEngine*) -> QObject*
+        {
+            return new MockService;
+        }
+    );
+    qmlRegisterSingletonType<MockFingerprintReader>(
+        uri, 0, 0, "FingerprintReader",
+        [](QQmlEngine*, QJSEngine*) -> QObject*
+        {
+            return new MockFingerprintReader;
+        }
+    );
+}
 
=== added file 'tests/qmltests/mocks/Biometryd/plugin.h'
--- tests/qmltests/mocks/Biometryd/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/plugin.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_BIOMETRYD_PLUGIN_H
+#define MOCK_BIOMETRYD_PLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class BackendPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri) override;
+};
+
+#endif // MOCK_BIOMETRYD_PLUGIN_H
 
=== added file 'tests/qmltests/mocks/Biometryd/qmldir'
--- tests/qmltests/mocks/Biometryd/qmldir	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/Biometryd/qmldir	2016-06-15 10:46:42 +0000
@@ -0,0 +1,2 @@
+module Biometryd
+plugin MockBiometryd
 
=== added file 'tests/qmltests/mocks/CMakeLists.txt'
--- tests/qmltests/mocks/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/CMakeLists.txt	2016-06-15 10:46:42 +0000
@@ -0,0 +1,32 @@
+include(QmlPlugins)
+
+# Set up and optionally install a mock plugin for ubuntu-settings-components.
+#
+# add_usc_mock(plugin version path
+#     [PREFIX string]  # Install the plugin to the specified prefix under unity8 private plugin directory
+#     [...]            # See export_qmlfiles and export_qmlplugin documentation for more options
+# )
+
+macro(add_usc_mock PLUGIN VERSION PATH)
+    set(single PREFIX)
+    cmake_parse_arguments(MOCK "" "${single}" "" ${ARGN})
+
+    if(MOCK_PREFIX)
+        export_qmlfiles(${PLUGIN} ${PATH}
+            DESTINATION ${SHELL_INSTALL_QML}/${MOCK_PREFIX}
+            TARGET_PREFIX ${MOCK_PREFIX}-Mock
+            ${MOCK_UNPARSED_ARGUMENTS}
+        )
+        export_qmlplugin(${PLUGIN} ${VERSION} ${PATH}
+            DESTINATION ${SHELL_INSTALL_QML}/${MOCK_PREFIX}
+            TARGET_PREFIX ${MOCK_PREFIX}-Mock
+            ${MOCK_UNPARSED_ARGUMENTS}
+        )
+    else()
+        export_qmlfiles(${PLUGIN} ${PATH} TARGET_PREFIX Mock ${MOCK_UNPARSED_ARGUMENTS})
+        export_qmlplugin(${PLUGIN} ${VERSION} ${PATH} TARGET_PREFIX Mock ${MOCK_UNPARSED_ARGUMENTS})
+    endif()
+endmacro()
+
+add_subdirectory(Biometryd)
+add_subdirectory(GSettings.1.0)
 
=== added directory 'tests/qmltests/mocks/GSettings.1.0'
=== added file 'tests/qmltests/mocks/GSettings.1.0/CMakeLists.txt'
--- tests/qmltests/mocks/GSettings.1.0/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/GSettings.1.0/CMakeLists.txt	2016-06-15 10:46:42 +0000
@@ -0,0 +1,20 @@
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Quick_INCLUDE_DIRS}
+)
+
+set(GSettingsQML_SOURCES
+  fake_gsettings.cpp
+  plugin.cpp
+)
+
+add_library(FakeGSettingsQml MODULE ${GSettingsQML_SOURCES})
+target_link_libraries(FakeGSettingsQml
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Quick_LIBRARIES}
+)
+
+qt5_use_modules(FakeGSettingsQml Qml)
+
+add_usc_mock(GSettings 1.0 GSettings.1.0 TARGETS FakeGSettingsQml)
 
=== added file 'tests/qmltests/mocks/GSettings.1.0/fake_gsettings.cpp'
--- tests/qmltests/mocks/GSettings.1.0/fake_gsettings.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/GSettings.1.0/fake_gsettings.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "fake_gsettings.h"
+
+#include <QDebug>
+
+GSettingsControllerQml* GSettingsControllerQml::s_controllerInstance = 0;
+
+GSettingsControllerQml::GSettingsControllerQml()
+    : m_fingerprintNames()
+{
+}
+
+GSettingsControllerQml::~GSettingsControllerQml() {
+    s_controllerInstance = 0;
+}
+
+GSettingsControllerQml* GSettingsControllerQml::instance()  {
+    if (!s_controllerInstance) {
+        s_controllerInstance = new GSettingsControllerQml();
+    }
+    return s_controllerInstance;
+}
+
+QVariantMap GSettingsControllerQml::fingerprintNames() const
+{
+    return m_fingerprintNames;
+}
+
+void GSettingsControllerQml::setFingerprintNames(QVariantMap map)
+{
+    if (map != m_fingerprintNames) {
+        m_fingerprintNames = map;
+        Q_EMIT fingerprintNamesChanged();
+    }
+}
+
+GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
+}
+
+QByteArray GSettingsSchemaQml::id() const {
+    return m_id;
+}
+
+void GSettingsSchemaQml::setId(const QByteArray &id) {
+    if (!m_id.isEmpty()) {
+        qWarning("GSettings.schema.id may only be set on construction");
+        return;
+    }
+
+    m_id = id;
+}
+
+QByteArray GSettingsSchemaQml::path() const {
+    return m_path;
+}
+
+void GSettingsSchemaQml::setPath(const QByteArray &path) {
+    if (!m_path.isEmpty()) {
+        qWarning("GSettings.schema.path may only be set on construction");
+        return;
+    }
+
+    m_path = path;
+}
+
+GSettingsQml::GSettingsQml(QObject *parent)
+    : QObject(parent),
+      m_valid(false)
+{
+    m_schema = new GSettingsSchemaQml(this);
+}
+
+void GSettingsQml::classBegin()
+{
+}
+
+void GSettingsQml::componentComplete()
+{
+    // Emulate what the real GSettings module does, and only return undefined
+    // values until we are completed loading.
+    m_valid = true;
+
+    // FIXME: We should make this dynamic, instead of hard-coding all possible
+    // properties in one object.  We should create properties based on the schema.
+    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::fingerprintNamesChanged,
+            this, &GSettingsQml::fingerprintNamesChanged);
+
+    Q_EMIT fingerprintNamesChanged();
+}
+
+GSettingsSchemaQml * GSettingsQml::schema() const {
+    return m_schema;
+}
+
+QVariantMap GSettingsQml::fingerprintNames() const
+{
+    if (m_valid && m_schema->id() == "com.ubuntu.touch.system") {
+        return GSettingsControllerQml::instance()->fingerprintNames();
+    } else {
+        return QVariantMap();
+    }
+}
+
+void GSettingsQml::setFingerprintNames(const QVariantMap &map)
+{
+    if (m_valid && m_schema->id() == "com.ubuntu.touch.system") {
+        GSettingsControllerQml::instance()->setFingerprintNames(map);
+    }
+}
 
=== added file 'tests/qmltests/mocks/GSettings.1.0/fake_gsettings.h'
--- tests/qmltests/mocks/GSettings.1.0/fake_gsettings.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/GSettings.1.0/fake_gsettings.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FAKE_GSETTINGS_H
+#define FAKE_GSETTINGS_H
+
+#include <QList>
+#include <QObject>
+#include <QQmlParserStatus>
+#include <QStringList>
+#include <QVariant>
+
+class GSettingsSchemaQml: public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QByteArray id READ id WRITE setId)
+public:
+    GSettingsSchemaQml(QObject *parent = nullptr);
+
+    QByteArray id() const;
+    void setId(const QByteArray &id);
+
+    QByteArray path() const;
+    void setPath(const QByteArray &path);
+
+private:
+    QByteArray m_id;
+    QByteArray m_path;
+};
+
+class GSettingsQml: public QObject, public QQmlParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
+
+    Q_PROPERTY(GSettingsSchemaQml* schema READ schema NOTIFY schemaChanged)
+    Q_PROPERTY(QVariantMap fingerprintNames
+               READ fingerprintNames
+               WRITE setFingerprintNames
+               NOTIFY fingerprintNamesChanged)
+
+public:
+    GSettingsQml(QObject *parent = nullptr);
+
+    void classBegin() override;
+    void componentComplete() override;
+
+    GSettingsSchemaQml * schema() const;
+
+    QVariantMap fingerprintNames() const;
+    void setFingerprintNames(const QVariantMap &map);
+
+Q_SIGNALS:
+    void fingerprintNamesChanged();
+    void schemaChanged();
+
+private:
+    GSettingsSchemaQml* m_schema;
+    bool m_valid;
+
+    friend class GSettingsSchemaQml;
+};
+
+class GSettingsControllerQml: public QObject
+{
+    Q_OBJECT
+
+public:
+    static GSettingsControllerQml* instance();
+    ~GSettingsControllerQml();
+
+    Q_INVOKABLE QVariantMap fingerprintNames() const;
+    Q_INVOKABLE void setFingerprintNames(QVariantMap map);
+
+Q_SIGNALS:
+    void fingerprintNamesChanged();
+
+private:
+    GSettingsControllerQml();
+
+    QVariantMap m_fingerprintNames;
+
+    static GSettingsControllerQml* s_controllerInstance;
+    QList<GSettingsQml *> m_registeredGSettings;
+};
+
+#endif // FAKE_GSETTINGS_H
 
=== added file 'tests/qmltests/mocks/GSettings.1.0/plugin.cpp'
--- tests/qmltests/mocks/GSettings.1.0/plugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/GSettings.1.0/plugin.cpp	2016-06-15 10:46:42 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "plugin.h"
+#include "fake_gsettings.h"
+
+#include <QtQml/qqml.h>
+
+static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
+{
+    return GSettingsControllerQml::instance();
+}
+
+void FakeGSettingsQmlPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterSingletonType<GSettingsControllerQml>(uri, 1, 0, "GSettingsController", controllerProvider);
+    qmlRegisterType<GSettingsQml>(uri, 1, 0, "GSettings");
+    qmlRegisterUncreatableType<GSettingsSchemaQml>(uri, 1, 0, "GSettingsSchema",
+                                                   "GSettingsSchema can only be used inside of a GSettings component");
+}
 
=== added file 'tests/qmltests/mocks/GSettings.1.0/plugin.h'
--- tests/qmltests/mocks/GSettings.1.0/plugin.h	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/GSettings.1.0/plugin.h	2016-06-15 10:46:42 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef PLUGIN_H
+#define PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class FakeGSettingsQmlPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri) override;
+};
+
+#endif // PLUGIN_H
 
=== added file 'tests/qmltests/mocks/GSettings.1.0/qmldir'
--- tests/qmltests/mocks/GSettings.1.0/qmldir	1970-01-01 00:00:00 +0000
+++ tests/qmltests/mocks/GSettings.1.0/qmldir	2016-06-15 10:46:42 +0000
@@ -0,0 +1,2 @@
+module GSettings
+plugin FakeGSettingsQml