Unity 8

Merge lp:~mterry/unity8/greeter-no-lockscreen into lp:unity8

greeter-no-lockscreen
Merge into trunk

Proposed by Michael Terry on 2016-08-11

Status:	Merged
Approved by:	Albert Astals Cid on 2016-08-29
Approved revision:	no longer in the source branch.
Merged at revision:	2635
Proposed branch:	lp:~mterry/unity8/greeter-no-lockscreen
Merge into:	lp:unity8
Prerequisite:	lp:~mterry/unity8/greeter-tiny-bugs
Diff against target:	1221 lines (+362/-249) 17 files modified qml/Components/Lockscreen.qml (+0/-23) qml/Components/PassphraseLockscreen.qml (+0/-4) qml/Components/PinLockscreen.qml (+0/-4) qml/Greeter/DelayedLockscreen.qml (+6/-15) qml/Greeter/Greeter.qml (+34/-21) qml/Greeter/GreeterPrompt.qml (+21/-7) qml/Greeter/LoginList.qml (+9/-3) qml/Greeter/NarrowView.qml (+151/-65) qml/Greeter/WideView.qml (+11/-5) tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.cpp (+27/-0) tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.h (+22/-0) tests/qmltests/Components/tst_Lockscreen.qml (+0/-38) tests/qmltests/Greeter/TestView.qml (+3/-3) tests/qmltests/Greeter/tst_Greeter.qml (+1/-0) tests/qmltests/Greeter/tst_NarrowView.qml (+34/-11) tests/qmltests/Greeter/tst_WideView.qml (+8/-4) tests/qmltests/tst_ShellWithPin.qml (+35/-46)
To merge this branch:	bzr merge lp:~mterry/unity8/greeter-no-lockscreen
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-08-11	Needs Fixing on 2016-09-08
Albert Astals Cid (community)		2016-08-11	Approve on 2016-08-29
Lukáš Tinkl		2016-08-11	Pending
Review via email: mp+302711@code.launchpad.net

This proposal supersedes a proposal from 2016-07-22.

Commit Message

Switch from lockscreen PIN pad to a passcode entry box that uses the OSK.

Description of the Change

Switch from NarrowView lockscreen PIN pad / passphrase entry to same widgets as WideView. This is based on design specs [1, start around page 20].

This mostly just affects the NarrowView layout, but I also moved DelayedLockscreen from Components into Greeter, and adjusted how LoginList is positioned in WideView.

Known issues:

- The OSK takes a few seconds to appear if after booting the device, you immediately try to log in. Seemingly just how long it takes the OSK to initialize. Not sure how to avoid that. And I'll note this isn't a regression -- the old passphrase lockscreen had the same delay.

- The OSK will crash if you try to type several spaces when using a passcode. Bug 1595308. Bad, but probably not a blocker? Not a normal thing to do.

- The OSK shows characters that aren't digits when using a passcode. Bug 1586435. Not a blocker either, just annoying.

[1] https://docs.google.com/document/d/1X_doNFMLNDxsN3VcGM9I_tDlyzmao3MboQXW9duiAMc

Checklist:

* Are there any related MPs required for this MP to build/function as expected? Please list.
No, just pre-reqs

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
I'm on the team

* If you changed the UI, has there been a design review?
Yes, Alex M has reviewed this and is +1. He'd prefer the divider between the OSK and the cancel/emergency button not be shown, but it was a minor issue and would be hard to fix for now.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-23: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-24: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-24: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-24: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2412
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1614/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2151/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2179/console

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-06-27: Posted in a previous version of this proposal

Text conflict in qml/Greeter/DelayedLockscreen.qml
Text conflict in qml/Greeter/Greeter.qml
Text conflict in qml/Greeter/NarrowView.qml
Text conflict in qml/Greeter/WideView.qml
Text conflict in tests/qmltests/Greeter/TestView.qml
Text conflict in tests/qmltests/Greeter/tst_Greeter.qml
Text conflict in tests/qmltests/Greeter/tst_NarrowView.qml
Text conflict in tests/qmltests/Greeter/tst_WideView.qml

review: Needs Fixing

Michael Terry (mterry) wrote on 2016-06-27: Posted in a previous version of this proposal

OK, fixed merge conflicts, but there was a fair bit of bzr surgery. I haven't tested yet, waiting on debs from jenkins.

Michael Terry (mterry) wrote on 2016-06-28: Posted in a previous version of this proposal

I tested this real quickly with device-built debs and it seemed to work fine.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-08: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-22: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-03: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-03: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-no-lockscreen updated on 2016-08-22

2558. By Michael Terry on 2016-08-22: Just always link to mock liblightdm, especially now that our mock AS module needs it
2559. By Michael Terry on 2016-08-22: Don't set mock backgrounds if none exist

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Approve (continuous-integration)

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

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

