Unity 8

Merge lp:~unity-team/unity8/fingerprint into lp:unity8

fingerprint
Merge into trunk

Proposed by Michael Terry on 2016-05-03

Status:	Merged
Approved by:	Michael Zanetti on 2016-06-22
Approved revision:	2344
Merged at revision:	2491
Proposed branch:	lp:~unity-team/unity8/fingerprint
Merge into:	lp:unity8
Diff against target:	1908 lines (+1022/-49) 44 files modified debian/control (+2/-1) plugins/AccountsService/AccountsService.cpp (+21/-1) plugins/AccountsService/AccountsService.h (+13/-1) plugins/AccountsService/com.canonical.unity.AccountsService.xml (+4/-0) plugins/IntegratedLightDM/liblightdm/UsersModel.cpp (+4/-1) plugins/IntegratedLightDM/liblightdm/UsersModel.h (+2/-1) plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+5/-3) plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h (+2/-1) qml/Components/DelayedLockscreen.qml (+1/-0) qml/Components/Lockscreen.qml (+8/-0) qml/Components/PassphraseLockscreen.qml (+4/-0) qml/Components/PinLockscreen.qml (+4/-0) qml/Greeter/CoverPage.qml (+22/-1) qml/Greeter/Greeter.qml (+97/-4) qml/Greeter/NarrowView.qml (+18/-2) qml/Greeter/WideView.qml (+5/-1) qml/Shell.qml (+3/-0) tests/mocks/AccountsService/AccountsService.cpp (+24/-0) tests/mocks/AccountsService/AccountsService.h (+16/-0) tests/mocks/Biometryd/CMakeLists.txt (+14/-0) tests/mocks/Biometryd/MockBiometryd.cpp (+43/-0) tests/mocks/Biometryd/MockBiometryd.h (+50/-0) tests/mocks/Biometryd/MockDevice.cpp (+29/-0) tests/mocks/Biometryd/MockDevice.h (+40/-0) tests/mocks/Biometryd/MockIdentifier.cpp (+28/-0) tests/mocks/Biometryd/MockIdentifier.h (+36/-0) tests/mocks/Biometryd/MockObserver.cpp (+22/-0) tests/mocks/Biometryd/MockObserver.h (+37/-0) tests/mocks/Biometryd/MockOperation.cpp (+56/-0) tests/mocks/Biometryd/MockOperation.h (+48/-0) tests/mocks/Biometryd/plugin.cpp (+41/-0) tests/mocks/Biometryd/plugin.h (+31/-0) tests/mocks/Biometryd/qmldir (+3/-0) tests/mocks/CMakeLists.txt (+1/-0) tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpp (+4/-1) tests/mocks/IntegratedLightDM/liblightdm/UsersModel.h (+2/-1) tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+29/-23) tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.h (+2/-1) tests/qmltests/Components/tst_Lockscreen.qml (+20/-1) tests/qmltests/Greeter/TestView.qml (+10/-3) tests/qmltests/Greeter/tst_Greeter.qml (+171/-0) tests/qmltests/Greeter/tst_NarrowView.qml (+22/-1) tests/qmltests/Greeter/tst_WideView.qml (+1/-1) tests/qmltests/tst_Shell.qml (+27/-0)
To merge this branch:	bzr merge lp:~unity-team/unity8/fingerprint
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)			Approve on 2016-06-22
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-06-21
Ken VanDine			Approve on 2016-06-17
Albert Astals Cid (community)	code looks good	2016-05-03	Approve on 2016-06-17
Review via email: mp+293621@code.launchpad.net

Commit Message

Support unlocking via fingerprint, if one is registered.

Description of the Change

Adds support for the new Biometryd qml module.

Spec details here:
https://docs.google.com/document/d/1d8gEataSjJMRacQbdSy0W4pSFA9q1UKA660CvXk-wNI

Testing instructions are at the end of that document.

I may have one tiny change coming -- disabling the Home button while fingerprint registration is happening. But that's waiting on tvoss. Rest can be reviewed in meantime.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-07:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1431/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-08:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1436/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-06-08:

Had a look at the code, looks good, but someone with a fingerprint phone needs to review it.

Not approving since otherwise people won't see it in the "Requested reviews you can do" section of https://code.launchpad.net/~unity-team/unity8/trunk/+activereviews

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-08:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1440/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-09:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1461/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-16:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1500/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-16:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1503/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) on 2016-06-17:

review: Approve (code looks good)

Ken VanDine (ken-vandine) wrote on 2016-06-17:

I've test this on my turbo, works well

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-19:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1523/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-06-20:

I've been using this for a while now and have some issues, mainly in combination with the home button:

If I press the button when the screen is off and there is a focused app other than the dash, the behavior is not predictable. Sometimes it just unlocks the screen, leaving me in the app, somethimes however, it unfocuses the app and puts me to the dash.

I would expect this:

Pressing the home button once should wake up the screen. Because the finger is on the reader, it should unlock unity. However, it should *not* unfocus any app. If I want to go back to the dash from there, I should be required to press the home button for another time.

review: Needs Fixing

lp:~unity-team/unity8/fingerprint updated on 2016-06-20

2338. By Michael Terry on 2016-06-20: Add a touch of security to fingerprinting
2339. By Michael Terry on 2016-06-20: Fix tests
2340. By Michael Terry on 2016-06-20: Disable fingerprints when dialog/fullscreen-notification/indicators are up
2341. By Michael Terry on 2016-06-20: Use nicer log message
2342. By Michael Terry on 2016-06-20: Tweak test
2343. By Michael Terry on 2016-06-20: Don't show duplicate passphrase prompts

Michael Terry (mterry) wrote on 2016-06-20:

OK, might need another review. mzanetti, I think your concern about requiring a finger-lift is being addressed by tvoss in a separate component?

Things changed since last review:

- After three failed attempts for a given user, fingerprints are disabled for that user. They are instead prompted to enter a passphrase/passcode. This was a security request.

- On the first login after booting, fingerprints are disabled for the user. They are instead prompted to enter a passphrase/passcode. This was a security request.

- When a dialog (e.g. power dialog), a fullscreen notification (e.g. pin unlock), or indicators are showing, the fingerprint reader is ignored.

lp:~unity-team/unity8/fingerprint updated on 2016-06-20

2344. By Michael Terry on 2016-06-20: Reset delay timer if we log in with fingerprint

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1572/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1578/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-06-22:

I've tested this. The issues with unlocking in unexpected situations are resolved now.

Indeed, the lift-finger issue seems to be addressed by Thomas in the lower layers. I suspect, if he enables that again it will bring back the issue here?

Let's see, so far it works great. If the lower layers change we can probably apply another patch on top.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/control'
 --- debian/control	2016-06-17 01:12:57 +0000
 +++ debian/control	2016-06-20 20:23:46 +0000
@@ -103,6 +103,7 @@
           libcap2-bin,
           libglib2.0-bin,
           qmenumodel-qml (>= 0.2.9),
++         qml-module-biometryd,
           qml-module-qt-labs-folderlistmodel,
           qml-module-qtquick-xmllistmodel,
           qml-module-qtsysteminfo,
@@ -192,7 +193,7 @@
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends},
--Depends: accountsservice-ubuntu-schemas (>= 0.0.5),
++Depends: accountsservice-ubuntu-schemas (>= 0.0.7),
           gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
           libhardware2,
           pay-service,
 === modified file 'plugins/AccountsService/AccountsService.cpp'
 --- plugins/AccountsService/AccountsService.cpp	2016-04-27 15:01:10 +0000
 +++ plugins/AccountsService/AccountsService.cpp	2016-06-20 20:23:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013, 2015 Canonical, Ltd.
