Merge lp:~unity-team/unity/phablet-pinlock into lp:unity/phablet

[Michael Zanetti]

[Michael Terry (mterry)]

I haven't looked at the new code yet, but here's a review of some of the touch points with existing code:

670 + LightDM.Greeter.authenticate("has-pin")

Testing code?

715 + } else if (authenticationUser == "has-pin"){
716 + Q_EMIT q->showPrompt("Please enter your PIN:", Greeter::PromptTypeSecret);

Please make that just "PIN". That's what the pam_pin module does. And Shell.qml should check for an exact match, not an indexOf. In the UI, you can check for the string and present a nicer one if needed.

723 - Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
724 + Q_EMIT q->showPrompt("Please enter your password:", Greeter::PromptTypeSecret);

PAM will likely just give us "Password:", so we should keep our mock close to that. Plus, you'll have to change some of the qmltests that check for "Password" being passed back. You can, however, check in the UI if the string is "Password" and present something nicer. It's not translated from PAM. (Which reminds me, we should pass it through gettext in LoginList.qml)

732 - authenticated = (response == "password");
733 + if (authenticationUser == "has-password") {
734 + authenticated = (response == "password");

Actually, not only has-password has a password. All the users are assumed to have "password" as their password unless otherwise specified. (And no-password users never get to the handleRespond() function) So please just check for the pin user and fallback to checking for "password".

751 + { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },

I see you added the user to the "full" mock lightdm. I think it would be more useful to add a new mock liblightdm that only has the pin user. That way we can get a more phone-like experience.

See https://code.launchpad.net/~mterry/unity/phablet-greeter-single-user/+merge/166296 which will make the phone UI only active if there's just one user. And it shows how to add a new mock liblightdm (and corrects a couple bugs with our current multiple mock support).

[Michael Terry (mterry)]

Actually, let me double confirm that "Password: " is not translated from PAM. I see that it's marked for translation in PAM, but I thought LightDM used the C locale for that. It's hard to tell from the lightdm source, so I'll ask Robert.

[Michael Terry (mterry)]

<mterry> robert_ancell, does LightDM use the C locale with PAM, or will it actually get translated prompts back from it?
<robert_ancell> mterry, in trunk it uses the correct locale, in older versions the C locale

So... The prompt will be potentially translated, so we shouldn't check for "Password" like I proposed.

But my comment about keeping close to what PAM will give us in the mocks and just use "Password: " still stands.

[Michael Zanetti (mzanetti)]

> 670 + LightDM.Greeter.authenticate("has-pin")
> Testing code?

Don't really know. Somehow this needs to be triggered so designers and testers can have a go. I'm still unsure who actually should trigger this when the screen locks... This seemed like a sensible place to me. Where would you trigger the locking?

> 715 + } else if (authenticationUser == "has-pin"){
> 716 + Q_EMIT q->showPrompt("Please enter your PIN:",
> Greeter::PromptTypeSecret);
>
> Please make that just "PIN". That's what the pam_pin module does. And
> Shell.qml should check for an exact match, not an indexOf. In the UI, you can
> check for the string and present a nicer one if needed.

Done.

> 723 - Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
> 724 + Q_EMIT q->showPrompt("Please enter your password:",
> Greeter::PromptTypeSecret);
>
> PAM will likely just give us "Password:", so we should keep our mock close to
> that. Plus, you'll have to change some of the qmltests that check for
> "Password" being passed back. You can, however, check in the UI if the string
> is "Password" and present something nicer. It's not translated from PAM.
> (Which reminds me, we should pass it through gettext in LoginList.qml)
>
> 732 - authenticated = (response == "password");
> 733 + if (authenticationUser == "has-password") {
> 734 + authenticated = (response == "password");
>
> Actually, not only has-password has a password. All the users are assumed to
> have "password" as their password unless otherwise specified. (And no-
> password users never get to the handleRespond() function) So please just
> check for the pin user and fallback to checking for "password".

Done.

> 751 + { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },
>
> I see you added the user to the "full" mock lightdm. I think it would be more
> useful to add a new mock liblightdm that only has the pin user. That way we
> can get a more phone-like experience.

No. Because I need also the password user for the tests. This code does not only handle PINs but also passphrases by now. Don't think its useful to have another two single-user backends for those use cases when it can be handled by the full backend easily.

[Michael Zanetti (mzanetti)]

> <mterry> robert_ancell, does LightDM use the C locale with PAM, or will it
> actually get translated prompts back from it?
> <robert_ancell> mterry, in trunk it uses the correct locale, in older versions
> the C locale
>
> So... The prompt will be potentially translated, so we shouldn't check for
> "Password" like I proposed.
>
> But my comment about keeping close to what PAM will give us in the mocks and
> just use "Password: " still stands.

Waiting for some guidance on what to do here.

[Michael Terry (mterry)]

723 - Q_EMIT q->showPrompt("Password: ", Greeter::PromptTypeSecret);
724 + Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);

This looks like an accidental change. We want to keep that space there to test that we strip the space successfully.

Additionally, we talked on IRC about how I'd like to see a new mock for a single PIN user.

[lp:~unity-team/unity/phablet-pinlock]

693. By Michael Zanetti on 2013-06-03

revert accidental change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:693
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity/phablet-pinlock/+merge/165924/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1123/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/998/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1002/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1123/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/phablet-pinlock]

694. By Michael Zanetti on 2013-06-03

merge trunk

695. By Michael Zanetti on 2013-06-03

always show password lockscreen (temporary)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:695
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity/phablet-pinlock/+merge/165924/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1124/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/999/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1003/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1124/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/phablet-pinlock]

696. By Michael Zanetti on 2013-06-03

added single user lightdm backend

use that by default, add -d to select demo one

697. By Michael Zanetti on 2013-06-03

revert to defaulting to the demo users

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:696
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity/phablet-pinlock/+merge/165924/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1126/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1001/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1005/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1126/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:697
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity/phablet-pinlock/+merge/165924/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1128/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1150/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1003/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1007/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1128/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/phablet-pinlock]

698. By Michael Zanetti on 2013-06-03

merge with mterry's single user branch

699. By Michael Zanetti on 2013-06-03

merge mterry single user branch

700. By Michael Zanetti on 2013-06-03

added a PIN test lib and a passphrase test lib

added -p and -k to run them

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:700
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity/phablet-pinlock/+merge/165924/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1129/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/1004/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/1008/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1129/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity/phablet-pinlock]

701. By Michael Zanetti on 2013-06-04

don't go to fullscreen mode as long as the lockscreen is here

702. By Michael Zanetti on 2013-06-04

reset lockscreen when greeter activates

703. By Michael Zanetti on 2013-06-04

make it translateable

704. By Michael Zanetti on 2013-06-04

remove debug echo

705. By Michael Zanetti on 2013-06-05

fix whitespaces

706. By Michael Zanetti on 2013-06-05

update usage() of run_on_device

707. By Michael Zanetti on 2013-06-05

fix getopts short args

708. By Michael Zanetti on 2013-06-05

remove unused imports

709. By Michael Zanetti on 2013-06-05

abstract WrongPasswordAnimation

710. By Michael Zanetti on 2013-06-05

fix some coding style issues

711. By Michael Zanetti on 2013-06-05

fix whitespace issues again

712. By Michael Zanetti on 2013-06-05

added missing copyright header

[Michael Terry (mterry)]

Looks mostly fine to me.