review: Approve (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

I can't find in the linked document anywhere that says that we should not be using a PIN pad anymore for PINs, can you please talk to me when you're online?

review: Needs Information

Michael Terry (mterry) wrote on 2016-08-26:

Just to keep info in the MP, we discussed this on IRC -- the linked document doesn't specifically discuss PINs (passcodes) but it has been discussed in person with the design team. The goal is to unify the lockscreen for all form factors and allow multi-user lists even with passcodes.

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

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Yes, except known unstable unrelated test

review: Approve

lp:~mterry/unity8/greeter-no-lockscreen updated on 2016-09-06

2560. By Michael Terry on 2016-08-30: Merge greeter-apps
2561. By Michael Terry on 2016-08-30: Add an indicator to the greeter when a user is logged in (only shown if we have more than one user)
2562. By Michael Terry on 2016-08-30: Hide the greeter OSK if indicators are open and don't show the edge tutorial during an emergency call.
2563. By Michael Terry on 2016-08-30: Switch from lockscreen PIN pad to a passcode entry box that uses the OSK.
2564. By Michael Terry on 2016-09-06: Merge greeter-tiny-bugs

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

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

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-09-14:

This causes bug #1623430

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:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Components/Lockscreen.qml'
 --- qml/Components/Lockscreen.qml	2016-05-26 20:59:30 +0000
 +++ qml/Components/Lockscreen.qml	2016-09-06 13:57:13 +0000
@@ -41,9 +41,6 @@
      // The text to be displayed in case the login failed
      property string errorText: ""
--    // If > 0, a forced delay is happening
--    property int delayMinutes: 0
--
      // Set those to a value greater 0 to restrict the pin length.
      // If both are unset, the Lockscreen will show a confirm button and allow typing any length of pin before
      // confirming. If minPinLength is set to a value > 0, the confirm button will only become active when the
@@ -91,14 +88,6 @@
          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
@@ -141,8 +130,6 @@
          source: {
              if (resetting || !root.required) {
                  return ""
--            } else if (root.delayMinutes > 0) {
--                return "DelayedLockscreen.qml"
              } else if (root.alphaNumeric) {
                  return "PassphraseLockscreen.qml"
              } else {
@@ -199,16 +186,6 @@
+         }
          Binding {
              target: pinPadLoader.item
--            property: "alphaNumeric"
--            value: root.alphaNumeric
--        }
--        Binding {
--            target: pinPadLoader.item
--            property: "delayMinutes"
--            value: root.delayMinutes
--        }
--        Binding {
--            target: pinPadLoader.item
              property: "showCancelButton"
              value: root.showCancelButton
+         }
 === modified file 'qml/Components/PassphraseLockscreen.qml'
 --- qml/Components/PassphraseLockscreen.qml	2016-05-25 19:25:51 +0000
 +++ qml/Components/PassphraseLockscreen.qml	2016-09-06 13:57:13 +0000
@@ -43,10 +43,6 @@
+         }
+     }
--    function showText(text) {
--        pinentryField.text = text;
--    }
--
      Column {
          id: shakeContainer
          anchors.horizontalCenter: parent.horizontalCenter
 === modified file 'qml/Components/PinLockscreen.qml'
 --- qml/Components/PinLockscreen.qml	2016-05-25 19:25:51 +0000
 +++ qml/Components/PinLockscreen.qml	2016-09-06 13:57:13 +0000
@@ -46,10 +46,6 @@
+         }
+     }
--    function showText(text) {
--        pinentryField.text = text;
--    }
--
      Keys.onPressed: {
          if (pinentryField.text.length == root.maxPinLength)
              return;
 === renamed file 'qml/Components/DelayedLockscreen.qml' => 'qml/Greeter/DelayedLockscreen.qml'
 --- qml/Components/DelayedLockscreen.qml	2016-05-25 19:25:51 +0000
 +++ qml/Greeter/DelayedLockscreen.qml	2016-09-06 13:57:13 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013,2014 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
@@ -16,7 +16,6 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
--import "../Components"
  Item {
      id: root
@@ -24,12 +23,6 @@
      property int delayMinutes
      property bool alphaNumeric
--    signal entered(string passphrase) // unused
--    signal cancel() // unused
--
--    function clear(playAnimation) {}
--    function showText(text) {}
--
      Column {
          anchors.left: parent.left
          anchors.right: parent.right
@@ -46,7 +39,7 @@
              horizontalAlignment: Text.AlignHCenter
              wrapMode: Text.Wrap
              fontSize: "x-large"
--            color: "#f3f3e7"
++            color: "white"
              text: i18n.tr("Device Locked")
+         }
@@ -60,7 +53,7 @@
              anchors.right: parent.right
              horizontalAlignment: Text.AlignHCenter
              wrapMode: Text.Wrap
--            color: "#f3f3e7"
++            color: "white"
              text: alphaNumeric ?
                    i18n.tr("You have been locked out due to too many failed passphrase attempts.") :
                    i18n.tr("You have been locked out due to too many failed passcode attempts.")
@@ -71,7 +64,7 @@
              anchors.right: parent.right
              horizontalAlignment: Text.AlignHCenter
              wrapMode: Text.Wrap
--            color: "#f3f3e7"
++            color: "white"
              text: i18n.tr("Please wait %1 minute and then try again…",
                            "Please wait %1 minutes and then try again…",
                            root.delayMinutes).arg(root.delayMinutes)
@@ -83,10 +76,8 @@
+         }
          Icon {
--            // It would be nice to use a less network-specific name,
--            // but this is the only lock icon we have.
--            name: "network-secure"
--            color: "#f3f3e7"
++            name: "lock"
++            color: "white"
              height: units.gu(4)
              width: units.gu(4)
              anchors.horizontalCenter: parent.horizontalCenter
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2016-09-06 13:57:11 +0000
 +++ qml/Greeter/Greeter.qml	2016-09-06 13:57:13 +0000
@@ -72,9 +72,12 @@
+         }
          forcedUnlock = false;
          if (required) {
++            if (loader.item) {
++                loader.item.reset(true /* forceShow */);
++            }
              // Normally loader.onLoaded will select a user, but if we're
              // already shown, do it manually.
--            d.selectUser(d.currentIndex, true);
++            d.selectUser(d.currentIndex, false);
+         }
          // Even though we may already be shown, we want to call show() for its
@@ -194,7 +197,7 @@
                  return;
              d.waiting = true;
              if (reset) {
--                loader.item.reset();
++                loader.item.reset(false /* forceShow */);
+             }
              currentIndex = index;
              var user = LightDMService.users.data(index, LightDMService.userRoles.NameRole);
@@ -238,6 +241,29 @@
+                 }
+             }
+         }
++
++        function showPromptMessage(text, isError) {
++            // inefficient, but we only rarely deal with messages
++            var html = text.replace(/&/g, "&amp;")
++                           .replace(/</g, "&lt;")
++                           .replace(/>/g, "&gt;")
++                           .replace(/\n/g, "<br>");
++            if (isError) {
++                html = "<font color=\"#df382c\">" + html + "</font>";
++            }
++
++            if (loader.item) {
++                loader.item.showMessage(html);
++            }
++        }
++
++        function showFingerprintMessage(msg) {
++            if (loader.item) {
++                loader.item.reset(false /* forceShow */);
++                loader.item.showErrorMessage(msg);
++            }
++            showPromptMessage(msg, true);
++        }
+     }
      onLauncherOffsetChanged: {
@@ -452,20 +478,7 @@
          onShowGreeter: root.forceShow()
          onHideGreeter: root.forcedUnlock = true
--        onShowMessage: {
--            // inefficient, but we only rarely deal with messages
--            var html = text.replace(/&/g, "&amp;")
--                           .replace(/</g, "&lt;")
--                           .replace(/>/g, "&gt;")
--                           .replace(/\n/g, "<br>");
--            if (isError) {
--                html = "<font color=\"#df382c\">" + html + "</font>";
--            }
--
--            if (loader.item) {
--                loader.item.showMessage(html);
--            }
--        }
++        onShowMessage: d.showPromptMessage(text, isError)
          onShowPrompt: {
              if (loader.item) {
@@ -573,10 +586,8 @@
              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);
--            }
++            var msg = d.secureFingerprint ? i18n.tr("Try again") : "";
++            d.showFingerprintMessage(msg);
+         }
          Component.onCompleted: restartOperation()