++ * Copyright (C) 2013-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
@@ -36,8 +36,10 @@
  #define PROP_DEMO_EDGES                        QStringLiteral("demo-edges")
  #define PROP_DEMO_EDGES_COMPLETED              QStringLiteral("DemoEdgesCompleted")
  #define PROP_EMAIL                             QStringLiteral("Email")
++#define PROP_ENABLE_FINGERPRINT_IDENTIFICATION QStringLiteral("EnableFingerprintIdentification")
  #define PROP_ENABLE_INDICATORS_WHILE_LOCKED    QStringLiteral("EnableIndicatorsWhileLocked")
  #define PROP_ENABLE_LAUNCHER_WHILE_LOCKED      QStringLiteral("EnableLauncherWhileLocked")
++#define PROP_FAILED_FINGERPRINT_LOGINS         QStringLiteral("FailedFingerprintLogins")
  #define PROP_FAILED_LOGINS                     QStringLiteral("FailedLogins")
  #define PROP_INPUT_SOURCES                     QStringLiteral("InputSources")
  #define PROP_LICENSE_ACCEPTED                  QStringLiteral("LicenseAccepted")
@@ -93,12 +95,14 @@
      registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));
      registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
      registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
++    registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION, QStringLiteral("enableFingerprintIdentificationChanged"));
      registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
      registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));
      registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
      registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
      registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
      registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));
++    registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, QStringLiteral("failedFingerprintLoginsChanged"));
      registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
      registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
@@ -176,6 +180,12 @@
+     }
+ }
++bool AccountsService::enableFingerprintIdentification() const
++{
++    auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION);
++    return value.toBool();
++}
++
  bool AccountsService::enableLauncherWhileLocked() const
+ {
      auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
@@ -274,6 +284,16 @@
      return {QStringLiteral("us")};
+ }
++uint AccountsService::failedFingerprintLogins() const
++{
++    return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS).toUInt();
++}
++
++void AccountsService::setFailedFingerprintLogins(uint failedFingerprintLogins)
++{
++    setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, failedFingerprintLogins);
++}
++
  uint AccountsService::failedLogins() const
+ {
      return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
 === modified file 'plugins/AccountsService/AccountsService.h'
 --- plugins/AccountsService/AccountsService.h	2016-03-29 03:47:39 +0000
 +++ plugins/AccountsService/AccountsService.h	2016-06-20 20:23:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013, 2015 Canonical, Ltd.
++ * Copyright (C) 2013-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
@@ -41,6 +41,9 @@
      Q_PROPERTY (QStringList demoEdgesCompleted
                  READ demoEdgesCompleted
                  NOTIFY demoEdgesCompletedChanged)
++    Q_PROPERTY (bool enableFingerprintIdentification
++                READ enableFingerprintIdentification
++                NOTIFY enableFingerprintIdentificationChanged)
      Q_PROPERTY (bool enableLauncherWhileLocked
                  READ enableLauncherWhileLocked
                  NOTIFY enableLauncherWhileLockedChanged)
@@ -60,6 +63,10 @@
                  READ failedLogins
                  WRITE setFailedLogins
                  NOTIFY failedLoginsChanged)
++    Q_PROPERTY (uint failedFingerprintLogins
++                READ failedFingerprintLogins
++                WRITE setFailedFingerprintLogins
++                NOTIFY failedFingerprintLoginsChanged)
      Q_PROPERTY(bool hereEnabled
                 READ hereEnabled
                 WRITE setHereEnabled
@@ -91,6 +98,7 @@
      void setDemoEdges(bool demoEdges);
      QStringList demoEdgesCompleted() const;
      Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
++    bool enableFingerprintIdentification() const;
      bool enableLauncherWhileLocked() const;
      bool enableIndicatorsWhileLocked() const;
      QString backgroundFile() const;
@@ -98,6 +106,8 @@
      PasswordDisplayHint passwordDisplayHint() const;
      uint failedLogins() const;
      void setFailedLogins(uint failedLogins);
++    uint failedFingerprintLogins() const;
++    void setFailedFingerprintLogins(uint failedFingerprintLogins);
      bool hereEnabled() const;
      void setHereEnabled(bool enabled);
      QString hereLicensePath() const;
@@ -112,12 +122,14 @@
      void userChanged();
      void demoEdgesChanged();
      void demoEdgesCompletedChanged();
++    void enableFingerprintIdentificationChanged();
      void enableLauncherWhileLockedChanged();
      void enableIndicatorsWhileLockedChanged();
      void backgroundFileChanged();
      void statsWelcomeScreenChanged();
      void passwordDisplayHintChanged();
      void failedLoginsChanged();
++    void failedFingerprintLoginsChanged();
      void hereEnabledChanged();
      void hereLicensePathChanged();
      void realNameChanged();
 === modified file 'plugins/AccountsService/com.canonical.unity.AccountsService.xml'
 --- plugins/AccountsService/com.canonical.unity.AccountsService.xml	2016-03-29 03:47:39 +0000
 +++ plugins/AccountsService/com.canonical.unity.AccountsService.xml	2016-06-20 20:23:46 +0000
@@ -47,5 +47,9 @@
        <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
      </property>
++    <property name="FailedFingerprintLogins" type="u" access="readwrite">
++      <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>
++    </property>
++
    </interface>
  </node>
 === modified file 'plugins/IntegratedLightDM/liblightdm/UsersModel.cpp'
 --- plugins/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-03-01 14:09:40 +0000
 +++ plugins/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-06-20 20:23:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013-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
@@ -52,6 +52,7 @@
      roles[SessionRole] = "session";
      roles[HasMessagesRole] = "hasMessages";
      roles[ImagePathRole] = "imagePath";
++    roles[UidRole] = "uid";
      setRoleNames(roles);
      connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {
@@ -101,6 +102,8 @@
          return d->entries[row].has_messages;
      case UsersModel::ImagePathRole:
          return "";
++    case UsersModel::UidRole:
++        return d->entries[row].uid;
      default:
          return QVariant();
+     }
 === modified file 'plugins/IntegratedLightDM/liblightdm/UsersModel.h'
 --- plugins/IntegratedLightDM/liblightdm/UsersModel.h	2016-03-01 14:09:40 +0000
 +++ plugins/IntegratedLightDM/liblightdm/UsersModel.h	2016-06-20 20:23:46 +0000
@@ -50,7 +50,8 @@
                           SessionRole,
                           HasMessagesRole,
                           ImagePathRole,
--                         BackgroundPathRole
++                         BackgroundPathRole,
++                         UidRole
      };
      int rowCount(const QModelIndex &parent) const override;
 === modified file 'plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
 --- plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-03-08 18:07:38 +0000
 +++ plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-06-20 20:23:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013-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
@@ -26,6 +26,7 @@
  #include <QDir>
  #include <QSettings>
  #include <QStringList>
++#include <unistd.h>
  namespace QLightDM