566 + // If there is only one user, we start authenticating with that one here.
567 + // If there are more users, the Greeter will handle that
568 + if (LightDM.Users.count == 1) {
569 + LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
570 + }

This feels a bit mismatched. I don't like the different code paths, though I get why you did it. No change requested, just noting.

As for the testing changes... I love the new plugins. But why add the has-pin user to the full/ plugin? I'd assume the single-pin/ plugin was the choice for testing the PIN screen. Similarly, the passphrase screen isn't tested via the single-passphrase/ plugin.

Unmerged revisions

712. By Michael Zanetti on 2013-06-05

added missing copyright header

711. By Michael Zanetti on 2013-06-05

fix whitespace issues again

710. By Michael Zanetti on 2013-06-05

fix some coding style issues

709. By Michael Zanetti on 2013-06-05

abstract WrongPasswordAnimation

708. By Michael Zanetti on 2013-06-05

remove unused imports

707. By Michael Zanetti on 2013-06-05

fix getopts short args

706. By Michael Zanetti on 2013-06-05

update usage() of run_on_device

705. By Michael Zanetti on 2013-06-05

fix whitespaces

704. By Michael Zanetti on 2013-06-04

remove debug echo

703. By Michael Zanetti on 2013-06-04

make it translateable

=== modified file 'Greeter/Greeter.qml'
--- Greeter/Greeter.qml	2013-05-20 11:05:59 +0000
+++ Greeter/Greeter.qml	2013-06-03 18:14:27 +0000
@@ -27,8 +27,8 @@
     property alias model: greeterContentLoader.model
     property bool locked: shown && multiUser && !greeterContentLoader.promptless
 
-    readonly property bool narrowMode: width <= units.gu(60)
-    readonly property bool multiUser: !narrowMode // TODO: populate with real value
+    readonly property bool narrowMode: !multiUser && width <= units.gu(60)
+    readonly property bool multiUser: LightDM.Users.count > 1
 
     readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.leftTeaserPressed
 

=== added file 'Greeter/Lockscreen.qml'
--- Greeter/Lockscreen.qml	1970-01-01 00:00:00 +0000
+++ Greeter/Lockscreen.qml	2013-06-03 18:14:27 +0000
@@ -0,0 +1,142 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+import Ubuntu.Components 0.1
+import "../Components"
+import LightDM 0.1 as LightDM
+
+Showable {
+    id: root
+
+    // Determine if a numeric or alphanumeric pad is used.
+    property bool alphaNumeric: false
+
+    // Placeholder text
+    property string placeholderText: ""
+
+    // In case the Lockscreen can show a greeter message, this is the username
+    property string username: ""
+
+    // As the numeric PIN pad doesn't have a OK button by design, we need to auto-confirm on a certain length.
+    // This is ignored by the alphaNumeric lockscreen as that one is confirmed with pressing enter on the OSK.
+    property int pinLength: 4
+
+    property url background: ""
+
+    signal unlocked()
+    signal cancel()
+    signal emergencyCall()
+
+    Image {
+        anchors.fill: parent
+        source: root.required ? root.background : ""
+    }
+
+    MouseArea {
+        anchors.fill: root
+    }
+
+    Loader {
+        id: pinPadLoader
+        objectName: "pinPadLoader"
+        anchors {
+            left: parent.left
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+            verticalCenterOffset: root.alphaNumeric ? -units.gu(10) : 0
+        }
+
+        source: root.alphaNumeric ? "PassphraseLockscreen.qml" : "PinLockscreen.qml"
+
+        Connections {
+            target: pinPadLoader.item
+
+            onEntered: {
+                LightDM.Greeter.respond(passphrase);
+            }
+
+            onCancel: {
+                root.cancel()
+            }
+        }
+
+        Binding {
+            target: pinPadLoader.item
+            property: "pinLength"
+            value: root.pinLength
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "placeholderText"
+            value: root.placeholderText
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "username"
+            value: root.username
+        }
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            top: pinPadLoader.bottom
+            topMargin: units.gu(4)
+            right: parent.right
+            bottom: parent.bottom
+        }
+        spacing: units.gu(1)
+        Icon {
+            objectName: "emergencyCallIcon"
+            height: units.gu(3)
+            width: height
+            anchors.horizontalCenter: parent.horizontalCenter
+            name: "phone-app-call-symbolic"
+            color: "white"
+            opacity: 0.9
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: root.emergencyCall()
+            }
+        }
+        Label {
+            text: "Emergency call"
+            color: "white"
+            opacity: 0.9
+            fontSize: "medium"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+    }
+
+    Connections {
+        target: LightDM.Greeter
+
+        onAuthenticationComplete: {
+            if (LightDM.Greeter.promptless) {
+                return;
+            }
+            if (LightDM.Greeter.authenticated) {
+                root.unlocked();
+                pinPadLoader.item.clear(false);
+            } else {
+                pinPadLoader.item.clear(true);
+            }
+        }
+    }
+}

=== added file 'Greeter/PassphraseLockscreen.qml'
--- Greeter/PassphraseLockscreen.qml	1970-01-01 00:00:00 +0000
+++ Greeter/PassphraseLockscreen.qml	2013-06-03 18:14:27 +0000
@@ -0,0 +1,107 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    id: root
+    height: highlightItem.height
+
+    property alias placeholderText: pinentryField.placeholderText
+    property string username: ""
+
+    signal entered(string passphrase)
+    signal cancel()
+
+    function clear(playAnimation) {
+        pinentryField.text = "";
+        if (playAnimation) {
+            wrongPasswordAnimation.start();
+        } else {
+            pinentryField.focus = false
+        }
+    }
+
+    Rectangle {
+        id: highlightItem
+        width: units.gu(32)
+        height: units.gu(10)
+        anchors.centerIn: parent
+        color: Qt.rgba(0.1, 0.1, 0.1, 0.4)
+        border.color: Qt.rgba(0.4, 0.4, 0.4, 0.4)
+        border.width: units.dp(1)
+        radius: units.gu(1.5)
+        antialiasing: true
+
+        Label {
+            objectName: "greeterLabel"
+            anchors {
+                left: parent.left
+                top: parent.top
+                right: parent.right
+                margins: units.gu(1.5)
+            }
+            text: root.username.length > 0 ? "Hello %1".arg(root.username) : ""
+            color: "white"
+        }
+
+        TextField {
+            id: pinentryField
+            objectName: "pinentryField"
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                bottom: parent.bottom
+                margins: units.gu(1)
+            }
+            height: units.gu(4.5)
+            width: parent.width - units.gu(2)
+            echoMode: TextInput.Password
+            opacity: 0.9
+            hasClearButton: false
+
+            onAccepted: {
+                root.entered(pinentryField.text);
+            }
+        }
+    }
+
+    SequentialAnimation {
+        id: wrongPasswordAnimation
+        NumberAnimation {
+            target: pinentryField
+            property: "anchors.horizontalCenterOffset"
+            duration: 50
+            easing.type: Easing.InQuad
+            to: units.gu(2)
+        }
+        NumberAnimation {
+            target: pinentryField
+            property: "anchors.horizontalCenterOffset"
+            duration: 100
+            easing.type: Easing.InOutQuad
+            to: -units.gu(2)
+        }
+        NumberAnimation {
+            target: pinentryField
+            easing.type: Easing.OutElastic
+            properties: "anchors.horizontalCenterOffset"
+            to: 0
+            duration: 400
+            easing.overshoot: units.gu(2)
+        }
+    }
+}