@@ -594,8 +605,10 @@
                  return;
+             }
              console.log("Identified user by fingerprint:", result);
--            if (loader.item)
++            if (loader.item) {
++                loader.item.enabled = false;
                  loader.item.notifyAuthenticationSucceeded(true /* showFakePassword */);
++            }
              if (root.active)
                  root.forcedUnlock = true;
+         }
 === modified file 'qml/Greeter/GreeterPrompt.qml'
 --- qml/Greeter/GreeterPrompt.qml	2016-07-08 13:25:40 +0000
 +++ qml/Greeter/GreeterPrompt.qml	2016-09-06 13:57:13 +0000
@@ -38,6 +38,16 @@
          d.enabled = true;
+     }
++    function showFakePassword() {
++        // Just a silly hack for looking like 4 pin numbers got entered, if
++        // a fingerprint was used and we happen to be using a pin.  This was
++        // a request from Design.
++        if (isSecret && isPrompt && !isAlphanumeric) {
++            d.enabled = false;
++            text = "...."; // actual text doesn't matter
++        }
++    }
++
      StyledItem {
          id: d
@@ -50,6 +60,12 @@
                                                                   : theme.palette.disabled.raisedSecondaryText
          readonly property color errorColor: passwordInput.enabled ? theme.palette.normal.negative
                                                                    : theme.palette.disabled.negative
++
++        onEnabledChanged: {
++            if (!enabled) {
++                fakeLabel.text = passwordInput.displayText;
++            }
++        }
+     }
      Rectangle {
@@ -142,15 +158,13 @@
+             }
+         }
--        onAccepted: {
--            if (d.enabled)
--                respond();
--        }
++        onAccepted: respond()
          function respond() {
--            d.enabled = false;
--            fakeLabel.text = displayText;
--            root.responded(text);
++            if (d.enabled) {
++                d.enabled = false;
++                root.responded(text);
++            }
+         }
          Keys.onEscapePressed: {
 === modified file 'qml/Greeter/LoginList.qml'
 --- qml/Greeter/LoginList.qml	2016-09-06 13:57:11 +0000
 +++ qml/Greeter/LoginList.qml	2016-09-06 13:57:13 +0000
@@ -29,6 +29,7 @@
      property int currentIndex
      property bool locked
      property bool waiting
++    property alias boxVerticalOffset: highlightItem.y
      readonly property alias passwordInput: passwordInput
      readonly property int numAboveBelow: 4
@@ -84,6 +85,10 @@
          root.resetAuthentication();
+     }
++    function showFakePassword() {
++        passwordInput.showFakePassword();
++    }
++
      QtObject {
          id: d
@@ -123,12 +128,12 @@
      LoginAreaContainer {
          id: highlightItem
++        objectName: "highlightItem"
          anchors {
              left: parent.left
              leftMargin: units.gu(2)
              right: parent.right
              rightMargin: units.gu(2)
--            verticalCenter: parent.verticalCenter
+         }
          height: root.highlightedHeight
@@ -142,8 +147,8 @@
          anchors.leftMargin: units.gu(2)
          anchors.rightMargin: units.gu(2)
--        preferredHighlightBegin: userList.height / 2 - root.highlightedHeight / 2
--        preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
++        preferredHighlightBegin: highlightItem.y
++        preferredHighlightEnd: highlightItem.y
          highlightRangeMode: ListView.StrictlyEnforceRange
          highlightMoveDuration: root.moveDuration
          flickDeceleration: 10000
@@ -352,6 +357,7 @@
          WrongPasswordAnimation {
              id: wrongPasswordAnimation
++            objectName: "wrongPasswordAnimation"
              target: passwordInput
+         }
+     }
 === modified file 'qml/Greeter/NarrowView.qml'
 --- qml/Greeter/NarrowView.qml	2016-09-06 13:57:11 +0000
 +++ qml/Greeter/NarrowView.qml	2016-09-06 13:57:13 +0000
@@ -15,7 +15,9 @@
   */
  import QtQuick 2.4
++import QtQuick.Window 2.2
  import Ubuntu.Components 1.3
++import Ubuntu.Telephony 0.1 as Telephony
  import "../Components"
  FocusScope {
@@ -23,13 +25,13 @@
      property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
      property alias launcherOffset: coverPage.launcherOffset
--    property int currentIndex // unused
--    property alias delayMinutes: lockscreen.delayMinutes
++    property alias currentIndex: loginList.currentIndex
++    property alias delayMinutes: delayedLockscreen.delayMinutes
      property alias backgroundTopMargin: coverPage.backgroundTopMargin
      property url background
      property bool locked
--    property bool alphanumeric
--    property var userModel // unused
++    property alias alphanumeric: loginList.alphanumeric
++    property alias userModel: loginList.model
      property alias infographicModel: coverPage.infographicModel
      property string sessionToStart
      property bool waiting
@@ -37,21 +39,25 @@
      readonly property bool required: coverPage.required || lockscreen.required
      readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
--    signal selected(int index) // unused
++    // so that it can be replaced in tests with a mock object
++    property var inputMethod: Qt.inputMethod
++
++    signal selected(int index)
      signal responded(string response)
      signal tease()
      signal emergencyCall()
      function showMessage(html) {
--        // TODO
++        loginList.showMessage(html);
+     }
      function showPrompt(text, isSecret, isDefaultPrompt) {
--        lockscreen.promptText = isDefaultPrompt ? "" : text.toLowerCase();
--        lockscreen.maybeShow();
++        loginList.showPrompt(text, isSecret, isDefaultPrompt);
+     }
      function showLastChance() {
++        /* TODO: when we finish support for resetting device after too many
++                 failed logins, we should re-add this popup.
          var title = lockscreen.alphaNumeric ?
                      i18n.tr("Sorry, incorrect passphrase.") :
                      i18n.tr("Sorry, incorrect passcode.");
@@ -60,6 +66,7 @@
                      i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
                      i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."));
          lockscreen.showInfoPopup(title, text);
++        */
+     }
      function hide() {
@@ -68,27 +75,24 @@
+     }
      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
++        if (showFakePassword) {
++            loginList.showFakePassword();
+         }
+     }
      function notifyAuthenticationFailed() {
--        lockscreen.customError = "";
--        lockscreen.clear(true);
++        loginList.showError();
+     }
      function showErrorMessage(msg) {
          coverPage.showErrorMessage(msg);
--        lockscreen.customError = msg ? msg : " "; // avoid default message
--        lockscreen.clear(true);
+     }
--    function reset() {
--        lockscreen.customError = "";
--        coverPage.show();
++    function reset(forceShow) {
++        loginList.reset();
++        if (forceShow) {
++            coverPage.show();
++        }
+     }
      function tryToUnlock(toTheRight) {
@@ -110,48 +114,62 @@
+         }
+     }
--    Lockscreen {
++    Showable {
          id: lockscreen
          objectName: "lockscreen"
--
++        anchors.fill: parent
          shown: false
++
          showAnimation: StandardAnimation { property: "opacity"; to: 1 }
          hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
--        anchors.fill: parent
--        visible: required
--        enabled: !coverPage.shown
--        background: root.background
--        darkenBackground: 0.4
--        alphaNumeric: root.alphanumeric
--        minPinLength: 4
--        maxPinLength: 4
--
--        property string promptText
--        infoText: promptText !== "" ? i18n.tr("Enter %1").arg(promptText) :
--                  alphaNumeric ? i18n.tr("Enter passphrase") :
--                                 i18n.tr("Enter passcode")
--
--        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")
--
--        onEntered: root.responded(passphrase)
--        onCancel: coverPage.show()
--        onEmergencyCall: root.emergencyCall()
--
--        onEnabledChanged: {
--            if (enabled) {
--                lockscreen.forceActiveFocus();
--            }
--        }
--
--        onVisibleChanged: {
--            if (visible) {
--                lockscreen.forceActiveFocus();
--            }
++
++        CrossFadeImage {
++            id: lockscreenBackground
++            objectName: "lockscreenBackground"
++            anchors {
++                fill: parent
++                topMargin: root.backgroundTopMargin
++            }
++            source: root.background
++            fillMode: Image.PreserveAspectCrop
++            // Limit how much memory we'll reserve for this image
++            sourceSize.height: Math.max(Screen.width, Screen.height)
++            sourceSize.width: 0
++        }
++
++        // Darken background to match CoverPage
++        Rectangle {
++            anchors.fill: parent
++            color: "black"
++            opacity: 0.4
++        }
++
++        LoginList {
++            id: loginList
++            objectName: "loginList"
++
++            anchors {
++                horizontalCenter: parent.horizontalCenter
++                top: parent.top
++                bottom: parent.bottom
++            }
++            width: units.gu(40)
++            boxVerticalOffset: units.gu(14)
++            enabled: !coverPage.shown && visible
++            visible: !delayedLockscreen.visible
++
++            locked: root.locked
++
++            onSelected: if (enabled) root.selected(index)
++            onResponded: root.responded(response)
++        }
++
++        DelayedLockscreen {
++            id: delayedLockscreen
++            objectName: "delayedLockscreen"
++            anchors.fill: parent
++            visible: delayMinutes > 0
++            alphaNumeric: loginList.alphanumeric
+         }
          function maybeShow() {
@@ -179,15 +197,9 @@
          onShowProgressChanged: {
              if (showProgress === 1) {
--                lockscreen.reset();
--            }
--
--            if (showProgress === 0) {
--                if (root.locked) {
--                    lockscreen.clear(false); // to reset focus if necessary
--                } else {
--                    root.responded("");
--                }
++                loginList.reset();
++            } else if (showProgress === 0) {
++                loginList.tryToUnlock();
+             }
+         }
@@ -199,4 +211,78 @@
+             }
+         }
+     }
++
++    StyledItem {
++        id: bottomBar
++        visible: lockscreen.shown
++        height: units.gu(4)
++
++        anchors.left: parent.left
++        anchors.right: parent.right
++        anchors.top: parent.bottom
++        anchors.topMargin: - height * (1 - coverPage.showProgress)
++                           - (inputMethod && inputMethod.visible ?
++                              inputMethod.keyboardRectangle.height : 0)
++
++        Rectangle {
++            color: UbuntuColors.porcelain // matches OSK background
++            anchors.fill: parent
++        }
++
++        Label {
++            text: i18n.tr("Cancel")
++            anchors.left: parent.left
++            anchors.leftMargin: units.gu(2)
++            anchors.top: parent.top
++            anchors.bottom: parent.bottom
++            verticalAlignment: Text.AlignVCenter
++            font.weight: Font.Light
++            fontSize: "small"
++            color: UbuntuColors.slate
++
++            AbstractButton {
++                anchors.fill: parent
++                anchors.leftMargin: -units.gu(2)
++                anchors.rightMargin: -units.gu(2)
++                onClicked: coverPage.show()
++            }
++        }
++
++        Label {
++            objectName: "emergencyCallLabel"
++            text: callManager.hasCalls ? i18n.tr("Return to Call") : i18n.tr("Emergency")
++            anchors.right: parent.right
++            anchors.rightMargin: units.gu(2)
++            anchors.top: parent.top
++            anchors.bottom: parent.bottom
++            verticalAlignment: Text.AlignVCenter
++            font.weight: Font.Light
++            fontSize: "small"
++            color: UbuntuColors.slate
++            // TODO: uncomment once bug 1616538 is fixed
++            // visible: telepathyHelper.ready && telepathyHelper.emergencyCallsAvailable
++            enabled: visible
++
++            AbstractButton {
++                anchors.fill: parent
++                anchors.leftMargin: -units.gu(2)
++                anchors.rightMargin: -units.gu(2)
++                onClicked: root.emergencyCall()
++            }
++        }
++    }
++
++    // FIXME: It's difficult to keep something tied closely to the OSK (bug
++    //        1616163).  But as a hack to avoid the background peeking out,
++    //        we add an extra Rectangle that just serves to hide the background
++    //        during OSK animations.
++    Rectangle {
++        visible: bottomBar.visible
++        height: inputMethod && inputMethod.visible ?
++                inputMethod.keyboardRectangle.height : 0
++        anchors.bottom: parent.bottom
++        anchors.left: parent.left
++        anchors.right: parent.right
++        color: UbuntuColors.porcelain
++    }
+ }
 === modified file 'qml/Greeter/WideView.qml'
 --- qml/Greeter/WideView.qml	2016-09-06 13:57:11 +0000
 +++ qml/Greeter/WideView.qml	2016-09-06 13:57:13 +0000
@@ -51,7 +51,7 @@
          loginList.showError();
+     }
--    function reset() {
++    function reset(forceShow) {
          loginList.reset();
+     }
@@ -83,8 +83,10 @@
          coverPage.hide();
+     }
--    function notifyAuthenticationSucceeded() {
--        // Nothing needed
++    function notifyAuthenticationSucceeded(showFakePassword) {
++        if (showFakePassword) {
++            loginList.showFakePassword();
++        }
+     }
      function showLastChance() {
@@ -122,15 +124,19 @@
              id: loginList
              objectName: "loginList"
--            height: inputMethod && inputMethod.visible ?
--                parent.height - inputMethod.keyboardRectangle.height : parent.height
              width: units.gu(40)
              anchors {
                  left: parent.left
                  leftMargin: Math.min(parent.width * 0.16, units.gu(20))
                  top: parent.top
++                bottom: parent.bottom
+             }
++            boxVerticalOffset: (height - highlightedHeight -
++                               (inputMethod && inputMethod.visible ?
++                                inputMethod.keyboardRectangle.height : 0)) / 2
++            Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
++
              model: root.userModel
              currentSession: LightDMService.greeter.defaultSession
              onResponded: root.responded(response)
 === modified file 'tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.cpp'
 --- tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.cpp	2014-04-30 18:06:38 +0000
 +++ tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.cpp	2016-09-06 13:57:13 +0000
@@ -20,6 +20,8 @@
  MockTelepathyHelper::MockTelepathyHelper(QObject *parent)
      : QObject(parent)
++    , m_ready(true)
++    , m_emergencyCallsAvailable(true)
+ {
+ }
@@ -33,3 +35,28 @@
+ {
      Q_UNUSED(name);
+ }
++
++bool MockTelepathyHelper::ready() const
++{
++    return m_ready;
++}
++
++void MockTelepathyHelper::setReady(bool value)
++{
++    if (m_ready != value) {
++        m_ready = value;
++        Q_EMIT readyChanged();
++    }
++}
++bool MockTelepathyHelper::emergencyCallsAvailable() const
++{
++    return m_emergencyCallsAvailable;
++}
++
++void MockTelepathyHelper::setEmergencyCallsAvailable(bool value)
++{
++    if (m_emergencyCallsAvailable != value) {
++        m_emergencyCallsAvailable = value;
++        Q_EMIT emergencyCallsAvailableChanged();
++    }
++}
 === modified file 'tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.h'
 --- tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.h	2014-04-30 18:06:38 +0000
 +++ tests/mocks/Ubuntu/Telephony/MockTelepathyHelper.h	2016-09-06 13:57:13 +0000
@@ -24,6 +24,14 @@
  class MockTelepathyHelper : public QObject
+ {
      Q_OBJECT
++    Q_PROPERTY(bool ready
++               READ ready
++               WRITE setReady // only in mock
++               NOTIFY readyChanged)
++    Q_PROPERTY(bool emergencyCallsAvailable
++               READ emergencyCallsAvailable
++               WRITE setEmergencyCallsAvailable // only in mock
++               NOTIFY emergencyCallsAvailableChanged)
      Q_DISABLE_COPY(MockTelepathyHelper)
  public:
      MockTelepathyHelper(QObject *parent = 0);
@@ -31,6 +39,20 @@
      static MockTelepathyHelper *instance();
      Q_INVOKABLE void registerChannelObserver(const QString& name);
++
++    bool ready() const;
++    void setReady(bool value);
++
++    bool emergencyCallsAvailable() const;
++    void setEmergencyCallsAvailable(bool value);
++
++Q_SIGNALS:
++    void readyChanged();
++    void emergencyCallsAvailableChanged();
++
++private:
++    bool m_ready;
++    bool m_emergencyCallsAvailable;
  };
  #endif // MOCKCONTACTWATCHER_H
 === modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
 --- tests/qmltests/Components/tst_Lockscreen.qml	2016-05-26 20:59:30 +0000
 +++ tests/qmltests/Components/tst_Lockscreen.qml	2016-09-06 13:57:13 +0000
@@ -37,7 +37,6 @@
          alphaNumeric: pinPadCheckBox.checked
          minPinLength: minPinLengthTextField.text
          maxPinLength: maxPinLengthTextField.text
--        delayMinutes: delayMinutesTextField.text
          background: "../../../qml/graphics/phone_background.jpg"
+     }
@@ -109,16 +108,6 @@
                      text: "Retries left"
+                 }
+             }
--            Row {
--                TextField {
--                    id: delayMinutesTextField
--                    width: units.gu(7)
--                    text: "0"
--                }
--                Label {
--                    text: "Delay Minutes"
--                }
--            }
              Label {
                  id: pinLabel
                  anchors.verticalCenter: parent.verticalCenter
@@ -172,7 +161,6 @@
          function cleanup() {
              lockscreen.clear(false);
--            delayMinutesTextField.text = "0"
              enteredLabel.text = "";
              // Reset sizing
@@ -455,32 +443,6 @@
              compare(label.text, data.text);
+         }
--        function test_delayMinutes() {
--            delayMinutesTextField.text = "4"
--            waitForLockscreenReady()
--            var label = findChild(lockscreen, "deviceLockedLabel")
--            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	2016-06-27 18:59:20 +0000
 +++ tests/qmltests/Greeter/TestView.qml	2016-09-06 13:57:13 +0000
@@ -51,7 +51,7 @@
      signal _notifyAuthenticationSucceededCalled(bool showFakePassword)
      signal _notifyAuthenticationFailedCalled()
      signal _showErrorMessageCalled(string msg)
--    signal _resetCalled()
++    signal _resetCalled(bool forceShow)
      signal _tryToUnlockCalled(bool toTheRight)
      function showMessage(html) {
@@ -84,8 +84,8 @@
          _showErrorMessageCalled(msg);
+     }
--    function reset() {
--        _resetCalled();
++    function reset(forceShow) {
++        _resetCalled(forceShow);
+     }
      function tryToUnlock(toTheRight) {
 === modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
 --- tests/qmltests/Greeter/tst_Greeter.qml	2016-07-07 19:52:57 +0000
 +++ tests/qmltests/Greeter/tst_Greeter.qml	2016-09-06 13:57:13 +0000
@@ -559,6 +559,7 @@
              LightDM.Greeter.showGreeter();
              compare(viewResetSpy.count, 1);
++            compare(viewResetSpy.signalArguments[0][0], true);
              tryCompare(viewShowPromptSpy, "count", 1);
+         }
 === modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
 --- tests/qmltests/Greeter/tst_NarrowView.qml	2016-06-27 18:59:20 +0000
 +++ tests/qmltests/Greeter/tst_NarrowView.qml	2016-09-06 13:57:13 +0000
@@ -20,6 +20,7 @@
  import "../../../qml/Greeter"
  import LightDM.IntegratedLightDM 0.1 as LightDM
  import Ubuntu.Components 1.3
++import Ubuntu.Telephony 0.1 as Telephony
  import Unity.Test 0.1 as UT
  Item {
@@ -293,6 +294,8 @@
          function init() {
              view.currentIndex = 0; // break binding with text field
++            telepathyHelper.ready = true;
++            telepathyHelper.emergencyCallsAvailable = true;
              selectedSpy.clear();
              respondedSpy.clear();
              teaseSpy.clear();
@@ -328,14 +331,6 @@
              waitForRendering(view);
+         }
--        function enterPin(pin) {
--            for (var i = 0; i < pin.length; ++i) {
--                var character = pin.charAt(i);
--                var button = findChild(view, "pinPadButton" + character);
--                tap(button);
--            }
--        }
--
          function test_tease_data() {
              return [
                  {tag: "left", x: 0, offset: 0, count: 1},
@@ -352,8 +347,9 @@
          function test_respondedWithPin() {
              view.locked = true;
++            view.showPrompt("", true, true);
              swipeAwayCover();
--            enterPin("1234");
++            typeString("1234");
              compare(respondedSpy.count, 1);
              compare(respondedSpy.signalArguments[0][0], "1234");
+         }
@@ -361,6 +357,7 @@
          function test_respondedWithPassphrase() {
              view.locked = true;
              view.alphanumeric = true;
++            view.showPrompt("", true, true);
              swipeAwayCover();
              typeString("test");
              keyClick(Qt.Key_Enter);
@@ -382,12 +379,38 @@
              compare(respondedSpy.signalArguments[0][0], "");
+         }
--        function test_emergencyCall() {
++        function test_emergencyCall_data() {
++            return [
++                {tag: "phone", available: true},
++                {tag: "desktop", available: false},
++            ];
++        }
++        function test_emergencyCall(data) {
++            telepathyHelper.emergencyCallsAvailable = data.available;
              view.locked = true;
              swipeAwayCover();
              var emergencyCallLabel = findChild(view, "emergencyCallLabel");
              tap(emergencyCallLabel);
--            compare(emergencySpy.count, 1);
++            if (!data.available) {
++                expectFail("", "Bug 1616538 prevents us supporting conditional emergency button support");
++            }
++            compare(emergencyCallLabel.visible, data.available ? true : false);
++            compare(emergencySpy.count, data.available ? 1 : 0);
++        }
++
++        function test_emergencyCallAvailability() {
++            view.locked = true;
++            var emergencyCallLabel = findChild(view, "emergencyCallLabel");
++            verify(emergencyCallLabel.visible);
++
++            telepathyHelper.emergencyCallsAvailable = false;
++            telepathyHelper.ready = true;
++            expectFail("", "Bug 1616538 prevents us supporting conditional emergency button support");
++            verify(!emergencyCallLabel.visible);
++
++            telepathyHelper.emergencyCallsAvailable = true;
++            telepathyHelper.ready = false;
++            verify(!emergencyCallLabel.visible);
+         }
          function test_fullyShown() {
 === modified file 'tests/qmltests/Greeter/tst_WideView.qml'
 --- tests/qmltests/Greeter/tst_WideView.qml	2016-09-06 13:57:11 +0000
 +++ tests/qmltests/Greeter/tst_WideView.qml	2016-09-06 13:57:13 +0000
@@ -641,17 +641,21 @@
              keyboardVisibleCheckBox.checked = true;
--            tryCompare(loginList, "height", view.height - view.inputMethod.keyboardRectangle.height);
++            var halfway = (view.height - loginList.highlightedHeight) / 2;
++            var halfwayWithOsk = halfway - view.inputMethod.keyboardRectangle.height / 2;
++            tryCompare(loginList, "boxVerticalOffset", halfwayWithOsk);
++
++            var highlightItem = findChild(loginList, "highlightItem");
              tryCompareFunction( function() {
--                var loginListRect = loginList.mapToItem(view, 0, 0, loginList.width, loginList.height);
--                return loginListRect.y + loginListRect.height <= view.inputMethod.keyboardRectangle.y;
++                var highlightRect = highlightItem.mapToItem(view, 0, 0, highlightItem.width, highlightItem.height);
++                return highlightRect.y + highlightRect.height <= view.inputMethod.keyboardRectangle.y;
              }, true);
              // once the vkb goes away, loginList goes back to its full height
              keyboardVisibleCheckBox.checked = false;
--            tryCompare(loginList, "height", view.height);
++            tryCompare(loginList, "boxVerticalOffset", halfway);
+         }
          function test_passphrase() {
 === modified file 'tests/qmltests/tst_ShellWithPin.qml'
 --- tests/qmltests/tst_ShellWithPin.qml	2016-09-06 13:57:11 +0000
 +++ tests/qmltests/tst_ShellWithPin.qml	2016-09-06 13:57:13 +0000
@@ -154,7 +154,6 @@
              var greeter = findChild(shell, "greeter");
              sessionSpy.target = greeter;
              swipeAwayGreeter(true);
--            waitForLockscreen()
              greeter.failedLoginsDelayAttempts = -1;
              greeter.maxFailedLogins = -1;
@@ -214,20 +213,16 @@
+             }
+         }
--        function waitForLockscreen() {
--            var lockscreen = findChild(shell, "lockscreen");
--            var pinPadLoader = findChild(lockscreen, "pinPadLoader");
--            tryCompare(pinPadLoader, "status", Loader.Ready)
--            waitForRendering(lockscreen)
--        }
--
          function enterPin(pin) {
--            for (var i = 0; i < pin.length; ++i) {
--                var character = pin.charAt(i)
--                var button = findChild(shell, "pinPadButton" + character)
--                tryCompare(button, "enabled", true);
--                tap(button)
--            }
++            typeString(pin);
++        }
++
++        function showGreeter() {
++            LightDM.Greeter.showGreeter();
++            tryCompare(shell, "waitingOnGreeter", false);
++            var coverPage = findChild(shell, "coverPage");
++            tryCompare(coverPage, "showProgress", 1);
++            removeTimeConstraintsFromSwipeAreas(shell);
+         }
          function confirmLockedApp(app) {
@@ -248,7 +243,7 @@
              LightDM.Greeter.hideGreeter();
              tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
--            LightDM.Greeter.showGreeter();
++            showGreeter();
              tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile + "_greeter");
              LightDM.Greeter.hideGreeter();
@@ -293,7 +288,7 @@
              // Cancel emergency mode, and go back to normal
              waitForRendering(greeter)
--            LightDM.Greeter.showGreeter()
++            showGreeter()
              tryCompare(greeter, "shown", true)
              tryCompare(greeter, "lockedApp", "")
@@ -336,7 +331,7 @@
              enterPin("1234");
              tryCompare(tutorial, "paused", false);
--            LightDM.Greeter.showGreeter();
++            showGreeter();
              verify(tutorial.paused);
              swipeAwayGreeter(true);
@@ -358,22 +353,23 @@
              var greeter = findChild(shell, "greeter");
              greeter.failedLoginsDelayAttempts = 3;
--            var placeHolder = findChild(shell, "wrongNoticeLabel")
--            tryCompare(placeHolder, "text", "")
--
--            enterPin("1111")
--            tryCompare(placeHolder, "text", "Sorry, incorrect passcode")
--
--            enterPin("1111")
--            tryCompare(placeHolder, "text", "Sorry, incorrect passcode")
--
--            var lockscreen = findChild(shell, "lockscreen")
--            tryCompare(lockscreen, "delayMinutes", 0)
--            enterPin("1111")
--            tryCompare(lockscreen, "delayMinutes", greeter.failedLoginsDelayMinutes);
++            var wrongPasswordAnimation = findInvisibleChild(shell, "wrongPasswordAnimation");
++
++            enterPin("1111")
++            verify(wrongPasswordAnimation.running);
++
++            enterPin("1111")
++            verify(wrongPasswordAnimation.running);
++
++            var delayedLockscreen = findChild(shell, "delayedLockscreen");
++            tryCompare(delayedLockscreen, "delayMinutes", 0);
++            enterPin("1111")
++            tryCompare(delayedLockscreen, "delayMinutes", greeter.failedLoginsDelayMinutes);
+         }
          function test_factoryReset() {
++            skip("Factory reset support is not finished")
++
              maxRetriesTextField.text = "3"
              resetSpy.clear()
@@ -404,8 +400,7 @@
              compare(shell.usageScenario, "phone");
              compare(applicationsDisplayLoader.usageScenario, "phone");
--            var lockscreen = findChild(shell, "lockscreen")
--            lockscreen.emergencyCall()
++            tap(findChild(shell, "emergencyCallLabel"));
              confirmLockedApp("dialer-app")
              // OK, we're in. Now try (but fail) to switch to tablet mode
@@ -432,16 +427,13 @@
              // - Should be back in emergency mode dialer
              var greeter = findChild(shell, "greeter");
--            var lockscreen = findChild(shell, "lockscreen");
--            verify(lockscreen);
--            lockscreen.emergencyCall();
++            tap(findChild(shell, "emergencyCallLabel"));
              confirmLockedApp("dialer-app");
              callManager.foregroundCall = phoneCall;
--            LightDM.Greeter.showGreeter();
--            lockscreen = findChild(shell, "lockscreen");
--            verify(lockscreen);
++            showGreeter();
++            var lockscreen = findChild(shell, "lockscreen");
              tryCompare(lockscreen, "shown", true);
              tryCompare(greeter, "hasLockedApp", false);
@@ -484,7 +476,7 @@
+         }
          function test_focusRequestedHidesCoverPage() {
--            LightDM.Greeter.showGreeter();
++            showGreeter();
              var app = ApplicationManager.startApplication("gallery-app");
              // wait until the app is fully loaded (ie, real surface replaces splash screen)
@@ -496,8 +488,7 @@
              tryCompare(coverPage, "showProgress", 0);
              tryCompare(greeter, "fullyShown", true);
--            LightDM.Greeter.showGreeter();
--            tryCompare(coverPage, "showProgress", 1);
++            showGreeter();
              // Make sure focusing same app triggers same behavior
              ApplicationManager.requestFocusApplication("gallery-app");
@@ -571,9 +562,7 @@
              only after its idle timeout is triggered.
           */
          function test_shortLeftEdgeSwipeMakesLauncherStayVisible() {
--            LightDM.Greeter.showGreeter();
--            var coverPage = testCase.findChild(shell, "coverPage");
--            tryCompare(coverPage, "showProgress", 1);
++            showGreeter();
              var launcher = testCase.findChild(shell, "launcher")
              var launcherPanel = testCase.findChild(launcher, "launcherPanel");
@@ -589,6 +578,7 @@
              tryCompare(launcherPanel, "x", 0);
              // Greeter should be displaced
++            var coverPage = findChild(shell, "coverPage");
              tryCompareFunction(function() { return coverPage.mapToItem(shell, 0, 0).x > shell.width*0.2; }, true);
              touchRelease(shell, toX, shell.height * 0.5);
@@ -611,8 +601,7 @@
              tryCompare(shell, "mainApp", galleryApp);
              // Show greeter
--            LightDM.Greeter.showGreeter();
--            tryCompare(coverPage, "showProgress", 1);
++            showGreeter();
              // Swipe cover page away
              touchFlick(shell, 2, shell.height / 2, units.gu(30), shell.height / 2);