+ {
@@ -37,6 +38,7 @@
+ {
      QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
      QString currentUser = g_get_user_name();
++    uid_t currentUid = getuid();
      if (demoFile.exists()) {
          QSettings settings(demoFile.filePath(), QSettings::NativeFormat);
@@ -46,10 +48,10 @@
          Q_FOREACH(const QString &user, users)
+         {
              QString name = settings.value(user + "/name", user).toString();
--            entries.append({user, name, 0, 0, false, false, 0, 0});
++            entries.append({user, name, 0, 0, false, false, 0, 0, currentUid++});
+         }
      } else {
--        entries.append({currentUser, 0, 0, 0, false, false, 0, 0});
++        entries.append({currentUser, 0, 0, 0, false, false, 0, 0, currentUid});
          connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,
                  this, [this](const QString &user) {
 === modified file 'plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h'
 --- plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2016-03-01 14:09:40 +0000
 +++ plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2016-06-20 20:23:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013-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
@@ -40,6 +40,7 @@
      bool has_messages;
      QString session;
      QString infographic;
++    uid_t uid;
  };
  class UsersModelPrivate : public QObject
 === modified file 'qml/Components/DelayedLockscreen.qml'
 --- qml/Components/DelayedLockscreen.qml	2015-07-15 15:07:19 +0000
 +++ qml/Components/DelayedLockscreen.qml	2016-06-20 20:23:46 +0000
@@ -28,6 +28,7 @@
      signal cancel() // unused
      function clear(playAnimation) {}
++    function showText(text) {}
      Column {
          anchors.left: parent.left
 === modified file 'qml/Components/Lockscreen.qml'
 --- qml/Components/Lockscreen.qml	2016-03-31 03:15:03 +0000
 +++ qml/Components/Lockscreen.qml	2016-06-20 20:23:46 +0000
@@ -91,6 +91,14 @@
          popup.z = Number.MAX_VALUE
+     }
++    function showText(text) {
++        // Programmatically enters the given text into the lockscreen
++        if (pinPadLoader.item) {
++            pinPadLoader.item.showText(text);
++            pinPadLoader.waiting = true;
++        }
++    }
++
      Rectangle {
          // In case background fails to load
          id: backgroundBackup
 === modified file 'qml/Components/PassphraseLockscreen.qml'
 --- qml/Components/PassphraseLockscreen.qml	2016-02-26 16:12:00 +0000
 +++ qml/Components/PassphraseLockscreen.qml	2016-06-20 20:23:46 +0000
@@ -43,6 +43,10 @@
+         }
+     }
++    function showText(text) {
++        pinentryField.text = text;
++    }
++
      Column {
          id: shakeContainer
          anchors.horizontalCenter: parent.horizontalCenter
 === modified file 'qml/Components/PinLockscreen.qml'
 --- qml/Components/PinLockscreen.qml	2016-04-13 15:20:50 +0000
 +++ qml/Components/PinLockscreen.qml	2016-06-20 20:23:46 +0000
@@ -46,6 +46,10 @@
+         }
+     }
++    function showText(text) {
++        pinentryField.text = text;
++    }
++
      Keys.onPressed: {
          if (pinentryField.text.length == root.maxPinLength)
              return;
 === modified file 'qml/Greeter/CoverPage.qml'
 --- qml/Greeter/CoverPage.qml	2016-05-18 13:38:27 +0000
 +++ qml/Greeter/CoverPage.qml	2016-06-20 20:23:46 +0000
@@ -41,9 +41,16 @@
          hide();
+     }
++    function showErrorMessage(msg) {
++        d.errorMessage = msg;
++        showLabelAnimation.start();
++        errorMessageAnimation.start();
++    }
++
      QtObject {
          id: d
          property bool forceRightOnNextHideAnimation: false
++        property string errorMessage
+     }
      prepareToHide: function () {
@@ -111,15 +118,18 @@
      Label {
          id: swipeHint
++        objectName: "swipeHint"
          property real baseOpacity: 0.5
          opacity: 0.0
          anchors.horizontalCenter: parent.horizontalCenter
          anchors.bottom: parent.bottom
          anchors.bottomMargin: units.gu(5)
--        text: "《    " + i18n.tr("Unlock") + "    》"
++        text: "《    " + (d.errorMessage ? d.errorMessage : i18n.tr("Unlock")) + "    》"
          color: "white"
          font.weight: Font.Light
++        readonly property var opacityAnimation: showLabelAnimation // for testing
++
          SequentialAnimation on opacity {
              id: showLabelAnimation
              running: false
@@ -136,9 +146,20 @@
                  to: 0.0
                  duration: UbuntuAnimation.SleepyDuration
+             }
++
++            onRunningChanged: {
++                if (!running)
++                    d.errorMessage = "";
++            }
+         }
+     }
++    WrongPasswordAnimation {
++        id: errorMessageAnimation
++        objectName: "errorMessageAnimation"
++        target: swipeHint
++    }
++
      DragHandle {
          id: dragHandle
          objectName: "coverPageDragHandle"
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2016-06-17 01:18:17 +0000
 +++ qml/Greeter/Greeter.qml	2016-06-20 20:23:46 +0000
@@ -16,7 +16,9 @@
  import QtQuick 2.4
  import AccountsService 0.1
++import Biometryd 0.0
  import GSettings 1.0
++import Powerd 0.1
  import Ubuntu.Components 1.3
  import Ubuntu.SystemImage 0.1
  import Unity.Launcher 0.1
@@ -37,6 +39,8 @@
      readonly property bool active: required || hasLockedApp
      readonly property bool fullyShown: loader.item ? loader.item.fullyShown : false
++    property bool allowFingerprint: true
++
      // True when the greeter is waiting for PAM or other setup process
      readonly property alias waiting: d.waiting
@@ -52,6 +56,7 @@
      property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
      property int failedLoginsDelayAttempts: 7 // number of failed logins
      property real failedLoginsDelayMinutes: 5 // minutes of forced waiting
++    property int failedFingerprintLoginsDisableAttempts: 3 // number of failed fingerprint logins
      readonly property bool animating: loader.item ? loader.item.animating : false
@@ -60,6 +65,9 @@
      signal emergencyCall()
      function forceShow() {
++        if (!active) {
++            d.isLockscreen = true;
++        }
          forcedUnlock = false;
          if (!required) {
              showNow(); // loader.onLoaded will select a user
@@ -119,6 +127,11 @@
          readonly property bool multiUser: lightDM.users.count > 1
          property int currentIndex
          property bool waiting
++        property bool isLockscreen // true when we are locking an active session, rather than first user login
++        readonly property bool secureFingerprint: isLockscreen &&
++                                                  AccountsService.failedFingerprintLogins <
++                                                  root.failedFingerprintLoginsDisableAttempts
++        readonly property bool alphanumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard
          // We want 'launcherOffset' to animate down to zero.  But not to animate
          // while being dragged.  So ideally we change this only when the user
@@ -151,7 +164,7 @@
              if (lightDM.greeter.startSessionSync()) {
                  sessionStarted();
                  if (loader.item) {
--                    loader.item.notifyAuthenticationSucceeded();
++                    loader.item.notifyAuthenticationSucceeded(false /* showFakePassword */);
+                 }
              } else if (loader.item) {
                  loader.item.notifyAuthenticationFailed();
@@ -170,7 +183,7 @@
          function checkForcedUnlock(hideNow) {
              if (forcedUnlock && shown && loader.item) {
                  // pretend we were just authenticated
--                loader.item.notifyAuthenticationSucceeded();
++                loader.item.notifyAuthenticationSucceeded(false /* showFakePassword */);
                  loader.item.hide();
                  if (hideNow) {
                      root.hideNow(); // skip hide animation
@@ -188,6 +201,17 @@
      onForcedUnlockChanged: d.checkForcedUnlock(false /* hideNow */)
      Component.onCompleted: d.checkForcedUnlock(true /* hideNow */)
++    onLockedChanged: {
++        if (!locked) {
++            AccountsService.failedLogins = 0;
++            AccountsService.failedFingerprintLogins = 0;
++
++            // Stop delay timer if they logged in with fingerprint
++            forcedDelayTimer.stop();
++            forcedDelayTimer.delayMinutes = 0;
++        }
++    }
++
      onRequiredChanged: {
          if (required) {
              d.waiting = true;
@@ -349,7 +373,7 @@
          Binding {
              target: loader.item
              property: "alphanumeric"
--            value: AccountsService.passwordDisplayHint === AccountsService.Keyboard
++            value: d.alphanumeric
+         }
          Binding {
@@ -408,7 +432,6 @@
              d.waiting = false;
              if (lightDM.greeter.authenticated) {
--                AccountsService.failedLogins = 0;
                  d.login();
                  if (!lightDM.greeter.promptless) {
                      loader.item.hide();
@@ -474,4 +497,74 @@
          target: i18n
          onLanguageChanged: lightDM.infographic.readyForDataChange()
+     }
++
++    Observer {
++        id: biometryd
++        objectName: "biometryd"
++
++        property var operation: null
++        readonly property bool idEnabled: root.active &&
++                                          root.allowFingerprint &&
++                                          Powerd.status === Powerd.On &&
++                                          Biometryd.available &&
++                                          AccountsService.enableFingerprintIdentification
++
++        function cancelOperation() {
++            if (operation) {
++                operation.cancel();
++                operation = null;
++            }
++        }
++
++        function restartOperation() {
++            cancelOperation();
++
++            if (idEnabled) {
++                var identifier = Biometryd.defaultDevice.identifier;
++                operation = identifier.identifyUser();
++                operation.start(biometryd);
++            }
++        }
++
++        function failOperation(reason) {
++            console.log("Failed to identify user by fingerprint:", reason);
++            restartOperation();
++            if (!d.secureFingerprint) {
++                d.startUnlock(false /* toTheRight */); // use normal login instead
++            }
++            if (loader.item) {
++                var msg = d.secureFingerprint ? i18n.tr("Try again") : "";
++                loader.item.showErrorMessage(msg);
++            }
++        }
++
++        Component.onCompleted: restartOperation()
++        Component.onDestruction: cancelOperation()
++        onIdEnabledChanged: restartOperation()
++
++        onSucceeded: {
++            if (!d.secureFingerprint) {
++                failOperation("fingerprint reader is locked");
++                return;
++            }
++            if (result !== lightDM.users.data(d.currentIndex, lightDM.userRoles.UidRole)) {
++                AccountsService.failedFingerprintLogins++;
++                failOperation("not the selected user");
++                return;
++            }
++            console.log("Identified user by fingerprint:", result);
++            if (loader.item)
++                loader.item.notifyAuthenticationSucceeded(true /* showFakePassword */);
++            if (root.active)
++                root.forcedUnlock = true;
++        }
++        onFailed: {
++            if (!d.secureFingerprint) {
++                failOperation("fingerprint reader is locked");
++            } else {
++                AccountsService.failedFingerprintLogins++;
++                failOperation(reason);
++            }
++        }
++    }
+ }
 === modified file 'qml/Greeter/NarrowView.qml'
 --- qml/Greeter/NarrowView.qml	2016-05-18 13:38:27 +0000
 +++ qml/Greeter/NarrowView.qml	2016-06-20 20:23:46 +0000
@@ -65,15 +65,28 @@
          coverPage.hide();
+     }
--    function notifyAuthenticationSucceeded() {
++    function notifyAuthenticationSucceeded(showFakePassword) {
++        // When using an alternate log in mechanism like fingerprints, the
++        // design is it looks like the user entered a passcode.
++        if (!alphanumeric && showFakePassword) {
++            lockscreen.showText("...."); // actual text doesn't matter, we show bullets
++        }
          lockscreen.hide();
+     }
      function notifyAuthenticationFailed() {
++        lockscreen.customError = "";
++        lockscreen.clear(true);
++    }
++
++    function showErrorMessage(msg) {
++        coverPage.showErrorMessage(msg);
++        lockscreen.customError = msg ? msg : " "; // avoid default message
          lockscreen.clear(true);
+     }
      function reset() {
++        lockscreen.customError = "";
          coverPage.show();
+     }
@@ -116,7 +129,10 @@
          infoText: promptText !== "" ? i18n.tr("Enter %1").arg(promptText) :
                    alphaNumeric ? i18n.tr("Enter passphrase") :
                                   i18n.tr("Enter passcode")
--        errorText: promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
++
++        property string customError
++        errorText: customError !== "" ? customError :
++                   promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
                     alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
                                    i18n.ctr("passphrase", "Please re-enter") :
                                    i18n.tr("Sorry, incorrect passcode")
 === modified file 'qml/Greeter/WideView.qml'
 --- qml/Greeter/WideView.qml	2016-05-27 15:20:22 +0000
 +++ qml/Greeter/WideView.qml	2016-06-20 20:23:46 +0000
@@ -58,7 +58,7 @@
          coverPage.hide();
+     }
--    function notifyAuthenticationSucceeded() {
++    function notifyAuthenticationSucceeded(showFakePassword) {
          // Nothing needed
+     }
@@ -66,6 +66,10 @@
          loginList.showError();
+     }
++    function showErrorMessage(msg) {
++        coverPage.showErrorMessage(msg);
++    }
++
      function reset() {
          loginList.reset();
+     }
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-06-17 01:18:17 +0000
 +++ qml/Shell.qml	2016-06-20 20:23:46 +0000
@@ -421,6 +421,9 @@
              launcherOffset: launcher.progress
              forcedUnlock: wizard.active || shell.mode === "full-shell"
              background: wallpaperResolver.background
++            allowFingerprint: !dialogs.hasActiveDialog &&
++                              !notifications.topmostIsFullscreen &&
++                              !panel.indicators.shown
              // avoid overlapping with Launcher's edge drag area
              // FIXME: Fix TouchRegistry & friends and remove this workaround
 === modified file 'tests/mocks/AccountsService/AccountsService.cpp'
 --- tests/mocks/AccountsService/AccountsService.cpp	2016-03-29 03:47:39 +0000
 +++ tests/mocks/AccountsService/AccountsService.cpp	2016-06-20 20:23:46 +0000
@@ -20,11 +20,13 @@
  AccountsService::AccountsService(QObject* parent)
    : QObject(parent),
++    m_enableFingerprintIdentification(true),
      m_enableLauncherWhileLocked(true),
      m_enableIndicatorsWhileLocked(true),
      m_backgroundFile(qmlDirectory() + "/graphics/phone_background.jpg"),
      m_statsWelcomeScreen(true),
      m_failedLogins(0),
++    m_failedFingerprintLogins(0),
      m_demoEdges(false),
      m_demoEdgesCompleted(),
      m_hereEnabled(false),
@@ -74,6 +76,17 @@
      Q_EMIT demoEdgesCompletedChanged();
+ }
++bool AccountsService::enableFingerprintIdentification() const
++{
++    return m_enableFingerprintIdentification;
++}
++
++void AccountsService::setEnableFingerprintIdentification(bool enableFingerprintIdentification)
++{
++    m_enableFingerprintIdentification = enableFingerprintIdentification;
++    Q_EMIT enableFingerprintIdentificationChanged();
++}
++
  bool AccountsService::enableLauncherWhileLocked() const
+ {
      return m_enableLauncherWhileLocked;
@@ -137,6 +150,17 @@
      failedLoginsChanged();
+ }
++uint AccountsService::failedFingerprintLogins() const
++{
++    return m_failedFingerprintLogins;
++}
++
++void AccountsService::setFailedFingerprintLogins(uint failedFingerprintLogins)
++{
++    m_failedFingerprintLogins = failedFingerprintLogins;
++    failedFingerprintLoginsChanged();
++}
++
  bool AccountsService::hereEnabled() const
+ {
      return m_hereEnabled;
 === modified file 'tests/mocks/AccountsService/AccountsService.h'
 --- tests/mocks/AccountsService/AccountsService.h	2016-03-29 03:47:39 +0000
 +++ tests/mocks/AccountsService/AccountsService.h	2016-06-20 20:23:46 +0000
@@ -38,6 +38,10 @@
                  READ demoEdgesCompleted
                  WRITE setDemoEdgesCompleted // only available in mock
                  NOTIFY demoEdgesCompletedChanged)
++    Q_PROPERTY (bool enableFingerprintIdentification
++                READ enableFingerprintIdentification
++                WRITE setEnableFingerprintIdentification // only available in mock
++                NOTIFY enableFingerprintIdentificationChanged)
      Q_PROPERTY (bool enableLauncherWhileLocked
                  READ enableLauncherWhileLocked
                  WRITE setEnableLauncherWhileLocked // only available in mock
@@ -61,6 +65,10 @@
                  READ failedLogins
                  WRITE setFailedLogins
                  NOTIFY failedLoginsChanged)
++    Q_PROPERTY (uint failedFingerprintLogins
++                READ failedFingerprintLogins
++                WRITE setFailedFingerprintLogins
++                NOTIFY failedFingerprintLoginsChanged)
      Q_PROPERTY(bool hereEnabled
                 READ hereEnabled
                 WRITE setHereEnabled
@@ -94,6 +102,8 @@
      QStringList demoEdgesCompleted() const;
      void setDemoEdgesCompleted(const QStringList &demoEdges);
      Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
++    bool enableFingerprintIdentification() const;
++    void setEnableFingerprintIdentification(bool enableFingerprintIdentification);
      bool enableLauncherWhileLocked() const;
      void setEnableLauncherWhileLocked(bool enableLauncherWhileLocked);
      bool enableIndicatorsWhileLocked() const;
@@ -105,6 +115,8 @@
      PasswordDisplayHint passwordDisplayHint() const;
      uint failedLogins() const;
      void setFailedLogins(uint failedLogins);
++    uint failedFingerprintLogins() const;
++    void setFailedFingerprintLogins(uint failedFingerprintLogins);
      bool hereEnabled() const;
      void setHereEnabled(bool enabled);
      QString hereLicensePath() const;
@@ -121,12 +133,14 @@
      void userChanged();
      void demoEdgesChanged();
      void demoEdgesCompletedChanged();
++    void enableFingerprintIdentificationChanged();
      void enableLauncherWhileLockedChanged();
      void enableIndicatorsWhileLockedChanged();
      void backgroundFileChanged();
      void statsWelcomeScreenChanged();
      void passwordDisplayHintChanged();
      void failedLoginsChanged();
++    void failedFingerprintLoginsChanged();
      void hereEnabledChanged();
      void hereLicensePathChanged();
      void realNameChanged();
@@ -134,12 +148,14 @@
      void keymapsChanged();
  private:
++    bool m_enableFingerprintIdentification;
      bool m_enableLauncherWhileLocked;
      bool m_enableIndicatorsWhileLocked;
      QString m_backgroundFile;
      QString m_user;
      bool m_statsWelcomeScreen;
      uint m_failedLogins;
++    uint m_failedFingerprintLogins;
      bool m_demoEdges;
      QStringList m_demoEdgesCompleted;
      bool m_hereEnabled;
 === added directory 'tests/mocks/Biometryd'
 === added file 'tests/mocks/Biometryd/CMakeLists.txt'
 --- tests/mocks/Biometryd/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/CMakeLists.txt	2016-06-20 20:23:46 +0000
@@ -0,0 +1,14 @@
++set(MOCK_BIOMETRYD_SOURCES
++    plugin.cpp
++    MockBiometryd.cpp
++    MockDevice.cpp
++    MockIdentifier.cpp
++    MockObserver.cpp
++    MockOperation.cpp
++)
++
++add_library(MockBiometryd MODULE ${MOCK_BIOMETRYD_SOURCES})
++
++qt5_use_modules(MockBiometryd Qml Quick Core)
++
++add_unity8_mock(Biometryd 0.0 Biometryd TARGETS MockBiometryd)
 === added file 'tests/mocks/Biometryd/MockBiometryd.cpp'
 --- tests/mocks/Biometryd/MockBiometryd.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockBiometryd.cpp	2016-06-20 20:23:46 +0000
@@ -0,0 +1,43 @@
++/*
++ * 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 "MockBiometryd.h"
++#include "MockDevice.h"
++
++MockBiometryd::MockBiometryd(QObject *parent)
++    : QObject(parent)
++    , m_device(new MockDevice(this))
++    , m_available(true)
++{
++}
++
++MockDevice *MockBiometryd::defaultDevice() const
++{
++    return m_device;
++}
++
++bool MockBiometryd::available() const
++{
++    return m_available;
++}
++
++void MockBiometryd::setAvailable(bool available)
++{
++    if (m_available != available) {
++        m_available = available;
++        Q_EMIT availableChanged();
++    }
++}
 === added file 'tests/mocks/Biometryd/MockBiometryd.h'
 --- tests/mocks/Biometryd/MockBiometryd.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockBiometryd.h	2016-06-20 20:23:46 +0000
@@ -0,0 +1,50 @@
++/*
++ * 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_H
++#define MOCK_BIOMETRYD_H
++
++#include <QObject>
++
++#include "MockDevice.h"
++
++class MockBiometryd : public QObject
++{
++    Q_OBJECT
++    Q_DISABLE_COPY(MockBiometryd)
++    Q_PROPERTY(MockDevice *defaultDevice READ defaultDevice CONSTANT)
++    Q_PROPERTY(bool available
++               READ available
++               WRITE setAvailable // only in mock
++               NOTIFY availableChanged)
++
++public:
++    explicit MockBiometryd(QObject *parent = 0);
++
++    MockDevice *defaultDevice() const;
++
++    bool available() const;
++    void setAvailable(bool available);
++
++Q_SIGNALS:
++    void availableChanged();
++
++private:
++    MockDevice *m_device;
++    bool m_available;
++};
++
++#endif // MOCK_BIOMETRYD_H
 === added file 'tests/mocks/Biometryd/MockDevice.cpp'
 --- tests/mocks/Biometryd/MockDevice.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockDevice.cpp	2016-06-20 20:23:46 +0000
@@ -0,0 +1,29 @@
++/*
++ * 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"
++#include "MockIdentifier.h"
++
++MockDevice::MockDevice(QObject *parent)
++    : QObject(parent)
++    , m_identifier(new MockIdentifier(this))
++{
++}
++
++MockIdentifier *MockDevice::identifier() const
++{
++    return m_identifier;
++}
 === added file 'tests/mocks/Biometryd/MockDevice.h'
 --- tests/mocks/Biometryd/MockDevice.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockDevice.h	2016-06-20 20:23:46 +0000
@@ -0,0 +1,40 @@
++/*
++ * 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 "MockIdentifier.h"
++
++class MockDevice : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(MockIdentifier *identifier READ identifier CONSTANT)
++
++public:
++    explicit MockDevice(QObject *parent = 0);
++
++    MockIdentifier *identifier() const;
++
++private:
++    MockIdentifier *m_identifier;
++};
++
++Q_DECLARE_METATYPE(MockDevice*)
++
++#endif // MOCK_DEVICE_H
 === added file 'tests/mocks/Biometryd/MockIdentifier.cpp'
 --- tests/mocks/Biometryd/MockIdentifier.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockIdentifier.cpp	2016-06-20 20:23:46 +0000
@@ -0,0 +1,28 @@
++/*
++ * 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 "MockIdentifier.h"
++#include "MockOperation.h"
++
++MockIdentifier::MockIdentifier(QObject *parent)
++    : QObject(parent)
++{
++}
++
++MockOperation *MockIdentifier::identifyUser()
++{
++    return new MockOperation(this);
++}
 === added file 'tests/mocks/Biometryd/MockIdentifier.h'
 --- tests/mocks/Biometryd/MockIdentifier.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockIdentifier.h	2016-06-20 20:23:46 +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_IDENTIFIER_H
++#define MOCK_IDENTIFIER_H
++
++#include <QObject>
++
++#include "MockOperation.h"
++
++class MockIdentifier : public QObject
++{
++    Q_OBJECT
++
++public:
++    explicit MockIdentifier(QObject *parent = 0);
++
++    Q_INVOKABLE MockOperation *identifyUser();
++};
++
++Q_DECLARE_METATYPE(MockIdentifier*)
++
++#endif // MOCK_IDENTIFIER_H
 === added file 'tests/mocks/Biometryd/MockObserver.cpp'
 --- tests/mocks/Biometryd/MockObserver.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockObserver.cpp	2016-06-20 20:23:46 +0000
@@ -0,0 +1,22 @@
++/*
++ * 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"
++
++MockObserver::MockObserver(QObject *parent)
++    : QObject(parent)
++{
++}
 === added file 'tests/mocks/Biometryd/MockObserver.h'
 --- tests/mocks/Biometryd/MockObserver.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockObserver.h	2016-06-20 20:23:46 +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 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_SIGNALS:
++    void succeeded(const QVariant &result);
++    void failed(const QString &reason);
++};
++
++#endif // MOCK_OBSERVER_H
 === added file 'tests/mocks/Biometryd/MockOperation.cpp'
 --- tests/mocks/Biometryd/MockOperation.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockOperation.cpp	2016-06-20 20:23:46 +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 <QString>
++#include <QVariant>
++
++#include "MockOperation.h"
++
++MockOperation::MockOperation(QObject *parent)
++    : QObject(parent)
++    , m_observer(nullptr)
++{
++}
++
++bool MockOperation::running() const
++{
++    return m_observer != nullptr;
++}
++
++void MockOperation::start(QObject *observer)
++{
++    if (!m_observer)
++        m_observer = observer;
++}
++
++void MockOperation::cancel()
++{
++    m_observer = nullptr;
++}
++
++void MockOperation::mockSuccess(unsigned int uid)
++{
++    if (m_observer)
++        QMetaObject::invokeMethod(m_observer, "succeeded", Qt::DirectConnection,
++                                  Q_ARG(QVariant, QVariant::fromValue(uid)));
++}
++
++void MockOperation::mockFailure(const QString &reason)
++{
++    if (m_observer)
++        QMetaObject::invokeMethod(m_observer, "failed", Qt::DirectConnection,
++                                  Q_ARG(QString, reason));
++}
 === added file 'tests/mocks/Biometryd/MockOperation.h'
 --- tests/mocks/Biometryd/MockOperation.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/MockOperation.h	2016-06-20 20:23:46 +0000
@@ -0,0 +1,48 @@
++/*
++ * 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 MockOperation : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(bool running READ running NOTIFY runningChanged) // only in mock
++
++public:
++    explicit MockOperation(QObject *parent = 0);
++
++    Q_INVOKABLE void start(QObject *observer);
++    Q_INVOKABLE void cancel();
++
++    Q_INVOKABLE void mockSuccess(unsigned int uid); // only in mock
++    Q_INVOKABLE void mockFailure(const QString &reason); // only in mock
++
++    bool running() const; // only in mock
++
++Q_SIGNALS:
++    void runningChanged();
++
++private:
++    QObject *m_observer;
++    bool m_running;
++};
++
++Q_DECLARE_METATYPE(MockOperation*)
++
++#endif // MOCK_OPERATION_H
 === added file 'tests/mocks/Biometryd/plugin.cpp'
 --- tests/mocks/Biometryd/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/plugin.cpp	2016-06-20 20:23:46 +0000
@@ -0,0 +1,41 @@
++/*
++ * 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 "MockBiometryd.h"
++#include "MockDevice.h"
++#include "MockIdentifier.h"
++#include "MockObserver.h"
++#include "MockOperation.h"
++
++#include <QtQml>
++
++static QObject *biometryd_provider(QQmlEngine *, QJSEngine *)
++{
++    return new MockBiometryd();
++}
++
++void BackendPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("Biometryd"));
++
++    qmlRegisterType<MockObserver>(uri, 0, 0, "Observer");
++    qmlRegisterSingletonType<MockBiometryd>(uri, 0, 0, "Biometryd", biometryd_provider);
++
++    qRegisterMetaType<MockDevice*>();
++    qRegisterMetaType<MockIdentifier*>();
++    qRegisterMetaType<MockOperation*>();
++}
 === added file 'tests/mocks/Biometryd/plugin.h'
 --- tests/mocks/Biometryd/plugin.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/plugin.h	2016-06-20 20:23:46 +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/mocks/Biometryd/qmldir'
 --- tests/mocks/Biometryd/qmldir	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Biometryd/qmldir	2016-06-20 20:23:46 +0000
@@ -0,0 +1,3 @@
++module Biometryd
++plugin MockBiometryd
++typeinfo Biometryd.qmltypes
 === modified file 'tests/mocks/CMakeLists.txt'
 --- tests/mocks/CMakeLists.txt	2015-11-16 14:12:00 +0000
 +++ tests/mocks/CMakeLists.txt	2016-06-20 20:23:46 +0000
@@ -29,6 +29,7 @@
  endmacro()
  add_subdirectory(AccountsService)
++add_subdirectory(Biometryd)
  add_subdirectory(Cursor)
  add_subdirectory(GSettings.1.0)
  add_subdirectory(indicator-service)
 === modified file 'tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpp'
 --- tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-03-01 14:09:40 +0000
 +++ tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-06-20 20:23:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013-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
@@ -46,6 +46,7 @@
      roles[SessionRole] = "session";
      roles[HasMessagesRole] = "hasMessages";
      roles[ImagePathRole] = "imagePath";
++    roles[UidRole] = "uid";
      setRoleNames(roles);
+ }
@@ -95,6 +96,8 @@
          return d->entries[row].has_messages;
      case UsersModel::ImagePathRole:
          return "";
++    case UsersModel::UidRole:
++        return d->entries[row].uid;
      default:
          return QVariant();
+     }
 === modified file 'tests/mocks/IntegratedLightDM/liblightdm/UsersModel.h'
 --- tests/mocks/IntegratedLightDM/liblightdm/UsersModel.h	2015-04-30 09:31:51 +0000
 +++ tests/mocks/IntegratedLightDM/liblightdm/UsersModel.h	2016-06-20 20:23:46 +0000
@@ -50,7 +50,8 @@
                           SessionRole,
                           HasMessagesRole,
                           ImagePathRole,
--                         BackgroundPathRole
++                         BackgroundPathRole,
++                         UidRole
      };
      int rowCount(const QModelIndex &parent) const override;
 === modified file 'tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
 --- tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-05-18 19:03:11 +0000
 +++ tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-06-20 20:23:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-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
@@ -47,6 +47,12 @@
          resetEntries_full();
+     }
++    // Assign uids in a loop, just to avoid having to muck with them when
++    // adding or removing test users.
++    for (int i = 0; i < entries.size(); i++) {
++        entries[i].uid = i + 1;
++    }
++
      q->endResetModel();
+ }
@@ -54,7 +60,7 @@
+ {
      entries =
+     {
--        { "single", "Single User", 0, 0, false, false, 0, 0 },
++        { "single", "Single User", 0, 0, false, false, 0, 0, 0 },
      };
+ }
@@ -62,7 +68,7 @@
+ {
      entries =
+     {
--        { "single", "Single User", 0, 0, false, false, 0, 0 },
++        { "single", "Single User", 0, 0, false, false, 0, 0, 0 },
      };
+ }
@@ -70,7 +76,7 @@
+ {
      entries =
+     {
--        { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },
++        { "has-pin", "Has PIN", 0, 0, false, false, 0, 0, 0 },
      };
+ }
@@ -78,26 +84,26 @@
+ {
      entries =
+     {
--        { "has-password",      "Has Password", 0, 0, false, false, 0, 0 },
--        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0 },
--        { "different-prompt",  "Different Prompt", 0, 0, false, false, 0, 0 },
--        { "no-password",       "No Password", 0, 0, false, false, 0, 0 },
--        { "auth-error",        "Auth Error", 0, 0, false, false, 0, 0 },
--        { "two-factor",        "Two Factor", 0, 0, false, false, 0, 0 },
--        { "info-prompt",       "Info Prompt", 0, 0, false, false, 0, 0 },
--        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, 0, 0 },
--        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, 0, 0 },
--        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, 0, 0 },
--        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, 0, 0 },
--        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, 0, 0 },
--        { "color-background",  "Color Background", "#dd4814", 0, false, false, 0, 0 },
++        { "has-password",      "Has Password", 0, 0, false, false, 0, 0, 0 },
++        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0, 0 },
++        { "different-prompt",  "Different Prompt", 0, 0, false, false, 0, 0, 0 },
++        { "no-password",       "No Password", 0, 0, false, false, 0, 0, 0 },
++        { "auth-error",        "Auth Error", 0, 0, false, false, 0, 0, 0 },
++        { "two-factor",        "Two Factor", 0, 0, false, false, 0, 0, 0 },
++        { "info-prompt",       "Info Prompt", 0, 0, false, false, 0, 0, 0 },
++        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, 0, 0, 0 },
++        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, 0, 0, 0 },
++        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, 0, 0, 0 },
++        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, 0, 0, 0 },
++        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, 0, 0, 0 },
++        { "color-background",  "Color Background", "#dd4814", 0, false, false, 0, 0, 0 },
          // white and black are a bit redundant, but useful for manually testing if UI is still readable
--        { "white-background",  "White Background", "#ffffff", 0, false, false, 0, 0 },
--        { "black-background",  "Black Background", "#000000", 0, false, false, 0, 0 },
--        { "no-background",     "No Background", "", 0, false, false, 0, 0 },
--        { "unicode",           "가나다라마", 0, 0, false, false, 0, 0 },
--        { "no-response",       "No Response", 0, 0, false, false, 0, 0 },
--        { "empty-name",        "", 0, 0, false, false, 0, 0 },
++        { "white-background",  "White Background", "#ffffff", 0, false, false, 0, 0, 0 },
++        { "black-background",  "Black Background", "#000000", 0, false, false, 0, 0, 0 },
++        { "no-background",     "No Background", "", 0, false, false, 0, 0, 0 },
++        { "unicode",           "가나다라마", 0, 0, false, false, 0, 0, 0 },
++        { "no-response",       "No Response", 0, 0, false, false, 0, 0, 0 },
++        { "empty-name",        "", 0, 0, false, false, 0, 0, 0 },
      };
+ }
 === modified file 'tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.h'
 --- tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2015-01-20 11:50:19 +0000
 +++ tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2016-06-20 20:23:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-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
@@ -35,6 +35,7 @@
      bool has_messages;
      QString session;
      QString infographic;
++    uid_t uid;
  };
  class UsersModelPrivate
 === modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
 --- tests/qmltests/Components/tst_Lockscreen.qml	2016-02-26 16:28:14 +0000
 +++ tests/qmltests/Components/tst_Lockscreen.qml	2016-06-20 20:23:46 +0000
@@ -173,6 +173,7 @@
          function cleanup() {
              lockscreen.clear(false);
              delayMinutesTextField.text = "0"
++            enteredLabel.text = "";
              // Reset sizing
              root.width = units.gu(80)
@@ -247,7 +248,6 @@
+         }
          function test_unlock(data) {
--            enteredLabel.text = ""
              minPinLengthTextField.text = data.minPinLength
              maxPinLengthTextField.text = data.maxPinLength
              pinPadCheckBox.checked = data.alphanumeric
@@ -462,6 +462,25 @@
              compare(label.text, "Device Locked")
+         }
++        function test_showText_data() {
++            return [
++                { tag: "alphanumeric", alphanumeric: true },
++                { tag: "pinPad", alphanumeric: false },
++            ]
++        }
++
++        function test_showText(data) {
++            pinPadCheckBox.checked = data.alphanumeric;
++            waitForLockscreenReady();
++
++            lockscreen.showText("test");
++
++            var pinPadLoader = findChild(lockscreen, "pinPadLoader");
++            verify(pinPadLoader.waiting);
++            compare(enteredLabel.text, ""); // no entered signal should occur
++            compare(lockscreen.passphrase, "test");
++        }
++
          function test_resize_data() {
              return [
                  { tag: "small", width: units.gu(40), height: units.gu(76) },
 === modified file 'tests/qmltests/Greeter/TestView.qml'
 --- tests/qmltests/Greeter/TestView.qml	2015-07-15 15:07:19 +0000
 +++ tests/qmltests/Greeter/TestView.qml	2016-06-20 20:23:46 +0000
@@ -33,9 +33,11 @@
      property var infographicModel
      readonly property bool fullyShown: _fullyShown
      readonly property bool required: _required
++    readonly property bool animating: _animating
      property bool _fullyShown: true
      property bool _required: true
++    property bool _animating: true
      signal selected(int index)
      signal responded(string response)
@@ -46,8 +48,9 @@
      signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)
      signal _showLastChanceCalled()
      signal _hideCalled()
--    signal _notifyAuthenticationSucceededCalled()
++    signal _notifyAuthenticationSucceededCalled(bool showFakePassword)
      signal _notifyAuthenticationFailedCalled()
++    signal _showErrorMessageCalled(string msg)
      signal _resetCalled()
      signal _tryToUnlockCalled(bool toTheRight)
@@ -69,14 +72,18 @@
          _fullyShown = false;
+     }
--    function notifyAuthenticationSucceeded() {
--        _notifyAuthenticationSucceededCalled();
++    function notifyAuthenticationSucceeded(showFakePassword) {
++        _notifyAuthenticationSucceededCalled(showFakePassword);
+     }
      function notifyAuthenticationFailed() {
          _notifyAuthenticationFailedCalled();
+     }
++    function showErrorMessage(msg) {
++        _showErrorMessageCalled(msg);
++    }
++
      function reset() {
          _resetCalled();
+     }
 === modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
 --- tests/qmltests/Greeter/tst_Greeter.qml	2016-05-02 07:57:07 +0000
 +++ tests/qmltests/Greeter/tst_Greeter.qml	2016-06-20 20:23:46 +0000
@@ -20,6 +20,7 @@
  import "../../../qml/Greeter"
  import Ubuntu.Components 1.3
  import AccountsService 0.1
++import Biometryd 0.0
  import GSettings 1.0
  import IntegratedLightDM 0.1 as LightDM
  import Unity.Test 0.1 as UT
@@ -126,6 +127,12 @@
+         }
          SignalSpy {
++            id: viewShowErrorMessageSpy
++            target: testCase.view
++            signalName: "_showErrorMessageCalled"
++        }
++
++        SignalSpy {
              id: viewResetSpy
              target: testCase.view
              signalName: "_resetCalled"
@@ -143,12 +150,16 @@
              teaseSpy.clear();
              sessionStartedSpy.clear();
              activeChangedSpy.clear();
++            Biometryd.available = true;
++            AccountsService.enableFingerprintIdentification = true;
++            AccountsService.failedFingerprintLogins = 0;
              viewShowMessageSpy.clear();
              viewShowPromptSpy.clear();
              viewShowLastChanceSpy.clear();
              viewHideSpy.clear();
              viewAuthenticationSucceededSpy.clear();
              viewAuthenticationFailedSpy.clear();
++            viewShowErrorMessageSpy.clear();
              viewResetSpy.clear();
              viewTryToUnlockSpy.clear();
              tryCompare(greeter, "waiting", false);
@@ -200,6 +211,14 @@
              compare(greeter.shown, false);
+         }
++        function unlockAndShowGreeter() {
++            // useful to enable "lockscreen mode" in greeter
++            greeter.forcedUnlock = true;
++            LightDM.Greeter.showGreeter();
++            tryCompare(greeter, "waiting", false);
++            view = findChild(greeter, "testView");
++        }
++
          function test_unlockPass() {
              selectUser("has-password");
              tryCompare(viewShowPromptSpy, "count", 1);
@@ -553,5 +572,157 @@
              compare(viewResetSpy.count, 1);
              tryCompare(viewShowPromptSpy, "count", 1);
+         }
++
++        function test_fingerprintSuccess() {
++            var index = selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            verify(biometryd.operation);
++            verify(biometryd.operation.running);
++
++            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
++            verify(!greeter.active);
++        }
++
++        function test_fingerprintFirstLoginDisabled() {
++            var index = selectUser("has-password");
++            // don't hide/show greeter, we want to test behavior before lockscreen mode is on
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            verify(biometryd.operation);
++            verify(biometryd.operation.running);
++
++            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
++            compare(viewTryToUnlockSpy.count, 1);
++            verify(greeter.locked);
++        }
++
++        function test_forcedDisallowedFingerprint() {
++            var index = selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            verify(biometryd.operation);
++            verify(biometryd.operation.running);
++
++            greeter.allowFingerprint = false;
++            verify(!biometryd.operation);
++        }
++
++        function test_fingerprintFailureMessage() {
++            var index = selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            verify(biometryd.operation);
++            verify(biometryd.operation.running);
++
++            biometryd.operation.mockFailure("error");
++            compare(viewShowErrorMessageSpy.count, 1);
++            compare(viewShowErrorMessageSpy.signalArguments[0][0], i18n.tr("Try again"));
++        }
++
++        function test_fingerprintTooManyFailures() {
++            var index = selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            biometryd.operation.mockFailure("error");
++            biometryd.operation.mockFailure("error");
++            compare(viewTryToUnlockSpy.count, 0);
++
++            biometryd.operation.mockFailure("error");
++            compare(viewTryToUnlockSpy.count, 1);
++
++            // Confirm that we are stuck in this mode until next login
++            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
++            compare(viewTryToUnlockSpy.count, 2);
++
++            unlockAndShowGreeter();
++
++            biometryd.operation.mockSuccess(LightDM.Users.data(index, LightDM.UserRoles.UidRole));
++            verify(!greeter.active);
++        }
++
++        function test_fingerprintFailureCountReset() {
++            selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            biometryd.operation.mockFailure("error");
++            biometryd.operation.mockFailure("error");
++            compare(viewTryToUnlockSpy.count, 0);
++
++            unlockAndShowGreeter();
++            biometryd.operation.mockFailure("error");
++            biometryd.operation.mockFailure("error");
++            compare(viewTryToUnlockSpy.count, 0);
++
++            biometryd.operation.mockFailure("error");
++            compare(viewTryToUnlockSpy.count, 1);
++        }
++
++        function test_fingerprintWrongUid() {
++            selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            biometryd.operation.mockSuccess(0);
++
++            verify(greeter.active);
++            compare(viewShowErrorMessageSpy.count, 1);
++            compare(viewShowErrorMessageSpy.signalArguments[0][0], i18n.tr("Try again"));
++        }
++
++        function test_fingerprintNotEnabled() {
++            AccountsService.enableFingerprintIdentification = false;
++            selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            verify(!biometryd.operation);
++
++            AccountsService.enableFingerprintIdentification = true;
++            verify(biometryd.operation);
++            verify(biometryd.operation.running);
++
++            AccountsService.enableFingerprintIdentification = false;
++            verify(!biometryd.operation);
++        }
++
++        function test_fingerprintReaderNotPresent() {
++            Biometryd.available = false;
++            selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            verify(!Biometryd.available);
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            verify(!biometryd.operation);
++
++            Biometryd.available = true;
++            verify(biometryd.operation);
++            verify(biometryd.operation.running);
++
++            Biometryd.available = false;
++            verify(!biometryd.operation);
++        }
++
++        function test_fingerprintGreeterNotActive() {
++            selectUser("has-password");
++            unlockAndShowGreeter(); // turn on lockscreen mode
++
++            var biometryd = findInvisibleChild(greeter, "biometryd");
++            verify(biometryd.operation);
++            verify(biometryd.operation.running);
++
++            greeter.hideNow();
++            verify(!biometryd.operation);
++
++            greeter.showNow();
++            verify(biometryd.operation);
++            verify(biometryd.operation.running);
++        }
+     }
+ }
 === modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
 --- tests/qmltests/Greeter/tst_NarrowView.qml	2016-05-02 07:57:07 +0000
 +++ tests/qmltests/Greeter/tst_NarrowView.qml	2016-06-20 20:23:46 +0000
@@ -128,7 +128,7 @@
                          text: "Authenticated"
                          onClicked: {
                              if (successCheckBox.checked) {
--                                loader.item.notifyAuthenticationSucceeded();
++                                loader.item.notifyAuthenticationSucceeded(fakePasswordCheckBox.checked);
                              } else {
                                  loader.item.notifyAuthenticationFailed();
+                             }
@@ -140,6 +140,12 @@
                      Label {
                          text: "success"
+                     }
++                    CheckBox {
++                        id: fakePasswordCheckBox
++                    }
++                    Label {
++                        text: "fake password"
++                    }
+                 }
                  Row {
                      Button {
@@ -529,5 +535,20 @@
              mouseClick(coverPage, coverPage.width/2, coverPage.height - units.gu(2));
              verify(!coverPage.shown);
+         }
++
++        function test_showErrorMessage() {
++            var coverPage = findChild(view, "coverPage");
++            var swipeHint = findChild(coverPage, "swipeHint");
++            var errorMessageAnimation = findInvisibleChild(coverPage, "errorMessageAnimation");
++
++            view.showErrorMessage("hello");
++            compare(swipeHint.text, "《    hello    》");
++            verify(errorMessageAnimation.running);
++            verify(swipeHint.opacityAnimation.running);
++
++            errorMessageAnimation.complete();
++            swipeHint.opacityAnimation.complete();
++            tryCompare(swipeHint, "text", "《    " + i18n.tr("Unlock") + "    》");
++        }
+     }
+ }
 === modified file 'tests/qmltests/Greeter/tst_WideView.qml'
 --- tests/qmltests/Greeter/tst_WideView.qml	2016-06-01 19:37:11 +0000
 +++ tests/qmltests/Greeter/tst_WideView.qml	2016-06-20 20:23:46 +0000
@@ -170,7 +170,7 @@
                          text: "Authenticated"
                          onClicked: {
                              if (successCheckBox.checked) {
--                                loader.item.notifyAuthenticationSucceeded();
++                                loader.item.notifyAuthenticationSucceeded(false);
                              } else {
                                  loader.item.notifyAuthenticationFailed();
+                             }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-06-17 01:18:17 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-06-20 20:23:46 +0000
@@ -334,6 +334,33 @@
+                     }
+                 }
++                Label {
++                    text: "Fingerprint"
++                }
++                Row {
++                    Button {
++                        text: "Success"
++                        onClicked: {
++                            var biometryd = testCase.findInvisibleChild(shellContainer, "biometryd");
++                            var uid = 0;
++                            for (var i = 0; i < LightDM.Users.count; i++) {
++                                if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == AccountsService.user) {
++                                    uid = LightDM.Users.data(i, LightDM.UserRoles.UidRole);
++                                    break;
++                                }
++                            }
++                            biometryd.operation.mockSuccess(uid);
++                        }
++                    }
++
++                    Button {
++                        text: "Failure"
++                        onClicked: {
++                            var biometryd = testCase.findInvisibleChild(shellContainer, "biometryd");
++                            biometryd.operation.mockFailure("error");
++                        }
++                    }
++                }
+             }
+         }
+     }