=== added file 'Greeter/PinLockscreen.qml'
--- Greeter/PinLockscreen.qml	1970-01-01 00:00:00 +0000
+++ Greeter/PinLockscreen.qml	2013-06-03 18:14:27 +0000
@@ -0,0 +1,131 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Column {
+    id: root
+    anchors.centerIn: parent
+    spacing: units.gu(2.5)
+
+    property alias placeholderText: pinentryField.placeholderText
+    property int padWidth: units.gu(32)
+    property int pinLength: 4
+
+    signal entered(string passphrase)
+    signal cancel()
+
+    function clear(playAnimation) {
+        pinentryField.text = "";
+        if (playAnimation) {
+            wrongPasswordAnimation.start();
+        }
+    }
+
+    TextField {
+        id: pinentryField
+        objectName: "pinentryField"
+        anchors.horizontalCenter: parent.horizontalCenter
+        width: units.gu(32)
+        height: units.gu(5)
+        echoMode: TextInput.Password
+        font.pixelSize: units.dp(44)
+        color: "white"
+        opacity: 0.9
+        hasClearButton: false
+        horizontalAlignment: Text.AlignHCenter
+
+        onTextChanged: {
+            if (pinentryField.text.length === root.pinLength) {
+                root.entered(pinentryField.text);
+            }
+        }
+
+        // Using a MouseArea to eat clicks. We don't want to disable the TextField for styling reasons
+        MouseArea {
+            anchors.fill: parent
+        }
+    }
+
+    Grid {
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: (parent.width - root.padWidth) / 2
+        }
+
+        columns: 3
+        spacing: units.gu(1)
+
+        Repeater {
+            model: 9
+
+            PinPadButton {
+                objectName: "pinPadButton" + (index + 1)
+                text: index + 1
+
+                onClicked: {
+                    pinentryField.text = pinentryField.text + text
+                }
+            }
+        }
+
+        PinPadButton {
+            objectName: "pinPadButtonBack"
+            iconName: "back"
+            onClicked: root.cancel();
+
+        }
+        PinPadButton {
+            objectName: "pinPadButton0"
+            text: "0"
+            onClicked: pinentryField.text = pinentryField.text + text
+
+        }
+        PinPadButton {
+            objectName: "pinPadButtonErase"
+            iconName: "erase"
+            onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1)
+        }
+    }
+
+    SequentialAnimation {
+        id: wrongPasswordAnimation
+        NumberAnimation {
+            target: pinentryField
+            property: "anchors.horizontalCenterOffset"
+            duration: 50
+            easing.type: Easing.InQuad
+            to: units.gu(2)
+        }
+        NumberAnimation {
+            target: pinentryField
+            property: "anchors.horizontalCenterOffset"
+            duration: 100
+            easing.type: Easing.InOutQuad
+            to: -units.gu(2)
+        }
+        NumberAnimation {
+            target: pinentryField
+            easing.type: Easing.OutElastic
+            properties: "anchors.horizontalCenterOffset"
+            to: 0
+            duration: 400
+            easing.overshoot: units.gu(2)
+        }
+    }
+}

=== added file 'Greeter/PinPadButton.qml'
--- Greeter/PinPadButton.qml	1970-01-01 00:00:00 +0000
+++ Greeter/PinPadButton.qml	2013-06-03 18:14:27 +0000
@@ -0,0 +1,60 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+UbuntuShape {
+    id: root
+    width: units.gu(10)
+    height: units.gu(7)
+    radius: "medium"
+    
+    property alias text: label.text
+    property alias iconName: icon.name
+
+    signal clicked()
+    
+    Behavior on color {
+        ColorAnimation { duration: 100 }
+    }
+    
+    Label {
+        id: label
+        anchors.centerIn: parent
+        color: "white"
+        fontSize: "x-large"
+        font.weight: Font.Light
+        opacity: 0.9
+    }
+
+    Icon {
+        id: icon
+        height: units.gu(3)
+        width: height
+        anchors.centerIn: parent
+        color: "white"
+        opacity: 0.9
+    }
+    
+    MouseArea {
+        anchors.fill: parent
+        onClicked: root.clicked()
+        onPressed: root.color = Qt.rgba(0, 0, 0, 0.3)
+        onReleased: root.color = Qt.rgba(0, 0, 0, 0)
+    }
+}
+

=== modified file 'Shell.qml'
--- Shell.qml	2013-06-03 08:29:01 +0000
+++ Shell.qml	2013-06-03 18:14:27 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Application 0.1
 import Ubuntu.Components 0.1
+import QtGraphicalEffects 1.0
 import LightDM 0.1 as LightDM
 import "Dash"
 import "Greeter"
@@ -124,7 +125,6 @@
 
     Item {
         id: underlay
-
         anchors.fill: parent
         visible: !(panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)
                  && (stages.fullyHidden
@@ -148,7 +148,7 @@
         Dash {
             id: dash
 
-            available: !greeter.shown
+            available: !greeter.shown && !lockscreen.shown
             hides: [stages, launcher, panel.indicators]
             shown: disappearingAnimationProgress !== 1.0
             enabled: disappearingAnimationProgress === 0.0
@@ -301,7 +301,7 @@
                             && sideStage[sideStageRevealer.boundProperty] == sideStageRevealer.openedValue
                 shouldUseScreenshots: !fullyShown || mainStage.usingScreenshots || sideStageRevealer.pressed
 
-                available: !greeter.shown && enabled
+                available: !greeter.shown && !lockscreen.shown && enabled
                 hides: [launcher, panel.indicators]
                 shown: false
                 showAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.openedValue; easing.type: Easing.OutQuint }
@@ -352,6 +352,40 @@
         orientation: Qt.Horizontal
     }
 
+    Lockscreen {
+        id: lockscreen
+        hides: [launcher, panel.indicators, hud]
+        shown: false
+        enabled: true
+        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
+        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
+        y: panel.panelHeight
+        x: required ? 0 : - width
+        width: parent.width
+        height: parent.height - panel.panelHeight
+        background: shell.background
+
+        onUnlocked: lockscreen.hide()
+        onCancel: greeter.show()
+
+        Component.onCompleted: LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
+    }
+
+    Connections {
+        target: LightDM.Greeter
+
+        onShowPrompt: {
+            // TODO: There's no better way for now to determine if its a PIN or a passphrase.
+            if (text == "PIN") {
+                lockscreen.alphaNumeric = false
+            } else {
+                lockscreen.alphaNumeric = true
+            }
+            lockscreen.placeholderText = "Please enter %1:".arg(text);
+            lockscreen.show();
+        }
+    }
+
     Greeter {
         id: greeter
 
@@ -360,7 +394,6 @@
         shown: true
         showAnimation: StandardAnimation { property: "x"; to: greeterRevealer.openedValue }
         hideAnimation: StandardAnimation { property: "x"; to: greeterRevealer.closedValue }
-
         y: panel.panelHeight
         width: parent.width
         height: parent.height - panel.panelHeight
@@ -370,6 +403,11 @@
 
         onShownChanged: {
             if (shown) {
+                // If there is only one user, we start authenticating with that one here.
+                // If there are more users, the Greeter will handle that
+                if (LightDM.Users.count == 1) {
+                    LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
+                }
                 greeter.forceActiveFocus();
                 // FIXME: *FocusedApplication are not updated when unfocused, hence the need to check whether
                 // the stage was actually shown
@@ -397,7 +435,7 @@
 
     InputFilterArea {
         anchors.fill: parent
-        blockInput: greeter.shown
+        blockInput: greeter.shown || lockscreen.shown
     }
 
     Revealer {
@@ -426,7 +464,7 @@
                 hides: [launcher]
             }
             fullscreenMode: shell.fullscreenMode
-            searchVisible: !greeter.shown
+            searchVisible: !greeter.shown && !lockscreen.shown
 
             InputFilterArea {
                 anchors.fill: parent
@@ -440,7 +478,7 @@
             width: parent.width > units.gu(60) ? units.gu(40) : parent.width
             height: parent.height
 
-            available: !greeter.shown && !panel.indicators.shown
+            available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown
             shown: false
             showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }
             hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }

=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2013-04-22 14:30:45 +0000
+++ cmake/modules/QmlTest.cmake	2013-06-03 18:14:27 +0000
@@ -23,7 +23,7 @@
 
 macro(add_qml_test SUBPATH COMPONENT_NAME)
     set(options NO_ADD_TEST NO_TARGETS)
-    set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES)
+    set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
 
     cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
 
@@ -44,6 +44,7 @@
     endif()
 
     set(qmltest_command
+        env ${qmltest_ENVIRONMENT}
         ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
             ${qmltestrunner_imports}
             -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml

=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2013-05-28 10:26:22 +0000
+++ plugins/LightDM/CMakeLists.txt	2013-06-03 18:14:27 +0000
@@ -40,4 +40,4 @@
 
 install(FILES qmldir
     DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
-    )
\ No newline at end of file
+    )

=== modified file 'run'
--- run	2013-05-28 09:32:03 +0000
+++ run	2013-06-03 18:14:27 +0000
@@ -4,6 +4,8 @@
 export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib
 GDB=false
 FAKE=false
+PINLOCK=false
+KEYLOCK=false
 MOUSE_TOUCH=true
 
 usage() {
@@ -11,6 +13,8 @@
     echo "Script to run the shell.\n" >&2
     echo "OPTIONS:" >&2
     echo " -f, --fake Force use of fake Qml modules." >&2
+    echo " -p, --pinlock Use a pin protected user." >&2
+    echo " -k, --keylock Use a passphrase protected user." >&2
     echo " -g, --gdb Run through gdb." >&2
     echo " -h, --help Show this help." >&2
     echo " -m, --nomousetouch Run without -mousetouch argument." >&2
@@ -18,7 +22,7 @@
     exit 1
 }
 
-ARGS=`getopt -n$0 -u -a --longoptions="fake,gdb,help,nomousetouch" -o "fghm" -- "$@"`
+ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,nomousetouch" -o "fghm" -- "$@"`
 [ $? -ne 0 ] && usage
 eval set -- "$ARGS"
 
@@ -26,6 +30,8 @@
 do
     case "$1" in
        -f|--fake)  FAKE=true;;
+       -p|--pinlock)  PINLOCK=true;;
+       -k|--keylock)  KEYLOCK=true;;
        -g|--gdb)   GDB=true;;
        -h|--help)  usage;;
        -m|--nomousetouch)  MOUSE_TOUCH=false;;
@@ -36,7 +42,17 @@
 
 if $FAKE; then
   export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins
-  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/full
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single
+fi
+
+if $PINLOCK; then
+  export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single-pin
+fi
+
+if $KEYLOCK; then
+  export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins
+  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single-passphrase
 fi
 
 # Force icon theme if running on the desktop, otherwise gnome theme (if running

=== modified file 'run_on_device'
--- run_on_device	2013-05-29 08:21:31 +0000
+++ run_on_device	2013-06-03 18:14:27 +0000
@@ -11,6 +11,8 @@
 RUN_OPTIONS=-qmljsdebugger=port:$TARGET_DEBUG_PORT
 SETUP=false
 GDB=false
+PINLOCK=false
+KEYLOCK=false
 SUDO="echo $PASSWORD | sudo -S"
 NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
 
@@ -83,11 +85,20 @@
         adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
     fi
     adb shell pkill $BINARY
+    ARGS="--nomousetouch"
     if $GDB; then
-        exec_with_ssh "cd $CODE_DIR/ && ./run --gdb --nomousetouch -- $RUN_OPTIONS"
-    else
-        exec_with_ssh "cd $CODE_DIR && ./run --nomousetouch -- $RUN_OPTIONS"
-    fi
+        ARGS="$ARGS --gdb"
+    fi
+    if $PINLOCK; then
+        ARGS="$ARGS -p"
+    fi
+    if $KEYLOCK; then
+        ARGS="$ARGS -k"
+    fi
+
+    echo "################################################### $ARGS"
+    exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"
+
     if [ $CONTAINS_SHELL -eq 0 ]; then
         echo "Restoring $SERVICEFILE on device from $SERVICEFILE.backup"
         adb shell cp $SERVICEFILE.backup $SERVICEFILE
@@ -95,7 +106,7 @@
     fi
 }
 
-set -- `getopt -n$0 -u -a --longoptions="setup,gdb,help" "sgh" "$@"`
+set -- `getopt -n$0 -u -a --longoptions="setup,gdb,pinlock,keylock,help" "sgh" "$@"`
 
 # FIXME: giving incorrect arguments does not call usage and exit
 while [ $# -gt 0 ]
@@ -103,6 +114,8 @@
     case "$1" in
        -s|--setup)   SETUP=true;;
        -g|--gdb)     GDB=true;;
+       -p|--pinlock)     PINLOCK=true;;
+       -k|--keylock)     KEYLOCK=true;;
        -h|--help)    usage;;
        --)           shift;break;;
     esac

=== modified file 'tests/autopilot/qml_phone_shell/tests/__init__.py'
--- tests/autopilot/qml_phone_shell/tests/__init__.py	2013-05-31 00:55:24 +0000
+++ tests/autopilot/qml_phone_shell/tests/__init__.py	2013-06-03 18:14:27 +0000
@@ -23,6 +23,8 @@
 
     """A common test case class that provides several useful methods for shell tests."""
 
+    lightdm_mock = "full"
+
     def setUp(self, geometry, grid_size):
         super(ShellTestCase, self).setUp()
         # Lets assume we are installed system wide if this file is somewhere in /usr
@@ -37,7 +39,7 @@
             self.launch_test_local(geometry)
 
     def launch_test_local(self, geometry):
-        os.environ['LD_LIBRARY_PATH'] = "../../../unity_build/build/lib:../../builddir/tests/mocks/LightDM/full"
+        os.environ['LD_LIBRARY_PATH'] = "../../../unity_build/build/lib:../../builddir/tests/mocks/LightDM/" + self.lightdm_mock
         os.environ['QML2_IMPORT_PATH'] = "../../builddir/tests/mocks:../../builddir/plugins"
         if geometry != "0x0":
             self.app = self.launch_test_application(
@@ -47,7 +49,7 @@
                 "../../builddir/qml-phone-shell", "-fullscreen", app_type='qt')
 
     def launch_test_installed(self, geometry):
-        os.environ['LD_LIBRARY_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks/LightDM/full"
+        os.environ['LD_LIBRARY_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks/LightDM/" + self.lightdm_mock
         os.environ['QML2_IMPORT_PATH'] = "/usr/share/qml-phone-shell/plugins/mocks:/usr/share/qml-phone-shell/plugins"
         if model() == 'Desktop' and geometry != "0x0":
             self.app = self.launch_test_application(

=== modified file 'tests/autopilot/qml_phone_shell/tests/testcases.py'
--- tests/autopilot/qml_phone_shell/tests/testcases.py	2013-05-24 16:49:38 +0000
+++ tests/autopilot/qml_phone_shell/tests/testcases.py	2013-06-03 18:14:27 +0000
@@ -52,15 +52,15 @@
 
     if model() == 'Desktop':
         scenarios = [
-            ('Nexus 4', dict(app_width=768, app_height=1280, grid_unit_px=18)),
-            ('Nexus 10', dict(app_width=2560, app_height=1600, grid_unit_px=20)),
+            ('Nexus 4', dict(app_width=768, app_height=1280, grid_unit_px=18, lightdm_mock="single")),
+            ('Nexus 10', dict(app_width=2560, app_height=1600, grid_unit_px=20, lightdm_mock="full")),
 # TODO: don't run fullscreen tests just yet as the VM is performing too badly for that. Enable this once
 # Autopilot tests are running on bear metal.
-#            ('Fullscreen', dict(app_width=0, app_height=0, grid_unit_px=10)),
+#            ('Fullscreen', dict(app_width=0, app_height=0, grid_unit_px=10, lightdm_mock="full")),
         ]
     else:
         scenarios = [
-            ('Fullscreen', dict(app_width=0, app_height=0, grid_unit_px=0)),
+            ('Fullscreen', dict(app_width=0, app_height=0, grid_unit_px=0, lightdm_mock="single")),
         ]
 
     def setUp(self):

=== modified file 'tests/mocks/LightDM/CMakeLists.txt'
--- tests/mocks/LightDM/CMakeLists.txt	2013-05-28 10:47:02 +0000
+++ tests/mocks/LightDM/CMakeLists.txt	2013-06-03 18:14:27 +0000
@@ -6,6 +6,9 @@
 
 add_subdirectory(demo)
 add_subdirectory(full)
+add_subdirectory(single)
+add_subdirectory(single-pin)
+add_subdirectory(single-passphrase)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -27,8 +30,10 @@
 # installed on the system.  So we make sure we link to our full fake version
 # At run time, we can point to whichever version we happen to be using via
 # LD_LIBRARY_PATH.
+add_dependencies(MockLightDM-qml MockLightDM-full)
 target_link_libraries(MockLightDM-qml
-    MockLightDM-full
+    -L${CMAKE_CURRENT_BINARY_DIR}/full
+    -llightdm-qt5-2
     )
 
 qt5_use_modules(MockLightDM-qml Gui Qml)

=== modified file 'tests/mocks/LightDM/demo/CMakeLists.txt'
--- tests/mocks/LightDM/demo/CMakeLists.txt	2013-05-28 10:47:02 +0000
+++ tests/mocks/LightDM/demo/CMakeLists.txt	2013-06-03 18:14:27 +0000
@@ -11,3 +11,4 @@
 add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
 
 qt5_use_modules(MockLightDM-demo Gui)
+

=== modified file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
--- tests/mocks/LightDM/demo/GreeterPrivate.cpp	2013-05-23 18:07:17 +0000
+++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -33,20 +33,13 @@
 {
     Q_Q(Greeter);
 
-    if (authenticationUser == "guest") {
-        authenticated = true;
-        Q_EMIT q->authenticationComplete();
-    } else {
-        Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);
-    }
+    authenticated = true;
+    Q_EMIT q->authenticationComplete();
 }
 
 void GreeterPrivate::handleRespond(const QString &response)
 {
-    Q_Q(Greeter);
-
-    authenticated = (response == "password");
-    Q_EMIT q->authenticationComplete();
+    Q_UNUSED(response);
 }
 
 }

=== modified file 'tests/mocks/LightDM/demo/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/demo/InfographicModelPrivate.cpp	2013-06-03 11:37:02 +0000
+++ tests/mocks/LightDM/demo/InfographicModelPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -44,20 +44,10 @@
     colours.push_back(QColor::fromRgbF(0.63, 0.53, 0.3));
     colours.push_back(QColor::fromRgbF(0.89, 0.56, 0.31));
 
-    colours.push_back(QColor::fromRgbF(0.17, 0.34, 0.36));
-    colours.push_back(QColor::fromRgbF(0.36, 0.54, 0.49));
-    colours.push_back(QColor::fromRgbF(0.65, 0.76, 0.64));
-
-    colours.push_back(QColor::fromRgbF(0.21, 0.38, 0.37));
-    colours.push_back(QColor::fromRgbF(0.35, 0.49, 0.5));
-    colours.push_back(QColor::fromRgbF(0.67, 0.75, 0.82));
-
     InfographicColorTheme first(colours[0], colours[1], colours[2]);
     InfographicColorTheme second(colours[3], colours[4], colours[5]);
     InfographicColorTheme eighth(colours[6], colours[7], colours[8]);
     InfographicColorTheme ninth(colours[9], colours[10], colours[11]);
-    InfographicColorTheme eleventh(colours[12], colours[13], colours[14]);
-    InfographicColorTheme twelfth(colours[15], colours[16], colours[17]);
 
     {
         QVariantList firstMonth;
@@ -71,7 +61,7 @@
         QSharedPointer<InfographicData> data(
                 new InfographicData("<b>52km</b> travelled", first, firstMonth,
                         ninth, secondMonth, this));
-        m_fakeData.insert("anna", data);
+        m_fakeData.insert("guest", data);
     }
 
     {
@@ -86,7 +76,7 @@
         QSharedPointer<InfographicData> data(
                 new InfographicData("<b>33</b> messages today", second,
                         firstMonth, eighth, secondMonth, this));
-        m_fakeData.insert("anna", data);
+        m_fakeData.insert("guest", data);
     }
 
     {
@@ -101,112 +91,7 @@
         QSharedPointer<InfographicData> data(
                 new InfographicData("<b>69</b> minutes talk time", eighth,
                         firstMonth, second, secondMonth, this));
-        m_fakeData.insert("anna", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>5km</b> travelled", ninth, firstMonth,
-                        first, secondMonth, this));
-        m_fakeData.insert("lois", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>33</b> messages today", eleventh,
-                        firstMonth, twelfth, secondMonth, this));
-        m_fakeData.insert("lois", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 17)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant());
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>19</b> minutes talk time", twelfth,
-                        firstMonth, eleventh, secondMonth, this));
-        m_fakeData.insert("lois", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 29)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>5km</b> travelled", first, firstMonth,
-                        ninth, secondMonth, this));
-        m_fakeData.insert("toomas", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 29)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>33</b> messages today", second,
-                        firstMonth, eighth, secondMonth, this));
-        m_fakeData.insert("toomas", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 29)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant());
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>19</b> minutes talk time", eighth,
-                        firstMonth, second, secondMonth, this));
-        m_fakeData.insert("toomas", data);
-    }
-
-    {
-        QVariantList firstMonth;
-        while (firstMonth.size() < 15)
-            firstMonth.push_back(QVariant(rand()));
-        while (firstMonth.size() < 31)
-            firstMonth.push_back(QVariant());
-        QVariantList secondMonth;
-        while (secondMonth.size() < 31)
-            secondMonth.push_back(QVariant(rand()));
-        QSharedPointer<InfographicData> data(
-                new InfographicData("<b>6</b>hrs watching videos today",
-                        eleventh, firstMonth, first, secondMonth, this));
-        m_fakeData.insert("empty-name", data);
+        m_fakeData.insert("guest", data);
     }
 }
 

=== modified file 'tests/mocks/LightDM/demo/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2013-05-23 18:07:17 +0000
+++ tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -26,11 +26,7 @@
 {
     entries =
     {
-        { "anna",   "Anna Olson",   0, 0, false, false, 0, 0 },
-        { "lois",   "Lois Mcqueen", 0, 0, false, false, 0, 0 },
-        { "lola",   "Lola Chang",   0, 0, false, false, 0, 0 },
-        { "toomas", "Toomas Vilms", 0, 0, false, false, 0, 0 },
-        { "guest",  "Guest",        0, 0, false, false, 0, 0 },
+        { "guest", "Guest", 0, 0, false, false, 0, 0 },
     };
 }
 

=== modified file 'tests/mocks/LightDM/full/GreeterPrivate.cpp'
--- tests/mocks/LightDM/full/GreeterPrivate.cpp	2013-05-24 13:48:29 +0000
+++ tests/mocks/LightDM/full/GreeterPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -53,6 +53,8 @@
     if (authenticationUser == "no-password") {
         authenticated = true;
         Q_EMIT q->authenticationComplete();
+    } else if (authenticationUser == "has-pin"){
+        Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);
     } else if (authenticationUser == "auth-error") {
         authenticated = false;
         Q_EMIT q->authenticationComplete();
@@ -85,7 +87,11 @@
         return;
     }
 
-    authenticated = (response == "password");
+    if (authenticationUser == "has-pin") {
+        authenticated = (response == "1234");
+    } else {
+        authenticated = (response == "password");
+    }
     Q_EMIT q->authenticationComplete();
 }
 

=== modified file 'tests/mocks/LightDM/full/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/full/UsersModelPrivate.cpp	2013-05-23 19:53:33 +0000
+++ tests/mocks/LightDM/full/UsersModelPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -27,6 +27,7 @@
     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 },

=== added directory 'tests/mocks/LightDM/single'
=== added directory 'tests/mocks/LightDM/single-passphrase'
=== added file 'tests/mocks/LightDM/single-passphrase/CMakeLists.txt'
--- tests/mocks/LightDM/single-passphrase/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single-passphrase/CMakeLists.txt	2013-06-03 18:14:27 +0000
@@ -0,0 +1,21 @@
+set(LibLightDM_SOURCES
+    ../Greeter.cpp
+    ../UsersModel.cpp
+    ../InfographicModel.cpp
+    GreeterPrivate.cpp
+    UsersModelPrivate.cpp
+    InfographicModelPrivate.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+    )
+
+
+add_library(MockLightDM-single-passphrase SHARED ${LibLightDM_SOURCES})
+
+qt5_use_modules(MockLightDM-single-passphrase Gui)
+
+set_target_properties(MockLightDM-single-passphrase PROPERTIES
+                      OUTPUT_NAME lightdm-qt5-2)
+
+install(TARGETS MockLightDM-single-passphrase
+    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single-passphrase
+    )

=== added file 'tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "../Greeter.h"
+#include "../GreeterPrivate.h"
+
+#include <QDebug>
+
+namespace QLightDM
+{
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : authenticated(false),
+    authenticationUser(),
+    q_ptr(parent)
+{
+}
+
+void GreeterPrivate::handleAuthenticate()
+{
+    Q_Q(Greeter);
+
+    qDebug() << "handleAuthentication called!" << authenticationUser;
+
+    Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);
+}
+
+void GreeterPrivate::handleRespond(const QString &response)
+{
+    Q_Q(Greeter);
+
+
+    authenticated = (response == "password");
+    qDebug() << "responding" << response << authenticated;
+    Q_EMIT q->authenticationComplete();
+}
+
+}

=== added file 'tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single-passphrase/InfographicModelPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include "../InfographicModelPrivate.h"
+
+namespace QLightDM
+{
+
+void InfographicModelPrivate::generateFakeData()
+{
+    std::default_random_engine generator;
+    std::normal_distribution<qreal> distribution(0.5, 0.2);
+    auto rand = std::bind(distribution, generator);
+
+    QColor orange = QColor::fromRgbF(0.9, 0.3, 0.1, 1.0);
+    QColor yellow = QColor::fromRgbF(1.0, 0.6, 0.0, 1.0);
+    QColor red = QColor::fromRgbF(0.8, 0.0, 0.0, 1.0);
+    QColor darkPurple = QColor::fromRgbF(0.5, 0.2, 0.3, 1.0);
+    QColor lightPurple = QColor::fromRgbF(0.8, 0.1, 0.8, 1.0);
+    QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
+
+    InfographicColorTheme orangeTheme(orange, orange, orange);
+    InfographicColorTheme yellowTheme(yellow, yellow, yellow);
+    InfographicColorTheme redTheme(red, red, red);
+    InfographicColorTheme darkPurpleTheme(darkPurple, darkPurple, darkPurple);
+    InfographicColorTheme lightPurpleTheme(lightPurple, lightPurple,
+            lightPurple);
+    InfographicColorTheme pinkTheme(pink, pink, pink);
+
+    {
+        QVariantList firstMonth;
+        while (firstMonth.size() < 17)
+            firstMonth.push_back(QVariant(rand()));
+        while (firstMonth.size() < 31)
+            firstMonth.push_back(QVariant());
+        QVariantList secondMonth;
+        while (secondMonth.size() < 31)
+            secondMonth.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>5km</b> travelled", yellowTheme,
+                        firstMonth, orangeTheme, secondMonth, this));
+        m_fakeData.insert("has-pin", data);
+    }
+}
+
+}

=== added file 'tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp	2013-06-03 18:14:27 +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/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "../UsersModelPrivate.h"
+
+namespace QLightDM
+{
+
+UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
+  : q_ptr(parent)
+{
+    entries =
+    {
+        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0 },
+    };
+}
+
+}

=== added directory 'tests/mocks/LightDM/single-pin'
=== added file 'tests/mocks/LightDM/single-pin/CMakeLists.txt'
--- tests/mocks/LightDM/single-pin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single-pin/CMakeLists.txt	2013-06-03 18:14:27 +0000
@@ -0,0 +1,21 @@
+set(LibLightDM_SOURCES
+    ../Greeter.cpp
+    ../UsersModel.cpp
+    ../InfographicModel.cpp
+    GreeterPrivate.cpp
+    UsersModelPrivate.cpp
+    InfographicModelPrivate.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+    )
+
+
+add_library(MockLightDM-single-pin SHARED ${LibLightDM_SOURCES})
+
+qt5_use_modules(MockLightDM-single-pin Gui)
+
+set_target_properties(MockLightDM-single-pin PROPERTIES
+                      OUTPUT_NAME lightdm-qt5-2)
+
+install(TARGETS MockLightDM-single-pin
+    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single-pin
+    )

=== added file 'tests/mocks/LightDM/single-pin/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "../Greeter.h"
+#include "../GreeterPrivate.h"
+
+#include <QDebug>
+
+namespace QLightDM
+{
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : authenticated(false),
+    authenticationUser(),
+    q_ptr(parent)
+{
+}
+
+void GreeterPrivate::handleAuthenticate()
+{
+    Q_Q(Greeter);
+
+    qDebug() << "handleAuthentication called!" << authenticationUser;
+
+    Q_EMIT q->showPrompt("PIN:", Greeter::PromptTypeSecret);
+}
+
+void GreeterPrivate::handleRespond(const QString &response)
+{
+    Q_Q(Greeter);
+
+
+    authenticated = (response == "1234");
+    qDebug() << "responding" << response << authenticated;
+    Q_EMIT q->authenticationComplete();
+}
+
+}

=== added file 'tests/mocks/LightDM/single-pin/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/single-pin/InfographicModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single-pin/InfographicModelPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include "../InfographicModelPrivate.h"
+
+namespace QLightDM
+{
+
+void InfographicModelPrivate::generateFakeData()
+{
+    std::default_random_engine generator;
+    std::normal_distribution<qreal> distribution(0.5, 0.2);
+    auto rand = std::bind(distribution, generator);
+
+    QColor orange = QColor::fromRgbF(0.9, 0.3, 0.1, 1.0);
+    QColor yellow = QColor::fromRgbF(1.0, 0.6, 0.0, 1.0);
+    QColor red = QColor::fromRgbF(0.8, 0.0, 0.0, 1.0);
+    QColor darkPurple = QColor::fromRgbF(0.5, 0.2, 0.3, 1.0);
+    QColor lightPurple = QColor::fromRgbF(0.8, 0.1, 0.8, 1.0);
+    QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
+
+    InfographicColorTheme orangeTheme(orange, orange, orange);
+    InfographicColorTheme yellowTheme(yellow, yellow, yellow);
+    InfographicColorTheme redTheme(red, red, red);
+    InfographicColorTheme darkPurpleTheme(darkPurple, darkPurple, darkPurple);
+    InfographicColorTheme lightPurpleTheme(lightPurple, lightPurple,
+            lightPurple);
+    InfographicColorTheme pinkTheme(pink, pink, pink);
+
+    {
+        QVariantList firstMonth;
+        while (firstMonth.size() < 17)
+            firstMonth.push_back(QVariant(rand()));
+        while (firstMonth.size() < 31)
+            firstMonth.push_back(QVariant());
+        QVariantList secondMonth;
+        while (secondMonth.size() < 31)
+            secondMonth.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>5km</b> travelled", yellowTheme,
+                        firstMonth, orangeTheme, secondMonth, this));
+        m_fakeData.insert("has-pin", data);
+    }
+}
+
+}

=== added file 'tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp	2013-06-03 18:14:27 +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/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "../UsersModelPrivate.h"
+
+namespace QLightDM
+{
+
+UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
+  : q_ptr(parent)
+{
+    entries =
+    {
+        { "has-pin",           "Has PIN",      0, 0, false, false, 0, 0 },
+    };
+}
+
+}

=== added file 'tests/mocks/LightDM/single/CMakeLists.txt'
--- tests/mocks/LightDM/single/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single/CMakeLists.txt	2013-06-03 18:14:27 +0000
@@ -0,0 +1,20 @@
+set(LibLightDM_SOURCES
+    ../Greeter.cpp
+    ../InfographicModel.cpp
+    ../UsersModel.cpp
+    GreeterPrivate.cpp
+    InfographicModelPrivate.cpp
+    UsersModelPrivate.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+    )
+
+add_library(MockLightDM-single SHARED ${LibLightDM_SOURCES})
+
+qt5_use_modules(MockLightDM-single Gui)
+
+set_target_properties(MockLightDM-single PROPERTIES
+                      OUTPUT_NAME lightdm-qt5-2)
+
+install(TARGETS MockLightDM-single
+    DESTINATION ${SHELL_APP_DIR}/plugins/mocks/LightDM/single
+    )

=== added file 'tests/mocks/LightDM/single/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single/GreeterPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "../Greeter.h"
+#include "../GreeterPrivate.h"
+
+namespace QLightDM
+{
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : authenticated(false),
+    authenticationUser(),
+    twoFactorDone(false),
+    q_ptr(parent)
+{
+}
+
+void GreeterPrivate::handleAuthenticate()
+{
+    Q_Q(Greeter);
+
+    if (authenticationUser == "one") {
+        authenticated = true;
+        Q_EMIT q->authenticationComplete();
+    }
+}
+
+void GreeterPrivate::handleRespond(QString const &response)
+{
+    Q_UNUSED(response)
+}
+
+}

=== added file 'tests/mocks/LightDM/single/InfographicModelPrivate.cpp'
--- tests/mocks/LightDM/single/InfographicModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single/InfographicModelPrivate.cpp	2013-06-03 18:14:27 +0000
@@ -0,0 +1,28 @@
+/*
+ * 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/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include "../InfographicModelPrivate.h"
+
+namespace QLightDM
+{
+
+void InfographicModelPrivate::generateFakeData()
+{
+}
+
+}

=== added file 'tests/mocks/LightDM/single/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/single/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/LightDM/single/UsersModelPrivate.cpp	2013-06-03 18:14:27 +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/>.
+ *
+ * Author: Michael Terry <[e-mail]>
+ */
+
+#include "../UsersModelPrivate.h"
+
+namespace QLightDM
+{
+
+UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
+  : q_ptr(parent)
+{
+    entries =
+    {
+        { "one", "Only User", 0, 0, false, false, 0, 0 },
+    };
+}
+
+}

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-06-03 11:35:43 +0000
+++ tests/qmltests/CMakeLists.txt	2013-06-03 18:14:27 +0000
@@ -45,8 +45,12 @@
                                            ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/People PeopleFilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
-add_qml_test(Greeter Greeter IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
+add_qml_test(Greeter Lockscreen IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
                              PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
+add_qml_test(Greeter Tablet IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
+                            ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
+add_qml_test(Greeter Phone IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/mocks
+                           ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
 add_qml_test(Greeter Infographics IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(Hud Hud)
 add_qml_test(Hud Result)

=== added file 'tests/qmltests/Greeter/tst_Lockscreen.qml'
--- tests/qmltests/Greeter/tst_Lockscreen.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Greeter/tst_Lockscreen.qml	2013-06-03 18:14:27 +0000
@@ -0,0 +1,205 @@
+/*
+ * Copyright 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/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import ".."
+import "../../../Greeter"
+import Ubuntu.Components 0.1
+import LightDM 0.1 as LightDM
+import Unity.Test 0.1 as UT
+
+Rectangle {
+    width: units.gu(60)
+    height: units.gu(80)
+    color: "orange"
+
+    Lockscreen {
+        id: lockscreen
+        anchors.fill: parent
+        anchors.rightMargin: units.gu(18)
+        placeholderText: "Please enter your PIN"
+        alphaNumeric: pinPadCheckBox.checked
+        pinLength: pinLengthTextField.text
+        username: "Lola"
+    }
+
+    Connections {
+        target: lockscreen
+
+        onEmergencyCall: emergencyCheckBox.checked = true
+        onUnlocked: unlockedCheckBox.checked = true
+    }
+
+    Connections {
+        target: LightDM.Greeter
+
+        onShowPrompt: {
+            if (text.indexOf("PIN") >= 0) {
+                lockscreen.alphaNumeric = false
+            } else {
+                lockscreen.alphaNumeric = true
+            }
+            lockscreen.placeholderText = text;
+        }
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        anchors.leftMargin: lockscreen.width
+        color: "lightgray"
+
+        Column {
+            anchors.fill: parent
+            anchors.margins: units.gu(1)
+
+            Row {
+                CheckBox {
+                    id: pinPadCheckBox
+                }
+                Label {
+                    text: "Alphanumeric"
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+            Row {
+                CheckBox {
+                    id: emergencyCheckBox
+                }
+                Label {
+                    text: "Emergency Call"
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+            Row {
+                TextField {
+                    id: pinLengthTextField
+                    width: units.gu(7)
+                    text: "4"
+                }
+                Label {
+                    text: "PIN length"
+                }
+            }
+            Label {
+                id: pinLabel
+                anchors.verticalCenter: parent.verticalCenter
+            }
+            Row {
+                CheckBox {
+                    id: unlockedCheckBox
+                }
+                Label {
+                    text: "Unlocked signal"
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+            Button {
+                text: "start auth (1234)"
+                onClicked: LightDM.Greeter.authenticate("has-pin")
+            }
+            Button {
+                text: "start auth (password)"
+                onClicked: LightDM.Greeter.authenticate("has-password")
+            }
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "Lockscreen"
+        when: windowShown
+
+        function test_loading_data() {
+            return [
+                {tag: "numeric", alphanumeric: false, pinPadAvailable: true },
+                {tag: "alphanumeric", alphanumeric: true, pinPadAvailable: false }
+            ]
+        }
+
+        function test_loading(data) {
+            lockscreen.alphaNumeric = data.alphanumeric
+            waitForRendering(lockscreen)
+            if (data.pinPadAvailable) {
+                compare(findChild(lockscreen, "pinPadButton8").text, "8", "Could not find number 8 on PinPad")
+            } else {
+                compare(findChild(lockscreen, "pinPadButton8"), undefined, "Could find number 8 on PinPad even though it should be only OSK")
+            }
+        }
+
+        function test_emergency_call_data() {
+            return [
+                {tag: "numeric", alphanumeric: false },
+                {tag: "alphanumeric", alphanumeric: true }
+            ]
+        }
+
+        function test_emergency_call(data) {
+            emergencyCheckBox.checked = false
+            lockscreen.alphaNumeric = data.alphanumeric
+            waitForRendering(lockscreen)
+            var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
+            mouseClick(emergencyButton, units.gu(1), units.gu(1))
+            tryCompare(emergencyCheckBox, "checked", true)
+
+        }
+
+        function test_labels_data() {
+            return [
+                {tag: "numeric", alphanumeric: false, placeholderText: "Please enter your PIN", username: "foobar" },
+                {tag: "alphanumeric", alphanumeric: true, placeholderText: "Please enter your password", username: "Lola" }
+            ]
+        }
+
+        function test_labels(data) {
+            lockscreen.alphaNumeric = data.alphanumeric
+            lockscreen.placeholderText = data.placeholderText
+            waitForRendering(lockscreen)
+            compare(findChild(lockscreen, "pinentryField").placeholderText, data.placeholderText, "Placeholdertext is not what it should be")
+            if (data.alphanumeric) {
+                compare(findChild(lockscreen, "greeterLabel").text, "Hello " + data.username, "Greeter is not set correctly")
+            }
+        }
+
+
+        function test_unlock_data() {
+            return [
+                {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234", unlockedSignal: true},
+                {tag: "alphanumeric",  alphanumeric: true, username: "has-password", password: "password", unlockedSignal: true},
+                {tag: "numeric (wrong)",  alphanumeric: false, username: "has-pin", password: "4321", unlockedSignal: false},
+                {tag: "alphanumeric (wrong)",  alphanumeric: true, username: "has-password", password: "drowssap", unlockedSignal: false},
+            ]
+        }
+
+        function test_unlock(data) {
+            unlockedCheckBox.checked = false
+            LightDM.Greeter.authenticate(data.username)
+
+            if (data.alphanumeric) {
+                var inputField = findChild(lockscreen, "pinentryField")
+                mouseClick(inputField, units.gu(1), units.gu(1))
+                typeString(data.password)
+                keyClick(Qt.Key_Enter)
+            } else {
+                for (var i = 0; i < data.password.length; ++i) {
+                    var character = data.password.charAt(i)
+                    var button = findChild(lockscreen, "pinPadButton" + character)
+                    mouseClick(button, units.gu(1), units.gu(1))
+                }
+            }
+            tryCompare(unlockedCheckBox, "checked", data.unlockedSignal)
+        }
+    }
+}

=== added file 'tests/qmltests/Greeter/tst_Phone.qml'
--- tests/qmltests/Greeter/tst_Phone.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Greeter/tst_Phone.qml	2013-06-03 18:14:27 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright 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/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import ".."
+import "../../../Greeter"
+import Ubuntu.Components 0.1
+import LightDM 0.1 as LightDM
+import Unity.Test 0.1 as UT
+
+Item {
+    width: units.gu(60)
+    height: units.gu(80)
+
+    Greeter {
+        id: greeter
+        anchors.fill: parent
+    }
+
+    SignalSpy {
+        id: unlockSpy
+        target: greeter
+        signalName: "unlocked"
+    }
+
+    UT.UnityTestCase {
+        name: "Greeter"
+        when: windowShown
+
+        function test_properties() {
+            compare(greeter.multiUser, false)
+            compare(greeter.narrowMode, true)
+        }
+
+        function test_teasingArea() {
+            tryCompare(greeter, "leftTeaserPressed", false)
+            mousePress(greeter, units.gu(2), greeter.height - units.gu(1))
+            tryCompare(greeter, "leftTeaserPressed", true)
+            mouseRelease(greeter, units.gu(2), greeter.height - units.gu(1))
+            tryCompare(greeter, "leftTeaserPressed", false)
+
+            mousePress(greeter, greeter.width - units.gu(2), greeter.height - units.gu(1))
+            tryCompare(greeter, "leftTeaserPressed", false)
+            mouseRelease(greeter, units.gu(2), greeter.height - units.gu(1))
+            tryCompare(greeter, "leftTeaserPressed", false)
+        }
+    }
+}

=== renamed file 'tests/qmltests/Greeter/tst_Greeter.qml' => 'tests/qmltests/Greeter/tst_Tablet.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2013-06-03 11:35:43 +0000
+++ tests/qmltests/Greeter/tst_Tablet.qml	2013-06-03 18:14:27 +0000
@@ -79,6 +79,11 @@
             return i
         }
 
+        function test_properties() {
+            compare(greeter.multiUser, true)
+            compare(greeter.narrowMode, false)
+        }
+
         function test_cycle_data() {
             var data = new Array()
             for (var i = 0; i < greeter.model.count; i++) {
@@ -148,19 +153,6 @@
             fail("Didn't find empty-name")
         }
 
-        function test_teasingArea() {
-            tryCompare(greeter, "leftTeaserPressed", false)
-            mousePress(greeter, units.gu(2), greeter.height - units.gu(1))
-            tryCompare(greeter, "leftTeaserPressed", true)
-            mouseRelease(greeter, units.gu(2), greeter.height - units.gu(1))
-            tryCompare(greeter, "leftTeaserPressed", false)
-
-            mousePress(greeter, greeter.width - units.gu(2), greeter.height - units.gu(1))
-            tryCompare(greeter, "leftTeaserPressed", false)
-            mouseRelease(greeter, units.gu(2), greeter.height - units.gu(1))
-            tryCompare(greeter, "leftTeaserPressed", false)
-        }
-
         function test_auth_error() {
             select_user("auth-error")
             var passwordInput = findChild(greeter, "passwordInput")