Unity 8

Merge lp:~mterry/unity8/greeter-refactor into lp:unity8

greeter-refactor
Merge into trunk

Proposed by Michael Terry on 2015-02-05

Status:	Merged
Approved by:	Daniel d'Andrada on 2015-02-18
Approved revision:	1507
Merged at revision:	1622
Proposed branch:	lp:~mterry/unity8/greeter-refactor
Merge into:	lp:unity8
Prerequisite:	lp:~mterry/unity8/tutorial-new-screens
Diff against target:	5614 lines (+2954/-1668) 28 files modified cmake/modules/QmlTest.cmake (+1/-1) qml/Components/DelayedLockscreen.qml (+3/-1) qml/Components/PassphraseLockscreen.qml (+2/-3) qml/Components/PinLockscreen.qml (+3/-4) qml/Greeter/CoverPage.qml (+163/-110) qml/Greeter/Greeter.qml (+358/-186) qml/Greeter/Infographics.qml (+1/-0) qml/Greeter/LoginList.qml (+70/-88) qml/Greeter/NarrowView.qml (+170/-0) qml/Greeter/WideView.qml (+134/-0) qml/Shell.qml (+78/-364) tests/autopilot/unity8/shell/emulators/greeter.py (+19/-3) tests/autopilot/unity8/shell/emulators/main_window.py (+0/-6) tests/autopilot/unity8/shell/tests/__init__.py (+2/-3) tests/autopilot/unity8/shell/tests/test_lock_screen.py (+8/-12) tests/plugins/LightDM/CMakeLists.txt (+21/-6) tests/plugins/LightDM/usersmodel.cpp (+84/-0) tests/qmltests/CMakeLists.txt (+4/-3) tests/qmltests/Greeter/TestView.qml (+99/-0) tests/qmltests/Greeter/tst_Greeter.qml (+472/-0) tests/qmltests/Greeter/tst_MultiGreeter.qml (+0/-475) tests/qmltests/Greeter/tst_NarrowView.qml (+522/-0) tests/qmltests/Greeter/tst_SingleGreeter.qml (+0/-244) tests/qmltests/Greeter/tst_WideView.qml (+519/-0) tests/qmltests/Tutorial/tst_Tutorial.qml (+5/-4) tests/qmltests/tst_Shell.qml (+65/-43) tests/qmltests/tst_ShellWithPin.qml (+97/-48) tests/qmltests/tst_TabletShell.qml (+54/-64)
To merge this branch:	bzr merge lp:~mterry/unity8/greeter-refactor
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)			Approve on 2015-02-24
Daniel d'Andrada (community)		2015-02-05	Approve on 2015-02-18
PS Jenkins bot	continuous-integration	2015-02-05	Needs Fixing on 2015-02-18
Review via email: mp+248829@code.launchpad.net

This proposal supersedes a proposal from 2015-01-29.

Commit Message

Refactor the greeter code to be more compartmented and isolatable.

This will help make it an optional piece of the shell when we allow a split greeter/shell.

My driving goals were:

- Remove as much logic from Shell.qml as possible. Right now, there is so much Greeter logic spread all throughout Shell.qml in different bits. For example, the Lockscreen widget sitting there instead of in qml/Greeter/.

- Clean up how we load the two different views (tablet & phone). Right now we have some widgets always present but sometimes hidden (Lockscreen) and Loaders within Loaders (LoginList inside GreeterContent). I wanted just two top-level view widgets that could be separately loaded depending on which mode we are in.

- Toward that end, I wanted to consolidate all the Greeter logic out of Shell and out of those two view classes to avoid duplication. So I made the main Greeter entry point widget handle all the login logic and interactions with LightDM. It controls the views, who always ask it to do things on their behalf. Classic MVC stuff.

- I separated out some of the widgetry from the previous Greeter class into a CoverPage class that both NarrowView and WideView use. This class now holds the drag handle for sliding the greeter away and the infographic.

- Now that each piece of the greeter has a much more brightly defined boundary, testing them in isolation is much easier. I've added tst_WideView, tst_NarrowView, and tst_Greeter files. I've moved existing tests around a bit and added some more. But it should be much more clear where a prospective test belongs now (logic tests in Greeter, visual tests in the respective View).

- I also moved some tests we had in qmluitests/ that were purely testing the LightDM plugin into their own plugin test file.

Description of the Change

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

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.

* If you changed the UI, has there been a design review?
Not applicable.

Michael Terry (mterry) wrote on 2015-02-01: Posted in a previous version of this proposal

I'm going to submit for review, but there is a tiny issue still with the OSK and the NarrowView passphrase interface. The OSK doesn't come back up automatically after an invalid passphrase, and the OSK stays up after a suspend.

So there is some focus issue there I'll look into. But it's good enough to review.

PS Jenkins bot (ps-jenkins) wrote on 2015-02-01: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1476
http://jenkins.qa.ubuntu.com/job/unity8-ci/5211/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1094/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/376/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/376/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1092/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5211/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-02-02: Posted in a previous version of this proposal

About the commit message: Mind doing the "short summary on first line, empty line, rest of the explanation" format?

Daniel d'Andrada (dandrader) wrote on 2015-02-02: Posted in a previous version of this proposal

"""
1174 + * Copyright (C) 2014 Canonical, Ltd.
"""

We're past that year, man. :)

Michael Terry (mterry) wrote on 2015-02-02: Posted in a previous version of this proposal

OK, copied "Description" into "Commit Message" and updated years. :)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-02: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5214/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5218/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-03: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1481
http://jenkins.qa.ubuntu.com/job/unity8-ci/5229/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1143/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/394
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1141/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5229/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-04: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5237/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-02-05: Posted in a previous version of this proposal

Text conflict in qml/Greeter/CoverPage.qml
Text conflict in qml/Greeter/Greeter.qml
Text conflict in qml/Shell.qml
Text conflict in tests/plugins/LightDM/CMakeLists.txt
Text conflict in tests/qmltests/CMakeLists.txt
Contents conflict in tests/qmltests/Greeter/tst_MultiGreeter.qml
Text conflict in tests/qmltests/tst_TabletShell.qml
7 conflicts encountered.

Michael Terry (mterry) wrote on 2015-02-05:

I rebased this MP on tutorial-new-screens / trunk, hopefully fixing all current conflicts.

PS Jenkins bot (ps-jenkins) wrote on 2015-02-05:

FAILED: Continuous integration, rev:1484
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/~mterry/unity8/greeter-refactor/+merge/248829/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5247/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-refactor updated on 2015-02-06

1485. By Michael Terry on 2015-02-06: Fix tutorial autopilot test with new greeter refactor

PS Jenkins bot (ps-jenkins) wrote on 2015-02-06:

FAILED: Continuous integration, rev:1485
http://jenkins.qa.ubuntu.com/job/unity8-ci/5255/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1222
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/419/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/420
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1220
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1220/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17852

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5255/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-refactor updated on 2015-02-06

1486. By Michael Terry on 2015-02-06: Fix autopilot harder

PS Jenkins bot (ps-jenkins) wrote on 2015-02-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5256/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-refactor updated on 2015-02-09

1487. By Michael Terry on 2015-02-09: Wait until userlist settles at beginning of TabletShell test

PS Jenkins bot (ps-jenkins) wrote on 2015-02-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5261/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5267/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-02-10:

There seems to be a badly resolved merge conflict:
qml/Components/EdgeDemo.qml got renamed to qml/Components/EdgeDemo.qml.THIS

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-02-10:

Please update the copyright year of qml/Components/PassphraseLockscreen.qml

Daniel d'Andrada (dandrader) wrote on 2015-02-10:

I run "make tryGreeter" and got a black screen on the left side. clicking the "show greeter" button has no visible effect. Is that expected?

Daniel d'Andrada (dandrader) wrote on 2015-02-10:

"""
=== modified file 'qml/Components/PassphraseLockscreen.qml'
--- qml/Components/PassphraseLockscreen.qml 2014-10-23 13:23:07 +0000
+++ qml/Components/PassphraseLockscreen.qml 2015-02-02 22:14:36 +0000
@@ -98,6 +98,11 @@ Item {
// has oddly sized password characters that don't scale right)
opacity: 0

+ onFocusChanged: {
+ // Within our FocusScope, we always want to have focus
+ focus = true;
+ }
+
// simulate being disabled, but without removing OSK focus
maximumLength: root.entryEnabled ? 32767 : length

"""

This looks like a desperate hack. Setting "focus: true" should suffice (along with a FocusScope surrounding the offender in the worst case, if that makes sense). Do you know who is taking away the focus from this item?

PS Jenkins bot (ps-jenkins) wrote on 2015-02-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5269/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-refactor updated on 2015-02-10

1488. By Michael Terry on 2015-02-10: Small cleanups
1489. By Michael Terry on 2015-02-10: Make fake TestView more obviously intentionally-blank

Michael Terry (mterry) wrote on 2015-02-10:

> There seems to be a badly resolved merge conflict:
> qml/Components/EdgeDemo.qml got renamed to qml/Components/EdgeDemo.qml.THIS

Fixed, whoops!

> Please update the copyright year of qml/Components/PassphraseLockscreen.qml

Fixed.

> I run "make tryGreeter" and got a black screen on the left side.
> clicking the "show greeter" button has no visible effect. Is that expected?

Yes. tst_Greeter.qml only tests the "controller" side of things -- the glue between the user visible views and AccountsService/LightDM/PAM. It has its own View class, but it's just a fake one without any real controls. I've removed the "Show Greeter" button, since that was just a cut/paste artifact. And I've added a label to the fake view class to make it clear that there is nothing to see. "This page intentionally left blank" and all. :)

If you want to play with a view class, use tryWideView and tryNarrowView. If you want to play with the Greeter + a view, use tryShell, tryShellWithPin, or tryTabletShell.

> This looks like a desperate hack. Setting "focus: true" should suffice

Yeah... You got me. It didn't suffice, and I couldn't tell why focus was being stolen. All I could tell was that activeFocus was moving to the greeter's loader itself. But not in a situation that seemingly would require it to move (e.g. it wasn't being reloaded nor was a widget disabled as far as I could tell).

Michael Terry (mterry) wrote on 2015-02-10:

(Well, I guess it's not surprising that the loader got activeFocus, I think that was just the side effect of the entry's focus being false. What was surprising was that the entry object's focus property was being set to false in the first place. Wasn't sure why.)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5275/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-refactor updated on 2015-02-11

1490. By Michael Terry on 2015-02-11: Restore behavior animating LoginList height
1491. By Michael Terry on 2015-02-11: Merge from tutorial-new-screens

PS Jenkins bot (ps-jenkins) wrote on 2015-02-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5294/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5299/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5300/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

"""
Connections {
target: ApplicationManager

            onFocusRequested: {
                [...]
                greeter.notifyAppFocused(appId);
            }

            onFocusedApplicationIdChanged: {
                greeter.notifyAppFocused(ApplicationManager.focusedApplicationId);
                [...]
            }

            onApplicationAdded: {
                [...]
                greeter.notifyAppFocused(appId);
                [...]
            }
        }
"""

All those greeter.notifyAppFocused calls look redundant and not really correct.

A focus request, as it name says, it's just a request. It will be processed by the window manager part of unity8 (eg PhoneStage or TabletStage) which will finally change the app that is focused, causing ApplicationManager.focusedApplicationId to change. Thus for every focus change request you will be calling greeter.notifyAppFocused twice. And what's worse, you're assuming that a request will always be successful and are telling greeter that a given app now has focus before it actually happens.

The same goes for the onApplicationAdded case.

Can't we have greeter.notifyAppFocused only in onFocusedApplicationIdChanged?

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

>
> A focus request, as it name says, it's just a request. It will be processed by
> the window manager part of unity8 (eg PhoneStage or TabletStage) which will
> finally change the app that is focused, causing
> ApplicationManager.focusedApplicationId to change. Thus for every focus change
> request you will be calling greeter.notifyAppFocused twice. And what's worse,
> you're assuming that a request will always be successful and are telling
> greeter that a given app now has focus before it actually happens.

Unless you wanna do something also when ApplicationManager.requestFocusApplication() is called for an application that is already focused? In which case we would need some further refactoring as the current naming would be misleading.

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

In Shell.qml:

"""
available: tutorial.panelEnabled && (!greeter.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
"""

This line is way too long.

lp:~mterry/unity8/greeter-refactor updated on 2015-02-12

1492. By Michael Terry on 2015-02-12: Shorten a couple long lines
1493. By Michael Terry on 2015-02-12: Consolidate app-switching logic
1494. By Michael Terry on 2015-02-12: Add test and comment for the relied-upon behavior of emitting a focus id changed signal even when we focus the same app

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

run "make tryShell"

Start a left edge drag, up to 1/3 of the display width (to that you have the greeter move), then release it.

Expected outcome:
Greeter slides back into place, in an animated fashion

Actual outcome:
Greeter jumps immediately back into place. There's not animation at all.

review: Needs Fixing

Michael Terry (mterry) wrote on 2015-02-12:

> This line is way too long.

Fixed, plus another similar line.

> All those greeter.notifyAppFocused calls look redundant and not really correct.

Well, you are right. Back when I originally added "emergency dialer" support, I tested and the focusChanged signal was not emitted in all cases (like if it was already focused) and not everything went through the requestFocus path (some things were just focused without a request, by the shell). So I had redundant bits in each signal handler.

But not 100% redundant. Each behaved slightly different. In this branch, I've consolidated all that down to one function call per signal handler, and I felt pretty good about that. But you're right, the whole thing looks silly from someone that isn't in the weeds of it.

So stepping back, I retested. And nowadays, we seem to always properly requestFocus, not to mention that a focusChanged signal is emitted in all cases now. So all those signal handlers can consolidate down to one, when focusChanged is received.

So I've done that. Thanks for the kick in the pants! :) I've also added a test to cover the specific case of a re-focus on an already focused app from the greeter. We didn't test that precise case before, but since that one depends on special behavior of re-emitting a changed signal even when nothing changed, a test & comment seemed prudent.

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

> run "make tryShell"
>
> Start a left edge drag, up to 1/3 of the display width (to that you have the
> greeter move), then release it.
>
> Expected outcome:
> Greeter slides back into place, in an animated fashion
>
> Actual outcome:
> Greeter jumps immediately back into place. There's not animation at all.

Wonder if we could have a qml regression test for that, that checks that the greeter.x is changed to a couple of intermediate values before finally reaching zero.

lp:~mterry/unity8/greeter-refactor updated on 2015-02-12

1495. By Michael Terry on 2015-02-12: Animate letting go of the coverPage

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

1- make tryShellWithPin
2- swipe away the cover page
3- press "Show greeter" button

You get those warnings:
"""
qml/Components/PinLockscreen.qml:24: TypeError: Cannot read property 'top' of null
qml/Components/PinLockscreen.qml:26: TypeError: Cannot read property 'horizontalCenter' of null
"""

review: Needs Fixing

Michael Terry (mterry) wrote on 2015-02-12:

The animation when letting go of the coverPage while making a left drag is fixed too.

Michael Terry (mterry) wrote on 2015-02-12:

Oh, let me see about a test...

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

> 1- make tryShellWithPin
> 2- swipe away the cover page
> 3- press "Show greeter" button
>
> You get those warnings:
> """
> qml/Components/PinLockscreen.qml:24: TypeError: Cannot read property 'top' of
> null
> qml/Components/PinLockscreen.qml:26: TypeError: Cannot read property
> 'horizontalCenter' of null
> """

It also happens in trunk, but it would be good to have it fixed here

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

1- run make tryShell

A bunch of new warnings show up:
"""
qml/Greeter/Infographics.qml:39:5: QML Connections: Cannot assign to non-existent property "onDataDisappeared"
qml/Greeter/Infographics.qml:39:5: QML Connections: Cannot assign to non-existent property "onDataAboutToDisappear"
qml/Greeter/Infographics.qml:39:5: QML Connections: Cannot assign to non-existent property "onDataChanged"
qml/Greeter/Infographics.qml:39:5: QML Connections: Cannot assign to non-existent property "onDataAboutToChange"
qml/Greeter/Infographics.qml:39:5: QML Connections: Cannot assign to non-existent property "onDataAppeared"
qml/Greeter/Infographics.qml:39:5: QML Connections: Cannot assign to non-existent property "onDataAboutToAppear"
"""

then when you swipe away the greeter and press the "show greeter" button, you get all the warnings above plus this one:

"""
qml/Components/PassphraseLockscreen.qml:23: TypeError: Cannot read property 'top' of null
"""

review: Needs Fixing

lp:~mterry/unity8/greeter-refactor updated on 2015-02-12

1496. By Michael Terry on 2015-02-12: Stop some warnings from being printed

Michael Terry (mterry) wrote on 2015-02-12:

OK, warnings fixed.

lp:~mterry/unity8/greeter-refactor updated on 2015-02-12

1497. By Michael Terry on 2015-02-12: Add tiny test to confirm that we don't just jump to launcherOffset = 0

Michael Terry (mterry) wrote on 2015-02-12:

And a test added for the animation of the coverPage being let go.

Albert Astals Cid (aacid) wrote on 2015-02-12:

Text conflict in qml/Greeter/CoverPage.qml
1 conflicts encountered.

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

This launcherOffsetProxy thing in Greeter.qml is rather messy. Have you tried using a SmoothedAnimation, like that? http://paste.ubuntu.com/10189227/

Seems to work fine.

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

On 10/02/15 18:16, Michael Terry wrote:
>> This looks like a desperate hack. Setting "focus: true" should suffice
> Yeah... You got me. It didn't suffice, and I couldn't tell why focus was being stolen. All I could tell was that activeFocus was moving to the greeter's loader itself. But not in a situation that seemingly would require it to move (e.g. it wasn't being reloaded nor was a widget disabled as far as I could tell).

The latest unity8 now has a tool to help you find out who's stealing
your focus. See tests/uqmlscene/ActiveFocusLogger.cpp

You can use it to debug focus with "make tryFoo" by changing "#define
UQMLSCENE_DEBUG_ACTIVE_FOCUS 0" to 1 in tests/uqmlscene/main.cpp.

If you can only reproduce the issue on the device then you will have to
use ActiveFocusLogger in src/main.cpp. Just see how it's done in
tests/uqmlscene/main.cpp.

This gotta be clarified and fixed.

Daniel d'Andrada (dandrader) wrote on 2015-02-12:

> This launcherOffsetProxy thing in Greeter.qml is rather messy. Have you tried
> using a SmoothedAnimation, like that? http://paste.ubuntu.com/10189227/
>
> Seems to work fine.

This seems perfect: http://paste.ubuntu.com/10189619/

PS Jenkins bot (ps-jenkins) wrote on 2015-02-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5306/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-refactor updated on 2015-02-12

1498. By Michael Terry on 2015-02-12: Merge from trunk

Michael Terry (mterry) wrote on 2015-02-12:

> This seems perfect: http://paste.ubuntu.com/10189619/

As I said on IRC:

"""
We don't want [the Behavior animation] when the user is driving the abrupt changes
Then we want to be immediately responsive
It makes the phone look laggy if we trail their finger
[Your latest patch is] still a noticable delay when jittering the mouse/finger. It's better for sure. But still noticable.
It feels clear to me that rather than speeding up a behavior so fast as to not be noticable in that case, we just want to disable it...
I understand it's more code, but it feels more correct
"""

So I'm still pushing back on this request. I'm happy to bow to more pressure, if we want a third opinion.

I am looking into the focus issue.

PS Jenkins bot (ps-jenkins) wrote on 2015-02-12:

FAILED: Continuous integration, rev:1497
http://jenkins.qa.ubuntu.com/job/unity8-ci/5309/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/473/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/474/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/474/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1332/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5309/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-refactor updated on 2015-02-12

1499. By Michael Terry on 2015-02-12: Add unused tst_ShellWithPassphrase.qml file, to allow tryShellWithPassphrase
1500. By Michael Terry on 2015-02-12: Remove (unneeded?) focus hack

Michael Terry (mterry) wrote on 2015-02-12:

Uh, so I guess the focus issue just doesn't exist anymore? Removing that code seems to have no effect. I can't reproduce the bug I was trying to fix (which occurred when entering a bad passphrase).

So I've taken the hack out entirely.

I've also added a bare-bones tst_ShellWithPassphrase.qml to allow testing the passphrase shell, which I just realized is hard to do without the benefit of "./run.sh -k" now.

PS Jenkins bot (ps-jenkins) wrote on 2015-02-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5312/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5313/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

> I've also added a bare-bones tst_ShellWithPassphrase.qml to allow testing the
> passphrase shell, which I just realized is hard to do without the benefit of
> "./run.sh -k" now.

Now that the lightdm mock libs are unified we no longer need separate test files for different lightdm mock modes.

We can have them all under tst_Shell, like this:
http://paste.ubuntu.com/10202880/

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

I'm getting some test failures:

FAIL! : qmltestrunner::Shell::test_leftEdgeDrag(without launcher) Compared values are not the same
   Actual ():
   Expected (): visible
   Loc: [/home/dandrader/unity8/greeter-refactor/tests/qmltests/tst_Shell.qml(319)]

FAIL! : qmltestrunner::Shell::test_leftEdgeDrag(with launcher) Compared values are not the same
   Actual ():
   Expected (): visible
   Loc: [/home/dandrader/unity8/greeter-refactor/tests/qmltests/tst_Shell.qml(319)]

FAIL! : qmltestrunner::Shell::test_leftEdgeDrag(long swipe) Compared values are not the same
   Actual ():
   Expected (): visible
   Loc: [/home/dandrader/unity8/greeter-refactor/tests/qmltests/tst_Shell.qml(319)]

FAIL! : qmltestrunner::Shell::test_leftEdgeDrag(long swipe) property x
   Actual (): -64
   Expected (): 0
   Loc: [/home/dandrader/unity8/greeter-refactor/tests/qmltests/tst_Shell.qml(315)]

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

In Greeter.qml:

"""
loader.item.authenticated(false);
"""

Please name it like a function, instead of like a boolean property.

I would suggest:
onAuthenticationSucceeded() and onAuthenticationFailed() (or replace the "on" prefix with "nofify", as it's the pattern you seem to be using already) as dropping the boolean parameter makes Greeter.qml code more readable. After all you're not saving any work with this boolean parameter as the implementation does "if(booleanParam){doSuccessfulPath}else{doFailurePath}" anyway.

eg:

"""
    function authenticated(success) {
        if (success) {
            lockscreen.hide();
        } else {
            lockscreen.clear(true);
        }
    }
"""

Would be:

"""
function onAuthenticationSucceeded() { lockscreen.hide(); }
function onAuthenticationFailed() { lockscreen.clear(true); }
"""

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

You have this both in Greeter.qml and CoverPage.qml:

Please update.

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

In Greeter.qml

"""
d.startUnlock(false);
"""

This forces the reader to jump to the function definition to figure out what the heck that booelan means, hurting code readability.

Please at least add an inline comment saying what this boolean is about, like:

"""
d.startUnlock(false /* toTheRight */);
"""

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

Both in NarrowView.qml and in WideView.qml\

"""
    QtObject {
        id: d
    }
"""

The intention is good, but right now it's just dead code.

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

In CoverPager.qml:

"""
property bool ready: greeterBackground.source == "" || greeterBackground.status == Image.Ready || greeterBackground.status == Image.Error
"""

This line is too long.

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

In tst_WideView.qml

"""
    Binding {
        target: LightDM.Users
        property: "mockMode"
        value: "full"
    }
"""

Shouldn't you also set LightDM.Greeter.mockMode to "full" as well? I'm not seing it being done anywhere in this file.

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

> In tst_WideView.qml
>
> """
> Binding {
> target: LightDM.Users
> property: "mockMode"
> value: "full"
> }
> """
>
> Shouldn't you also set LightDM.Greeter.mockMode to "full" as well? I'm not
> seing it being done anywhere in this file.

Hmm, maybe it doesn't matter as LightDM.Greeter doesn't seem to be used by WideView anyway.

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

In tst_Greeter.qml

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

tst_Greeter.tst_launcherOffsetAnimation is not really checking that the value got animated back to zero.

Suggestion:
http://paste.ubuntu.com/10204838/

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

In tests/plugins/LightDM/usersmodel.cpp

Daniel d'Andrada (dandrader) wrote on 2015-02-13:

I think that would be all. Tested manually on N4 and N10 and didn't spot any obvious regressions.

lp:~mterry/unity8/greeter-refactor updated on 2015-02-17

1501. By Michael Terry on 2015-02-17: Merge from trunk
1502. By Michael Terry on 2015-02-17: Fix some review nits
1503. By Michael Terry on 2015-02-17: More nits
1504. By Michael Terry on 2015-02-17: More nits
1505. By Michael Terry on 2015-02-17: Fix shell tests, by reverting a small cleanup I tried to make

Michael Terry (mterry) wrote on 2015-02-17:

> """
> QtObject {
> id: d
> }
> """
>
> The intention is good, but right now it's just dead code.

I tend to use QtObject 'd' blocks like that as barriers between the "public" code and the implementation code. So they are useful as a visual separator, even if empty. But alright, removed.

> In tst_Greeter.qml [and usersmodel.cpp, Greeter.qml, and CoverPage.qml]
>
> """
> * Copyright 2013 Canonical Ltd.
> """

Fixed.

> """
> property bool ready: greeterBackground.source == "" || greeterBackground.status == Image.Ready || greeterBackground.status == Image.Error
> """
>
> This line is too long.

Fixed by removing it. It's not actually used anywhere now with this refactor.

> tst_Greeter.tst_launcherOffsetAnimation is not really checking that the value got animated back to zero.

Fair enough, used your version. Thanks!

> Now that the lightdm mock libs are unified we no longer need separate test files for different lightdm mock modes.

Fair enough, used your version. And added a line for "single-pin", though I didn't take the further step of consolidating tst_Shell.qml and tst_ShellWithPin.qml. That can be cleanup for some future branch.

> Shouldn't you also set LightDM.Greeter.mockMode to "full" as well? I'm not
> seing it being done anywhere in this file.
>
> Hmm, maybe it doesn't matter as LightDM.Greeter doesn't seem to be used by WideView anyway.

That's why I didn't have it. The views should never need the LightDM.Greeter object, they should get everything from the Greeter.qml class.

> Please at least add an inline comment saying what this boolean is about, like:
>
> """
> d.startUnlock(false /* toTheRight */);
> """

Done.

> """
> loader.item.authenticated(false);
> """
>
> Please name it like a function, instead of like a boolean property.

Fair, especially since LightDM.Greeter is already a property that exists in and around this code.

I've changed it to notifyAuthenticationFailed and notifyAuthenticationSucceeded (I don't like re-using the on* prefix because that same pattern is used for signals).

> I'm getting some test failures:
> [snip]

Fixed. I got overzealous in my consolidation of app-switching code in r1493.

=================

OK, that should be all your comments addressed.

Michael Terry (mterry) wrote on 2015-02-17:

"Fair, especially since LightDM.Greeter.authenticated is already a property that exists in and around this code."

is what I meant to say.

PS Jenkins bot (ps-jenkins) wrote on 2015-02-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5335/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-17:

FAILED: Continuous integration, rev:1505
http://jenkins.qa.ubuntu.com/job/unity8-ci/5337/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1405
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/501
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1403
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1403/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18137

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5337/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-02-18:

Have to remove this line from tests/qmltests/CMakeLists.txt:

"""
add_qml_test(. ShellWithPassphrase)
"""

review: Needs Fixing

lp:~mterry/unity8/greeter-refactor updated on 2015-02-18

1506. By Michael Terry on 2015-02-18: Whoops, remove reference to ShellWithPassphrase

PS Jenkins bot (ps-jenkins) wrote on 2015-02-18:

FAILED: Continuous integration, rev:1506
http://jenkins.qa.ubuntu.com/job/unity8-ci/5340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1418
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1416
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1416/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18158

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5340/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2015-02-18:

Yup, thanks. :P Fixed

lp:~mterry/unity8/greeter-refactor updated on 2015-02-18

1507. By Michael Terry on 2015-02-18: Don't enable backspace pin button when not supposed to

Daniel d'Andrada (dandrader) wrote on 2015-02-18:

* 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.
Unrelated, known, failures due to the move to qt 5.4 (I think)

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

lp:~mterry/unity8/greeter-refactor updated on 2015-02-23

1508. By Michael Terry on 2015-02-23: Simplify behavior launcher/greeter/dash when doing a long-left-drag; now we never show dash while locked

Michael Zanetti (mzanetti) wrote on 2015-02-24:

Approving changed behavior in the last commit. Works fine in my opinion now. Also had a discussion with design about it and we're good.

* 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.
Unrelated, known, failures due to the move to qt 5.4 (I think)

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Vesa Rautiainen (vesar) wrote on 2015-02-24:

> Approving changed behavior in the last commit. Works fine in my opinion now.
> Also had a discussion with design about it and we're good.
>
>
> * 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.
> Unrelated, known, failures due to the move to qt 5.4 (I think)
>
> * Did you make sure that the branch does not contain spurious tags?
> Yes

Just to confirm here that Michael and I we had a chat about lockscreen blocking the long left edge swipe behaviour and that's all fine for design.

Preview Diff

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

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'cmake/modules/QmlTest.cmake'
 --- cmake/modules/QmlTest.cmake	2014-12-11 15:48:35 +0000
 +++ cmake/modules/QmlTest.cmake	2015-02-23 15:44:00 +0000
@@ -28,7 +28,7 @@
  set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
--set(test_env UNITY_TESTING=1)
++set(test_env LC_ALL=C UNITY_TESTING=1)
  macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
      set(options NO_ADD_TEST NO_TARGETS)
 === modified file 'qml/Components/DelayedLockscreen.qml'
 --- qml/Components/DelayedLockscreen.qml	2014-09-16 00:00:06 +0000
 +++ qml/Components/DelayedLockscreen.qml	2015-02-23 15:44:00 +0000
@@ -20,11 +20,13 @@
  Item {
      id: root
--    anchors.fill: parent
      property int delayMinutes
      property bool alphaNumeric
++    signal entered(string passphrase) // unused
++    signal cancel() // unused
++
      function clear(playAnimation) {}
      Column {
 === modified file 'qml/Components/PassphraseLockscreen.qml'
 --- qml/Components/PassphraseLockscreen.qml	2014-10-23 13:23:07 +0000
 +++ qml/Components/PassphraseLockscreen.qml	2015-02-23 15:44:00 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013,2014,2015 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
@@ -20,8 +20,7 @@
  Item {
      id: root
--    anchors.top: parent.top
--    anchors.topMargin: units.gu(4)
++    y: units.gu(4)
      height: shakeContainer.height
      property string infoText
 === modified file 'qml/Components/PinLockscreen.qml'
 --- qml/Components/PinLockscreen.qml	2014-10-23 13:23:07 +0000
 +++ qml/Components/PinLockscreen.qml	2015-02-23 15:44:00 +0000
@@ -21,9 +21,7 @@
  Column {
      id: root
--    anchors.top: parent.top
--    anchors.topMargin: units.gu(4)
--    anchors.horizontalCenter: parent.horizontalCenter
++    y: units.gu(4)
      spacing: units.gu(2)
      property string infoText
@@ -123,6 +121,7 @@
                  objectName: "backspaceIcon"
                  anchors { right: parent.right; top: parent.top; bottom: parent.bottom }
                  width: height
++                enabled: root.entryEnabled
                  Icon {
                      anchors.fill: parent
@@ -130,7 +129,7 @@
                      color: "#f3f3e7"
+                 }
--                opacity: (pinentryField.text.length && !pinentryField.incorrectOverride) > 0 ? 1 : 0
++                opacity: (pinentryField.text.length > 0 && !pinentryField.incorrectOverride) ? 1 : 0
                  Behavior on opacity {
                      UbuntuNumberAnimation {}
 === renamed file 'qml/Greeter/GreeterContent.qml' => 'qml/Greeter/CoverPage.qml'
 --- qml/Greeter/GreeterContent.qml	2015-02-11 16:04:13 +0000
 +++ qml/Greeter/CoverPage.qml	2015-02-23 15:44:00 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013,2014,2015 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
@@ -14,34 +14,48 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import AccountsService 0.1
--import Ubuntu.Components 0.1
--import LightDM 0.1 as LightDM
++import QtQuick 2.3
++import Ubuntu.Components 1.1
++import Ubuntu.Gestures 0.1
  import "../Components"
--Item {
++Showable {
      id: root
--    anchors.fill: parent
--
--    property var inputMethod
--
--    property bool ready: background.source == "" || background.status == Image.Ready || background.status == Image.Error
--
--    signal selected(int uid)
--    signal unlocked(int uid)
--
--    function tryToUnlock() {
--        if (loginLoader.item) {
--            loginLoader.item.tryToUnlock()
--        }
--    }
--
--    function reset() {
--        if (loginLoader.item) {
--            loginLoader.item.reset()
--        }
--    }
++
++    property real dragHandleLeftMargin
++    property real launcherOffset
++    property alias background: greeterBackground.source
++    property real backgroundTopMargin
++    property var infographicModel
++    property bool draggable: true
++
++    property alias infographics: infographics
++
++    readonly property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
++
++    signal tease()
++
++    function hideRight() {
++        d.forceRightOnNextHideAnimation = true;
++        hide();
++    }
++
++    QtObject {
++        id: d
++        property bool forceRightOnNextHideAnimation: false
++    }
++
++    prepareToHide: function () {
++        hideTranslation.from = root.x + translation.x
++        hideTranslation.to = root.x > 0 || d.forceRightOnNextHideAnimation ? root.width : -root.width;
++        d.forceRightOnNextHideAnimation = false;
++    }
++
++    // We don't directly bind "x" because that's owned by the DragHandle. So
++    // instead, we can get a little extra horizontal push by using transforms.
++    transform: Translate { id: translation; x: root.draggable ? launcherOffset : 0 }
++
++    MouseArea { anchors.fill: parent; }
      Rectangle {
          // In case background fails to load
@@ -51,17 +65,16 @@
+     }
      CrossFadeImage {
--        id: background
++        id: greeterBackground
          objectName: "greeterBackground"
          anchors {
              fill: parent
--            topMargin: backgroundTopMargin
++            topMargin: root.backgroundTopMargin
+         }
          fillMode: Image.PreserveAspectCrop
          // Limit how much memory we'll reserve for this image
          sourceSize.height: height
          sourceSize.width: width
--        source: greeter.background
+     }
      Rectangle {
@@ -70,94 +83,134 @@
          opacity: 0.4
+     }
--    Loader {
--        id: loginLoader
--        objectName: "loginLoader"
--        anchors {
--            left: parent.left
--            leftMargin: Math.min(parent.width * 0.16, units.gu(20))
--            top: parent.top
--        }
--        width: units.gu(29)
--        height: inputMethod && inputMethod.visible ? parent.height - inputMethod.keyboardRectangle.height
--                                                   : parent.height
--        Behavior on height { UbuntuNumberAnimation {} }
--
--        // TODO: Once we have a system API for determining which mode we are
--        // in, tablet/phone/desktop, that should be used instead of narrowMode.
--        source: greeter.narrowMode ? "" : "LoginList.qml"
--
--        onLoaded: {
--            item.currentIndex = greeterContentLoader.currentIndex;
--        }
--
--        Binding {
--            target: loginLoader.item
--            property: "model"
--            value: greeterContentLoader.model
--        }
--
--        Connections {
--            target: loginLoader.item
--
--            onSelected: {
--                root.selected(uid);
--            }
--
--            onUnlocked: {
--                root.unlocked(uid);
--            }
--
--            onCurrentIndexChanged: {
--                if (greeterContentLoader.currentIndex !== loginLoader.item.currentIndex) {
--                    greeterContentLoader.currentIndex = loginLoader.item.currentIndex;
--                }
--            }
--        }
--    }
--
      Infographics {
          id: infographics
          objectName: "infographics"
--        height: narrowMode ? parent.height : 0.75 * parent.height
--        model: greeterContentLoader.infographicModel
++        height: parent.height
++        model: root.infographicModel
          clip: true // clip large data bubbles
--        property string selectedUser
--        property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
--        onInfographicUserChanged: greeterContentLoader.infographicModel.username = infographicUser
--
--        Component.onCompleted: {
--            selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
--            greeterContentLoader.infographicModel.username = infographicUser
--            greeterContentLoader.infographicModel.readyForDataChange()
--        }
--
--        Connections {
--            target: root
--            onSelected: infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
--        }
--
--        Connections {
--            target: i18n
--            onLanguageChanged: greeterContentLoader.infographicModel.readyForDataChange()
--        }
--
          anchors {
              verticalCenter: parent.verticalCenter
--            left: narrowMode ? root.left : loginLoader.right
--            right: root.right
--        }
--    }
--
--    Clock {
--        id: clock
--        visible: narrowMode
--
--        anchors {
--            top: parent.top
--            topMargin: units.gu(2)
--            horizontalCenter: parent.horizontalCenter
++            left: parent.left
++            right: parent.right
++        }
++    }
++
++    Label {
++        id: swipeHint
++        property real baseOpacity: 0.5
++        opacity: 0.0
++        anchors.horizontalCenter: parent.horizontalCenter
++        anchors.bottom: parent.bottom
++        anchors.bottomMargin: units.gu(5)
++        text: "《    " + i18n.tr("Unlock") + "    》"
++        color: "white"
++        font.weight: Font.Light
++
++        SequentialAnimation on opacity {
++            id: showLabelAnimation
++            running: false
++            loops: 2
++
++            StandardAnimation {
++                from: 0.0
++                to: swipeHint.baseOpacity
++                duration: UbuntuAnimation.SleepyDuration
++            }
++            PauseAnimation { duration: UbuntuAnimation.BriskDuration }
++            StandardAnimation {
++                from: swipeHint.baseOpacity
++                to: 0.0
++                duration: UbuntuAnimation.SleepyDuration
++            }
++        }
++    }
++
++    DragHandle {
++        id: dragHandle
++        anchors.fill: parent
++        anchors.leftMargin: root.dragHandleLeftMargin
++        enabled: root.draggable
++        direction: Direction.Horizontal
++
++        onDraggingChanged: {
++            if (dragging) {
++                root.tease();
++                showLabelAnimation.start();
++            }
++        }
++    }
++
++    // right side shadow
++    Image {
++        anchors.left: parent.right
++        anchors.top: parent.top
++        anchors.bottom: parent.bottom
++        fillMode: Image.Tile
++        source: "../graphics/dropshadow_right.png"
++    }
++
++    // left side shadow
++    Image {
++        anchors.right: parent.left
++        anchors.top: parent.top
++        anchors.bottom: parent.bottom
++        fillMode: Image.Tile
++        source: "../graphics/dropshadow_left.png"
++    }
++
++    Binding {
++        id: positionLock
++
++        property bool enabled: false
++        onEnabledChanged: {
++            if (enabled === __enabled) {
++                return;
++            }
++
++            if (enabled) {
++                if (root.x > 0) {
++                    value = Qt.binding(function() { return root.width; })
++                } else {
++                    value = Qt.binding(function() { return -root.width; })
++                }
++            }
++
++            __enabled = enabled;
++        }
++
++        property bool __enabled: false
++
++        target: root
++        when: __enabled
++        property: "x"
++    }
++
++    hideAnimation: SequentialAnimation {
++        id: hideAnimation
++        objectName: "hideAnimation"
++        property var target // unused, here to silence Showable warning
++        StandardAnimation {
++            id: hideTranslation
++            property: "x"
++            target: root
++        }
++        PropertyAction { target: root; property: "visible"; value: false }
++        PropertyAction { target: positionLock; property: "enabled"; value: true }
++    }
++
++    showAnimation: SequentialAnimation {
++        id: showAnimation
++        objectName: "showAnimation"
++        property var target // unused, here to silence Showable warning
++        PropertyAction { target: root; property: "visible"; value: true }
++        PropertyAction { target: positionLock; property: "enabled"; value: false }
++        StandardAnimation {
++            property: "x"
++            target: root
++            to: 0
++            duration: UbuntuAnimation.FastDuration
+         }
+     }
+ }
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2015-01-23 19:47:37 +0000
 +++ qml/Greeter/Greeter.qml	2015-02-23 15:44:00 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013,2014,2015 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
@@ -14,66 +14,185 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Ubuntu.Gestures 0.1
++import QtQuick 2.3
++import AccountsService 0.1
  import LightDM 0.1 as LightDM
++import Ubuntu.Components 1.1
++import Ubuntu.SystemImage 0.1
++import Unity.Connectivity 0.1
++import Unity.Launcher 0.1
  import "../Components"
  Showable {
--    id: greeter
--    enabled: shown
--    created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
++    id: root
++    created: loader.status == Loader.Ready
      property real dragHandleLeftMargin: 0
--    property alias dragging: dragHandle.dragging
      property url background
--    // so that it can be replaced in tests with a mock object
--    property var inputMethod: Qt.inputMethod
--
--    prepareToHide: function () {
--        hideTranslation.to = greeter.x > 0 || d.forceRightOnNextHideAnimation ? greeter.width : -greeter.width;
--        d.forceRightOnNextHideAnimation = false;
++    // How far to offset the top greeter layer during a launcher left-drag
++    property real launcherOffset
++
++    readonly property bool active: shown || hasLockedApp
++    readonly property bool fullyShown: loader.item ? loader.item.fullyShown : false
++
++    // True when the greeter is waiting for PAM or other setup process
++    readonly property alias waiting: d.waiting
++
++    property string lockedApp: ""
++    readonly property bool hasLockedApp: lockedApp !== ""
++
++    property bool forcedUnlock
++    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
++
++    property bool tabletMode
++    property url viewSource // only used for testing
++
++    property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
++    property int failedLoginsDelayAttempts: 7 // number of failed logins
++    property int failedLoginsDelayMinutes: 5 // minutes of forced waiting
++
++    signal tease()
++    signal sessionStarted()
++    signal emergencyCall()
++
++    function forceShow() {
++        showNow();
++        loader.item.reset();
++    }
++
++    function notifyAppFocused(appId) {
++        if (!active) {
++            return;
++        }
++
++        if (hasLockedApp) {
++            if (appId === lockedApp) {
++                hide(); // show locked app
++            } else {
++                show();
++                d.startUnlock(false /* toTheRight */);
++            }
++        } else if (appId !== "unity8-dash") { // dash isn't started by user
++            d.startUnlock(false /* toTheRight */);
++        }
++    }
++
++    function notifyAboutToFocusApp(appId) {
++        if (!active) {
++            return;
++        }
++
++        // A hint that we're about to focus an app.  This way we can look
++        // a little more responsive, rather than waiting for the above
++        // notifyAppFocused call.  We also need this in case we have a locked
++        // app, in order to show lockscreen instead of new app.
++        d.startUnlock(false /* toTheRight */);
++    }
++
++    // This is a just a glorified notifyAboutToFocusApp(), but it does one
++    // other thing: it hides any cover pages to the RIGHT, because the user
++    // just came from a launcher drag starting on the left.
++    // It also returns a boolean value, indicating whether there was a visual
++    // change or not (the shell only wants to hide the launcher if there was
++    // a change).
++    function notifyShowingDashFromDrag() {
++        if (!active) {
++            return false;
++        }
++
++        return d.startUnlock(true /* toTheRight */);
+     }
      QtObject {
          id: d
--        property bool forceRightOnNextHideAnimation: false
--    }
--
--    property bool loadContent: required
--
--    // 1 when fully shown and 0 when fully hidden
--    property real showProgress: visible ? MathUtils.clamp((width - Math.abs(x)) / width, 0, 1) : 0
--
--    property alias model: greeterContentLoader.model
--    property bool locked: true
--
--    readonly property bool narrowMode: !multiUser && height > width
--    readonly property bool multiUser: LightDM.Users.count > 1
--
--    readonly property int currentIndex: greeterContentLoader.currentIndex
--
--    signal selected(int uid)
--    signal unlocked(int uid)
--    signal tapped()
--
--    function hideRight() {
--        d.forceRightOnNextHideAnimation = true;
--        hide();
--    }
--
--    function tryToUnlock() {
--        if (created) {
--            greeterContentLoader.item.tryToUnlock()
--        }
--    }
--
--    function reset() {
--        if (created) {
--            greeterContentLoader.item.reset()
++
++        readonly property bool multiUser: LightDM.Users.count > 1
++        property int currentIndex
++        property int delayMinutes
++        property bool waiting
++
++        // We want 'launcherOffset' to animate down to zero.  But not to animate
++        // while being dragged.  So ideally we change this only when the user
++        // lets go and launcherOffset drops to zero.  But we need to wait for
++        // the behavior to be enabled first.  So we cache the last known good
++        // launcherOffset value to cover us during that brief gap between
++        // release and the behavior turning on.
++        property real lastKnownPositiveOffset // set in a launcherOffsetChanged below
++        property real launcherOffsetProxy: (shown && !launcherOffsetProxyBehavior.enabled) ? lastKnownPositiveOffset : 0
++        Behavior on launcherOffsetProxy {
++            id: launcherOffsetProxyBehavior
++            enabled: launcherOffset === 0
++            UbuntuNumberAnimation {}
++        }
++
++        function selectUser(uid, reset) {
++            d.waiting = true;
++            if (reset) {
++                loader.item.reset();
++            }
++            currentIndex = uid;
++            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
++            AccountsService.user = user;
++            LauncherModel.setUser(user);
++            LightDM.Greeter.authenticate(user); // always resets auth state
++        }
++
++        function login() {
++            enabled = false;
++            if (LightDM.Greeter.startSessionSync()) {
++                sessionStarted();
++                loader.item.notifyAuthenticationSucceeded();
++            } else {
++                loader.item.notifyAuthenticationFailed();
++            }
++            enabled = true;
++        }
++
++        function startUnlock(toTheRight) {
++            if (loader.item) {
++                return loader.item.tryToUnlock(toTheRight);
++            } else {
++                return false;
++            }
++        }
++    }
++
++    onLauncherOffsetChanged: {
++        if (launcherOffset > 0) {
++            d.lastKnownPositiveOffset = launcherOffset;
++        }
++    }
++
++    onForcedUnlockChanged: {
++        if (forcedUnlock && shown) {
++            // pretend we were just authenticated
++            loader.item.notifyAuthenticationSucceeded();
++        }
++    }
++
++    onRequiredChanged: {
++        if (required) {
++            d.waiting = true;
++            lockedApp = "";
++        }
++    }
++
++    Component.onCompleted: {
++        Connectivity.unlockAllModems();
++    }
++
++    Timer {
++        id: forcedDelayTimer
++        interval: 1000 * 60
++        onTriggered: {
++            if (d.delayMinutes > 0) {
++                d.delayMinutes -= 1;
++                if (d.delayMinutes > 0) {
++                    start(); // go again
++                }
++            }
+         }
+     }
@@ -82,152 +201,205 @@
      MouseArea { anchors.fill: parent }
      Loader {
--        id: greeterContentLoader
--        objectName: "greeterContentLoader"
++        id: loader
++        objectName: "loader"
++
          anchors.fill: parent
--        property var model: LightDM.Users
--        property int currentIndex: 0
--        property var infographicModel: LightDM.Infographic
--        readonly property int backgroundTopMargin: -greeter.y
--        source: loadContent ? "GreeterContent.qml" : ""
++        active: root.required
++        source: root.viewSource.toString() ? root.viewSource :
++                (d.multiUser || root.tabletMode) ? "WideView.qml" : "NarrowView.qml"
          onLoaded: {
--            selected(currentIndex);
++            root.lockedApp = "";
++            root.forceActiveFocus();
++            d.selectUser(d.currentIndex, true);
++            LightDM.Infographic.readyForDataChange();
+         }
          Connections {
--            target: greeterContentLoader.item
--
++            target: loader.item
              onSelected: {
--                greeter.selected(uid);
--                greeterContentLoader.currentIndex = uid;
--            }
--            onUnlocked: greeter.unlocked(uid);
--        }
--        Binding {
--            target: greeterContentLoader.item
--            property: "inputMethod"
--            value: greeter.inputMethod
--        }
--    }
--
--    DragHandle {
--        id: dragHandle
--        anchors.fill: parent
--        anchors.leftMargin: greeter.dragHandleLeftMargin
--        enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled && greeter.shown
--        direction: Direction.Horizontal
--
--        onTapped: {
--            greeter.tapped();
--            showLabelAnimation.start();
--        }
--
--        onDraggingChanged: {
--            if (dragging) {
--                showLabelAnimation.start();
--            }
--        }
--    }
--
--    Label {
--        id: swipeHint
--        property real baseOpacity: 0.5
--        opacity: 0.0
--        anchors.horizontalCenter: parent.horizontalCenter
--        anchors.bottom: parent.bottom
--        anchors.bottomMargin: units.gu(5)
--        text: "《    " + i18n.tr("Unlock") + "    》"
--        color: "white"
--        font.weight: Font.Light
--
--        SequentialAnimation on opacity {
--            id: showLabelAnimation
--            running: false
--            loops: 2
--
--            StandardAnimation {
--                from: 0.0
--                to: swipeHint.baseOpacity
--                duration: UbuntuAnimation.SleepyDuration
--            }
--            PauseAnimation { duration: UbuntuAnimation.BriskDuration }
--            StandardAnimation {
--                from: swipeHint.baseOpacity
--                to: 0.0
--                duration: UbuntuAnimation.SleepyDuration
--            }
--        }
--    }
--
--    // right side shadow
--    Image {
--        anchors.left: parent.right
--        anchors.top: parent.top
--        anchors.bottom: parent.bottom
--        fillMode: Image.Tile
--        source: "../graphics/dropshadow_right.png"
--    }
--
--    // left side shadow
--    Image {
--        anchors.right: parent.left
--        anchors.top: parent.top
--        anchors.bottom: parent.bottom
--        fillMode: Image.Tile
--        source: "../graphics/dropshadow_left.png"
--    }
--
--    Binding {
--        id: positionLock
--
--        property bool enabled: false
--        onEnabledChanged: {
--            if (enabled === __enabled) {
--                return;
--            }
--
--            if (enabled) {
--                if (greeter.x > 0) {
--                    value = Qt.binding(function() { return greeter.width; })
++                d.selectUser(index, true);
++            }
++            onResponded: {
++                if (root.locked) {
++                    LightDM.Greeter.respond(response);
                  } else {
--                    value = Qt.binding(function() { return -greeter.width; })
--                }
--            }
--
--            __enabled = enabled;
--        }
--
--        property bool __enabled: false
--
--        target: greeter
--        when: __enabled
--        property: "x"
--    }
--
--    hideAnimation: SequentialAnimation {
--        id: hideAnimation
--        objectName: "hideAnimation"
--        StandardAnimation {
--            id: hideTranslation
--            property: "x"
--            target: greeter
--        }
--        PropertyAction { target: greeter; property: "visible"; value: false }
--        PropertyAction { target: positionLock; property: "enabled"; value: true }
--    }
--
--    showAnimation: SequentialAnimation {
--        id: showAnimation
--        objectName: "showAnimation"
--        PropertyAction { target: greeter; property: "visible"; value: true }
--        PropertyAction { target: positionLock; property: "enabled"; value: false }
--        StandardAnimation {
--            property: "x"
--            target: greeter
--            to: 0
--            duration: UbuntuAnimation.FastDuration
--        }
++                    if (LightDM.Greeter.active && !LightDM.Greeter.authenticated) { // could happen if forcedUnlock
++                        d.login();
++                    }
++                    loader.item.hide();
++                }
++            }
++            onTease: root.tease()
++            onEmergencyCall: root.emergencyCall()
++            onRequiredChanged: {
++                if (!loader.item.required) {
++                    root.hide();
++                }
++            }
++        }
++
++        Binding {
++            target: loader.item
++            property: "backgroundTopMargin"
++            value: -root.y
++        }
++
++        Binding {
++            target: loader.item
++            property: "launcherOffset"
++            value: d.launcherOffsetProxy
++        }
++
++        Binding {
++            target: loader.item
++            property: "dragHandleLeftMargin"
++            value: root.dragHandleLeftMargin
++        }
++
++        Binding {
++            target: loader.item
++            property: "delayMinutes"
++            value: d.delayMinutes
++        }
++
++        Binding {
++            target: loader.item
++            property: "background"
++            value: root.background
++        }
++
++        Binding {
++            target: loader.item
++            property: "locked"
++            value: root.locked
++        }
++
++        Binding {
++            target: loader.item
++            property: "alphanumeric"
++            value: AccountsService.passwordDisplayHint === AccountsService.Keyboard
++        }
++
++        Binding {
++            target: loader.item
++            property: "currentIndex"
++            value: d.currentIndex
++        }
++
++        Binding {
++            target: loader.item
++            property: "userModel"
++            value: LightDM.Users
++        }
++
++        Binding {
++            target: loader.item
++            property: "infographicModel"
++            value: LightDM.Infographic
++        }
++    }
++
++    Connections {
++        target: LightDM.Greeter
++
++        onShowGreeter: root.forceShow()
++
++        onHideGreeter: {
++            d.login();
++            loader.item.hide();
++        }
++
++        onShowMessage: {
++            if (!LightDM.Greeter.active) {
++                return; // could happen if hideGreeter() comes in before we prompt
++            }
++
++            // 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>";
++            }
++
++            loader.item.showMessage(html);
++        }
++
++        onShowPrompt: {
++            d.waiting = false;
++
++            if (!LightDM.Greeter.active) {
++                return; // could happen if hideGreeter() comes in before we prompt
++            }
++
++            loader.item.showPrompt(text, isSecret, isDefaultPrompt);
++        }
++
++        onAuthenticationComplete: {
++            d.waiting = false;
++
++            if (LightDM.Greeter.authenticated) {
++                AccountsService.failedLogins = 0;
++                d.login();
++                if (!LightDM.Greeter.promptless) {
++                    loader.item.hide();
++                }
++            } else {
++                if (!LightDM.Greeter.promptless) {
++                    AccountsService.failedLogins++;
++                }
++
++                // Check if we should initiate a factory reset
++                if (maxFailedLogins >= 2) { // require at least a warning
++                    if (AccountsService.failedLogins === maxFailedLogins - 1) {
++                        loader.item.showLastChance();
++                    } else if (AccountsService.failedLogins >= maxFailedLogins) {
++                        SystemImage.factoryReset(); // Ouch!
++                    }
++                }
++
++                // Check if we should initiate a forced login delay
++                if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
++                    d.delayMinutes = failedLoginsDelayMinutes;
++                    forcedDelayTimer.start();
++                }
++
++                loader.item.notifyAuthenticationFailed();
++                if (!LightDM.Greeter.promptless) {
++                    d.selectUser(d.currentIndex, false);
++                }
++            }
++        }
++
++        onRequestAuthenticationUser: {
++            // Find index for requested user, if it exists
++            for (var i = 0; i < LightDM.Users.count; i++) {
++                if (user === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
++                    d.selectUser(i, true);
++                    return;
++                }
++            }
++        }
++    }
++
++    Binding {
++        target: LightDM.Greeter
++        property: "active"
++        value: root.active
++    }
++
++    Binding {
++        target: LightDM.Infographic
++        property: "username"
++        value: AccountsService.statsWelcomeScreen ? LightDM.Users.data(d.currentIndex, LightDM.UserRoles.NameRole) : ""
++    }
++
++    Connections {
++        target: i18n
++        onLanguageChanged: LightDM.Infographic.readyForDataChange()
+     }
+ }
 === modified file 'qml/Greeter/Infographics.qml'
 --- qml/Greeter/Infographics.qml	2015-01-09 10:41:28 +0000
 +++ qml/Greeter/Infographics.qml	2015-02-23 15:44:00 +0000
@@ -38,6 +38,7 @@
      Connections {
          target: model
++        ignoreUnknownSignals: model === undefined
          onDataAboutToAppear: startHideAnimation() // hide "no data" label
          onDataAppeared: startShowAnimation()
 === modified file 'qml/Greeter/LoginList.qml'
 --- qml/Greeter/LoginList.qml	2014-11-04 12:52:49 +0000
 +++ qml/Greeter/LoginList.qml	2015-02-23 15:44:00 +0000
@@ -14,44 +14,76 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import LightDM 0.1 as LightDM
++import QtQuick 2.3
++import Ubuntu.Components 1.1
  import "../Components"
  Item {
      id: root
--    property alias userList: userList
      property alias model: userList.model
--    property alias currentIndex: userList.currentIndex
++    property int currentIndex
++    property bool locked
      readonly property int numAboveBelow: 4
      readonly property int cellHeight: units.gu(5)
      readonly property int highlightedHeight: units.gu(10)
      readonly property int moveDuration: 200
++    readonly property string currentUser: userList.currentItem.username
      property bool wasPrompted: false
--    signal selected(int uid)
--    signal unlocked(int uid)
++    signal selected(int index)
++    signal responded(string response)
      function tryToUnlock() {
--        if (LightDM.Greeter.promptless) {
--            if (LightDM.Greeter.authenticated) {
--                root.unlocked(userList.currentIndex)
++        if (wasPrompted) {
++            passwordInput.forceActiveFocus();
++        } else {
++            if (root.locked) {
++                root.selected(currentIndex);
              } else {
--                root.resetAuthentication()
++                root.responded("");
+             }
++        }
++    }
++
++    function showMessage(html) {
++        if (infoLabel.text === "") {
++            infoLabel.text = html;
          } else {
--            passwordInput.forceActiveFocus()
++            infoLabel.text += "<br>" + html;
++        }
++    }
++
++    function showPrompt(text, isSecret, isDefaultPrompt) {
++        passwordInput.text = "";
++        passwordInput.promptText = text;
++        passwordInput.enabled = true;
++        passwordInput.echoMode = isSecret ? TextInput.Password : TextInput.Normal;
++        if (wasPrompted) // stay in text field if second prompt
++            passwordInput.focus = true;
++        wasPrompted = true;
++    }
++
++    function showError() {
++        wrongPasswordAnimation.start();
++        root.resetAuthentication();
++        if (wasPrompted) {
++            passwordInput.focus = true;
+         }
+     }
      function reset() {
--        root.resetAuthentication()
--    }
--
--    Keys.onEscapePressed: root.resetAuthentication()
++        root.resetAuthentication();
++    }
++
++    Keys.onEscapePressed: {
++        selected(currentIndex);
++    }
++
++    onCurrentIndexChanged: {
++        userList.currentIndex = currentIndex;
++    }
      Rectangle {
          id: highlightItem
@@ -81,26 +113,24 @@
          flickDeceleration: 10000
          readonly property bool movingInternally: moveTimer.running || userList.moving
--
--        onCurrentIndexChanged: {
--            if (LightDM.Greeter.authenticationUser != userList.model.data(currentIndex, LightDM.UserRoles.NameRole)) {
--                root.resetAuthentication();
--            }
--        }
--
          onMovingInternallyChanged: {
--            // Only emit the selected signal once we stop moving to avoid frequent background changes
              if (!movingInternally) {
--                root.selected(userList.currentIndex);
++                root.selected(currentIndex);
+             }
+         }
++        onCurrentIndexChanged: {
++            root.resetAuthentication();
++            moveTimer.start();
++        }
++
          delegate: Item {
              width: parent.width
              height: root.cellHeight
              readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
              readonly property int belowOffset: root.highlightedHeight - root.cellHeight
++            readonly property string username: name
              opacity: {
                  // The goal here is to make names less and less opaque as they
@@ -148,11 +178,8 @@
                      topMargin: parent.belowHighlight ? parent.belowOffset : 0
+                 }
                  height: parent.height
--                enabled: userList.currentIndex !== index
--                onClicked: {
--                    moveTimer.start();
--                    userList.currentIndex = index;
--                }
++                enabled: userList.currentIndex !== index && parent.opacity > 0
++                onClicked: root.selected(index)
                  Behavior on anchors.topMargin { NumberAnimation { duration: root.moveDuration; easing.type: Easing.InOutQuad; } }
+             }
@@ -204,6 +231,11 @@
          width: parent.width - anchors.margins * 2
          opacity: userList.movingInternally ? 0 : 1
++        property string promptText
++        placeholderText: root.wasPrompted ? promptText
++                                          : (root.locked ? i18n.tr("Retry")
++                                                         : i18n.tr("Tap to unlock"))
++
          Behavior on opacity {
              NumberAnimation { duration: 100 }
+         }
@@ -213,9 +245,11 @@
                  return;
              root.focus = true; // so that it can handle Escape presses for us
              enabled = false;
--            LightDM.Greeter.respond(text);
--        }
--        Keys.onEscapePressed: root.resetAuthentication()
++            root.responded(text);
++        }
++        Keys.onEscapePressed: {
++            root.selected(currentIndex);
++        }
          Image {
              anchors {
@@ -223,7 +257,7 @@
                  rightMargin: units.gu(2)
                  verticalCenter: parent.verticalCenter
+             }
--            visible: LightDM.Greeter.promptless
++            visible: !root.wasPrompted
              source: "graphics/icon_arrow.png"
+         }
@@ -247,7 +281,7 @@
          id: passwordMouseArea
          objectName: "passwordMouseArea"
          anchors.fill: passwordInput
--        enabled: LightDM.Greeter.promptless
++        enabled: !root.wasPrompted
          onClicked: root.tryToUnlock()
+     }
@@ -256,62 +290,10 @@
              return;
+         }
          infoLabel.text = "";
--        passwordInput.placeholderText = "";
++        passwordInput.promptText = "";
          passwordInput.text = "";
          passwordInput.focus = false;
          passwordInput.enabled = true;
          root.wasPrompted = false;
--        LightDM.Greeter.authenticate(userList.model.data(currentIndex, LightDM.UserRoles.NameRole));
--    }
--
--    Connections {
--        target: LightDM.Greeter
--
--        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 (infoLabel.text == "")
--                infoLabel.text = html
--            else
--                infoLabel.text = infoLabel.text + "<br>" + html
--        }
--
--        onShowPrompt: {
--            passwordInput.text = "";
--            passwordInput.placeholderText = text;
--            passwordInput.enabled = true;
--            passwordInput.echoMode = isSecret ? TextInput.Password : TextInput.Normal;
--            if (root.wasPrompted) // stay in text field if second prompt
--                passwordInput.focus = true;
--            root.wasPrompted = true;
--        }
--
--        onAuthenticationComplete: {
--            if (LightDM.Greeter.promptless) {
--                passwordInput.placeholderText = LightDM.Greeter.authenticated ? "Tap to unlock" : "Retry";
--                return;
--            }
--            if (LightDM.Greeter.authenticated) {
--                root.unlocked(userList.currentIndex);
--            } else {
--                wrongPasswordAnimation.start();
--                root.resetAuthentication();
--                passwordInput.focus = true;
--            }
--            passwordInput.text = "";
--        }
--
--        onRequestAuthenticationUser: {
--            // Find index for requested user, if it exists
--            for (var i = 0; i < userList.model.count; i++) {
--                if (user == userList.model.data(i, LightDM.UserRoles.NameRole)) {
--                    moveTimer.start();
--                    userList.currentIndex = i;
--                    return;
--                }
--            }
--        }
+     }
+ }
 === added file 'qml/Greeter/NarrowView.qml'
 --- qml/Greeter/NarrowView.qml	1970-01-01 00:00:00 +0000
 +++ qml/Greeter/NarrowView.qml	2015-02-23 15:44:00 +0000
@@ -0,0 +1,170 @@
++/*
++ * Copyright (C) 2015 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.3
++import Ubuntu.Components 1.1
++import "../Components"
++
++FocusScope {
++    id: root
++
++    property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
++    property alias launcherOffset: coverPage.launcherOffset
++    property int currentIndex // unused
++    property alias delayMinutes: lockscreen.delayMinutes
++    property alias backgroundTopMargin: coverPage.backgroundTopMargin
++    property url background
++    property bool locked
++    property bool alphanumeric
++    property var userModel // unused
++    property alias infographicModel: coverPage.infographicModel
++    readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
++    readonly property bool required: coverPage.required || lockscreen.required
++
++    signal selected(int index) // unused
++    signal responded(string response)
++    signal tease()
++    signal emergencyCall()
++
++    function showMessage(html) {
++        // TODO
++    }
++
++    function showPrompt(text, isSecret, isDefaultPrompt) {
++        lockscreen.promptText = isDefaultPrompt ? "" : text.toLowerCase();
++        lockscreen.maybeShow();
++    }
++
++    function showLastChance() {
++        var title = lockscreen.alphaNumeric ?
++                    i18n.tr("Sorry, incorrect passphrase.") :
++                    i18n.tr("Sorry, incorrect passcode.");
++        var text = i18n.tr("This will be your last attempt.") + " " +
++                   (lockscreen.alphaNumeric ?
++                    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() {
++        lockscreen.hide();
++        coverPage.hide();
++    }
++
++    function notifyAuthenticationSucceeded() {
++        lockscreen.hide();
++    }
++
++    function notifyAuthenticationFailed() {
++        lockscreen.clear(true);
++    }
++
++    function reset() {
++        coverPage.show();
++    }
++
++    function tryToUnlock(toTheRight) {
++        var coverChanged = coverPage.shown;
++        lockscreen.maybeShow();
++        if (toTheRight) {
++            coverPage.hideRight();
++        } else {
++            coverPage.hide();
++        }
++        return coverChanged;
++    }
++
++    onLockedChanged: {
++        if (locked) {
++            lockscreen.maybeShow();
++        } else {
++            lockscreen.hide();
++        }
++    }
++
++    Lockscreen {
++        id: lockscreen
++        objectName: "lockscreen"
++
++        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")
++        errorText: promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
++                   alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
++                                  i18n.tr("Please re-enter") :
++                                  i18n.tr("Sorry, incorrect passcode")
++
++        onEntered: root.responded(passphrase)
++        onCancel: coverPage.show()
++        onEmergencyCall: root.emergencyCall()
++
++        function maybeShow() {
++            if (root.locked && !shown) {
++                showNow();
++            }
++        }
++    }
++
++    Rectangle {
++        anchors.fill: parent
++        color: "black"
++        opacity: coverPage.showProgress * 0.8
++    }
++
++    CoverPage {
++        id: coverPage
++        objectName: "coverPage"
++        height: parent.height
++        width: parent.width
++        background: root.background
++        onTease: root.tease()
++
++        onShowProgressChanged: {
++            if (showProgress === 1) {
++                lockscreen.reset();
++            }
++
++            if (showProgress === 0) {
++                if (root.locked) {
++                    lockscreen.clear(false); // to reset focus if necessary
++                } else {
++                    root.responded("");
++                }
++            }
++        }
++
++        Clock {
++            anchors {
++                top: parent.top
++                topMargin: units.gu(2)
++                horizontalCenter: parent.horizontalCenter
++            }
++        }
++    }
++}
 === added file 'qml/Greeter/WideView.qml'
 --- qml/Greeter/WideView.qml	1970-01-01 00:00:00 +0000
 +++ qml/Greeter/WideView.qml	2015-02-23 15:44:00 +0000
@@ -0,0 +1,134 @@
++/*
++ * Copyright (C) 2015 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.3
++import Ubuntu.Components 1.1
++
++FocusScope {
++    id: root
++
++    property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
++    property alias launcherOffset: coverPage.launcherOffset
++    property alias currentIndex: loginList.currentIndex
++    property int delayMinutes // TODO
++    property alias backgroundTopMargin: coverPage.backgroundTopMargin
++    property alias background: coverPage.background
++    property bool locked
++    property bool alphanumeric // unused
++    property alias userModel: loginList.model
++    property alias infographicModel: coverPage.infographicModel
++    readonly property bool fullyShown: coverPage.showProgress === 1
++    readonly property bool required: coverPage.required
++
++    // 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() // unused
++
++    function showMessage(html) {
++        loginList.showMessage(html);
++    }
++
++    function showPrompt(text, isSecret, isDefaultPrompt) {
++        loginList.showPrompt(text, isSecret, isDefaultPrompt);
++    }
++
++    function showLastChance() {
++        // TODO
++    }
++
++    function hide() {
++        coverPage.hide();
++    }
++
++    function notifyAuthenticationSucceeded() {
++        // Nothing needed
++    }
++
++    function notifyAuthenticationFailed() {
++        loginList.showError();
++    }
++
++    function reset() {
++        loginList.reset();
++    }
++
++    function tryToUnlock(toTheRight) {
++        if (root.locked) {
++            coverPage.show();
++            loginList.tryToUnlock();
++            return false;
++        } else {
++            var coverChanged = coverPage.shown;
++            if (toTheRight) {
++                coverPage.hideRight();
++            } else {
++                coverPage.hide();
++            }
++            return coverChanged;
++        }
++    }
++
++    Rectangle {
++        anchors.fill: parent
++        color: "black"
++        opacity: coverPage.showProgress * 0.8
++    }
++
++    CoverPage {
++        id: coverPage
++        objectName: "coverPage"
++        height: parent.height
++        width: parent.width
++        draggable: !root.locked
++
++        infographics {
++            height: 0.75 * parent.height
++            anchors.leftMargin: loginList.x + loginList.width
++        }
++
++        onTease: root.tease()
++
++        onShowProgressChanged: {
++            if (showProgress === 0 && !root.locked) {
++                root.responded("");
++            }
++        }
++
++        LoginList {
++            id: loginList
++            objectName: "loginList"
++
++            anchors {
++                left: parent.left
++                leftMargin: Math.min(parent.width * 0.16, units.gu(20))
++                top: parent.top
++            }
++            width: units.gu(29)
++            height: inputMethod && inputMethod.visible ? parent.height - inputMethod.keyboardRectangle.height
++                                                       : parent.height
++            Behavior on height { UbuntuNumberAnimation {} }
++
++            locked: root.locked
++
++            onSelected: root.selected(index)
++            onResponded: root.responded(response)
++        }
++    }
++}
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2015-02-11 17:12:49 +0000
 +++ qml/Shell.qml	2015-02-23 15:44:00 +0000
@@ -22,9 +22,7 @@
  import Ubuntu.Components 0.1
  import Ubuntu.Components.Popups 1.0
  import Ubuntu.Gestures 0.1
--import Ubuntu.SystemImage 0.1
  import Ubuntu.Telephony 0.1 as Telephony
--import Unity.Connectivity 0.1
  import Unity.Launcher 0.1
  import Utils 0.1
  import LightDM 0.1 as LightDM
@@ -46,9 +44,9 @@
  Item {
      id: shell
--    // Disable everything so that user can't swipe greeter or launcher until
--    // we get first prompt/authenticate, which will re-enable the shell.
--    enabled: false
++    // Disable everything while greeter is waiting, so that the user can't swipe
++    // the greeter or launcher until we know whether the session is locked.
++    enabled: !greeter.waiting
      // this is only here to select the width / height of the window if not running fullscreen
      property bool tablet: false
@@ -61,18 +59,9 @@
                               : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
      readonly property real panelHeight: panel.panelHeight
--    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
--    readonly property alias hasLockedApp: greeter.hasLockedApp
--    readonly property bool forcedUnlock: tutorial.running
--    onForcedUnlockChanged: if (forcedUnlock) lockscreen.hide()
--
      property bool sideStageEnabled: shell.width >= units.gu(100)
      readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
--    property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
--    property int failedLoginsDelayAttempts: 7 // number of failed logins
--    property int failedLoginsDelayMinutes: 5 // minutes of forced waiting
--
      property int orientation
      readonly property int deviceOrientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
      onDeviceOrientationAngleChanged: {
@@ -99,7 +88,7 @@
+     }
      function startLockedApp(app) {
--        if (shell.locked) {
++        if (greeter.locked) {
              greeter.lockedApp = app;
+         }
          shell.activateApplication(app);
@@ -117,6 +106,7 @@
      GSettings {
          id: backgroundSettings
++        objectName: "backgroundSettings"
          schema.id: "org.gnome.desktop.background"
+     }
@@ -222,53 +212,32 @@
          Connections {
              target: ApplicationManager
--            onFocusRequested: {
--                if (greeter.narrowMode) {
--                    if (appId === "dialer-app" && callManager.hasCalls && shell.locked) {
--                        // If we are in the middle of a call, make dialer lockedApp and show it.
--                        // This can happen if user backs out of dialer back to greeter, then
--                        // launches dialer again.
--                        greeter.lockedApp = appId;
--                    }
--                    if (greeter.hasLockedApp) {
--                        if (appId === greeter.lockedApp) {
--                            lockscreen.hide() // show locked app
--                        } else {
--                            greeter.startUnlock() // show lockscreen if necessary
--                        }
--                    }
--                    greeter.hide();
--                } else {
--                    if (LightDM.Greeter.active) {
--                        greeter.startUnlock()
--                    }
--                }
--            }
++            // This signal is also fired when we try to focus the current app
++            // again.  We rely on this!
              onFocusedApplicationIdChanged: {
--                if (greeter.hasLockedApp && greeter.lockedApp !== ApplicationManager.focusedApplicationId) {
--                    greeter.startUnlock()
--                }
--                panel.indicators.hide();
--            }
--
--            onApplicationAdded: {
--                if (appId != "unity8-dash") {
--                    if (greeter.shown) {
--                        greeter.startUnlock();
--                    }
--
++                var appId = ApplicationManager.focusedApplicationId;
++
++                if (tutorial.running && appId != "unity8-dash") {
                      // If this happens on first boot, we may be in edge
                      // tutorial or wizard while receiving a call.  But a call
                      // is more important than wizard so just bail out of those.
--                    if (tutorial.running) {
--                        tutorial.finish();
--                        wizard.hide();
--                    }
--                }
--                if (greeter.narrowMode && greeter.hasLockedApp && appId === greeter.lockedApp) {
--                    lockscreen.hide() // show locked app
--                }
++                    tutorial.finish();
++                    wizard.hide();
++                }
++
++                if (appId === "dialer-app" && callManager.hasCalls && greeter.locked) {
++                    // If we are in the middle of a call, make dialer lockedApp and show it.
++                    // This can happen if user backs out of dialer back to greeter, then
++                    // launches dialer again.
++                    greeter.lockedApp = appId;
++                }
++                greeter.notifyAppFocused(appId);
++
++                panel.indicators.hide();
++            }
++
++            onApplicationAdded: {
                  launcher.hide();
+             }
+         }
@@ -292,7 +261,6 @@
              property bool interactive: tutorial.spreadEnabled
                      && !greeter.shown
--                    && !lockscreen.shown
                      && panel.indicators.fullyClosed
                      && launcher.progress == 0
                      && !notifications.useModal
@@ -328,7 +296,7 @@
              Binding {
                  target: applicationsDisplayLoader.item
                  property: "inverseProgress"
--                value: launcher.progress
++                value: greeter.locked ? 0 : launcher.progress
+             }
              Binding {
                  target: applicationsDisplayLoader.item
@@ -379,299 +347,50 @@
+         }
+     }
--    Lockscreen {
--        id: lockscreen
--        objectName: "lockscreen"
++    Greeter {
++        id: greeter
++        objectName: "greeter"
          hides: [launcher, panel.indicators]
--        shown: false
--        enabled: true
--        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
--        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
--        y: panel.panelHeight
--        visible: required
--        width: parent.width
--        height: parent.height - panel.panelHeight
++        tabletMode: shell.sideStageEnabled
++        launcherOffset: launcher.progress
++        forcedUnlock: tutorial.running
          background: shell.background
--        darkenBackground: 0.4
--        alphaNumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard
--        minPinLength: 4
--        maxPinLength: 4
--
--        property string promptText
--        infoText: promptText !== "" ? i18n.tr("Enter %1").arg(promptText) :
--                  alphaNumeric ? i18n.tr("Enter passphrase") :
--                                 i18n.tr("Enter passcode")
--        errorText: promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
--                   alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
--                                  i18n.tr("Please re-enter") :
--                                  i18n.tr("Sorry, incorrect passcode")
--
--        // FIXME: We *should* show emergency dialer if there is a SIM present,
--        // regardless of whether the side stage is enabled.  But right now,
--        // the assumption is that narrow screens are phones which have SIMs
--        // and wider screens are tablets which don't.  When we do allow this
--        // on devices with a side stage and a SIM, work should be done to
--        // ensure that the main stage is disabled while the dialer is present
--        // in the side stage.  See the FIXME in the stage loader in this file.
--        showEmergencyCallButton: !shell.sideStageEnabled
--
--        onEntered: LightDM.Greeter.respond(passphrase);
--        onCancel: greeter.show()
++
++        anchors.fill: parent
++        anchors.topMargin: panel.panelHeight
++
++        // avoid overlapping with Launcher's edge drag area
++        // FIXME: Fix TouchRegistry & friends and remove this workaround
++        //        Issue involves launcher's DDA getting disabled on a long
++        //        left-edge drag
++        dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
++
++        onSessionStarted: {
++            launcher.hide();
++        }
++
++        onTease: {
++            if (!tutorial.running) {
++                launcher.tease();
++            }
++        }
++
          onEmergencyCall: startLockedApp("dialer-app")
--        onShownChanged: if (shown) greeter.lockedApp = ""
--
--        function maybeShow() {
--            if (!shell.forcedUnlock && !shown) {
--                showNow();
--            }
--        }
--
          Timer {
--            id: forcedDelayTimer
--            interval: 1000 * 60
++            // See powerConnection for why this is useful
++            id: showGreeterDelayed
++            interval: 1
              onTriggered: {
--                if (lockscreen.delayMinutes > 0) {
--                    lockscreen.delayMinutes -= 1
--                    if (lockscreen.delayMinutes > 0) {
--                        start() // go again
--                    }
--                }
--            }
--        }
--
--        Component.onCompleted: {
--            if (greeter.narrowMode) {
--                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
--            }
--        }
--    }
--
--    Connections {
--        target: LightDM.Greeter
--
--        onShowGreeter: greeter.show()
--        onHideGreeter: greeter.login()
--
--        onShowPrompt: {
--            shell.enabled = true;
--            if (!LightDM.Greeter.active) {
--                return; // could happen if hideGreeter() comes in before we prompt
--            }
--            if (greeter.narrowMode) {
--                lockscreen.promptText = isDefaultPrompt ? "" : text.toLowerCase();
--                lockscreen.maybeShow();
--            }
--        }
--
--        onPromptlessChanged: {
--            if (!LightDM.Greeter.active) {
--                return; // could happen if hideGreeter() comes in before we prompt
--            }
--            if (greeter.narrowMode) {
--                if (LightDM.Greeter.promptless && LightDM.Greeter.authenticated) {
--                    lockscreen.hide()
--                } else {
--                    lockscreen.reset();
--                    lockscreen.maybeShow();
--                }
--            }
--        }
--
--        onAuthenticationComplete: {
--            shell.enabled = true;
--            if (LightDM.Greeter.authenticated) {
--                AccountsService.failedLogins = 0
--            }
--            // Else only penalize user for a failed login if they actually were
--            // prompted for a password.  We do this below after the promptless
--            // early exit.
--
--            if (LightDM.Greeter.promptless) {
--                return;
--            }
--
--            if (LightDM.Greeter.authenticated) {
--                greeter.login();
--            } else {
--                AccountsService.failedLogins++
--                if (maxFailedLogins >= 2) { // require at least a warning
--                    if (AccountsService.failedLogins === maxFailedLogins - 1) {
--                        var title = lockscreen.alphaNumeric ?
--                                    i18n.tr("Sorry, incorrect passphrase.") :
--                                    i18n.tr("Sorry, incorrect passcode.")
--                        var text = i18n.tr("This will be your last attempt.") + " " +
--                                   (lockscreen.alphaNumeric ?
--                                    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)
--                    } else if (AccountsService.failedLogins >= maxFailedLogins) {
--                        SystemImage.factoryReset() // Ouch!
--                    }
--                }
--                if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
--                    lockscreen.delayMinutes = failedLoginsDelayMinutes
--                    forcedDelayTimer.start()
--                }
--
--                lockscreen.clear(true);
--                if (greeter.narrowMode) {
--                    LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
--                }
--            }
--        }
--    }
--
--    Binding {
--        target: LightDM.Greeter
--        property: "active"
--        value: greeter.shown || lockscreen.shown || greeter.hasLockedApp
--    }
--
--    Rectangle {
--        anchors.fill: parent
--        color: "black"
--        opacity: greeterWrapper.showProgress * 0.8
--    }
--
--    Item {
--        // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
--        id: greeterWrapper
--        objectName: "greeterWrapper"
--        x: (greeter.narrowMode && greeter.showProgress > 0) ? launcher.progress : 0
--        y: panel.panelHeight
--        width: parent.width
--        height: parent.height - panel.panelHeight
--
--        Behavior on x {
--            enabled: !launcher.dashSwipe
--            StandardAnimation {}
--        }
--
--        property bool fullyShown: showProgress === 1.0
--        onFullyShownChanged: {
--            // Wait until the greeter is completely covering lockscreen before resetting it.
--            if (greeter.narrowMode && fullyShown && !LightDM.Greeter.authenticated) {
--                lockscreen.reset();
--                lockscreen.maybeShow();
--            }
--        }
--
--        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
--        onShowProgressChanged: {
--            if (showProgress === 0) {
--                if ((LightDM.Greeter.promptless && LightDM.Greeter.authenticated) || shell.forcedUnlock) {
--                    greeter.login()
--                } else if (greeter.narrowMode) {
--                    lockscreen.clear(false) // to reset focus if necessary
--                }
--            }
--        }
--
--        Greeter {
--            id: greeter
--            objectName: "greeter"
--
--            signal sessionStarted() // helpful for tests
--
--            property string lockedApp: ""
--            property bool hasLockedApp: lockedApp !== ""
--
--            hides: [launcher, panel.indicators]
--            loadContent: required || lockscreen.required // keeps content in memory for quick show()
--
--            locked: shell.locked
--
--            background: shell.background
--
--            width: parent.width
--            height: parent.height
--
--
--            // avoid overlapping with Launcher's edge drag area
--            // FIXME: Fix TouchRegistry & friends and remove this workaround
--            //        Issue involves launcher's DDA getting disabled on a long
--            //        left-edge drag
--            dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
--
--            function startUnlock() {
--                if (narrowMode) {
--                    if (!LightDM.Greeter.authenticated) {
--                        lockscreen.maybeShow()
--                    }
--                    hide()
--                } else {
--                    show()
--                    tryToUnlock()
--                }
--            }
--
--            function login() {
--                enabled = false;
--                if (LightDM.Greeter.startSessionSync()) {
--                    sessionStarted();
--                    greeter.hide();
--                    lockscreen.hide();
--                    launcher.hide();
--                }
--                enabled = true;
--            }
--
--            Timer {
--                // See powerConnection for why this is useful
--                id: showGreeterDelayed
--                interval: 1
--                onTriggered: {
--                    greeter.showNow();
--                }
--            }
--
--            onShownChanged: {
--                if (shown) {
--                    // Disable everything so that user can't swipe greeter or
--                    // launcher until we get the next prompt/authenticate, which
--                    // will re-enable the shell.
--                    shell.enabled = false;
--
--                    if (greeter.narrowMode) {
--                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
--                    } else {
--                        reset()
--                    }
--                    greeter.lockedApp = "";
--                    greeter.forceActiveFocus();
--                }
--            }
--
--            Component.onCompleted: {
--                Connectivity.unlockAllModems()
--            }
--
--            onUnlocked: greeter.hide()
--            onSelected: {
--                // Update launcher items for new user
--                var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
--                AccountsService.user = user;
--                LauncherModel.setUser(user);
--            }
--
--            onTapped: {
--                if (!tutorial.running) {
--                    launcher.tease();
--                }
--            }
--            onDraggingChanged: {
--                if (dragging && !tutorial.running) {
--                    launcher.tease();
--                }
--            }
--
--            Binding {
--                target: ApplicationManager
--                property: "suspended"
--                value: (greeter.shown && greeterWrapper.showProgress == 1) || lockscreen.shown
--            }
++                greeter.forceShow();
++            }
++        }
++
++        Binding {
++            target: ApplicationManager
++            property: "suspended"
++            value: greeter.shown
+         }
+     }
@@ -680,7 +399,7 @@
          target: callManager
          onHasCallsChanged: {
--            if (shell.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
++            if (greeter.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
                  // We just received an incoming call while locked.  The
                  // indicator will have already launched dialer-app for us, but
                  // there is a race between "hasCalls" changing and the dialer
@@ -720,9 +439,7 @@
              return
+         }
--        if (LightDM.Greeter.active) {
--            greeter.startUnlock()
--        }
++        greeter.notifyAboutToFocusApp("unity8-dash");
          var animate = !LightDM.Greeter.active && !stages.shown
          dash.setCurrentScope(0, animate, false)
@@ -730,17 +447,11 @@
+     }
      function showDash() {
--        if (greeter.hasLockedApp || // just in case user gets here
--            (!greeter.narrowMode && shell.locked)) {
--            return
--        }
--
--        if (greeter.shown) {
--            greeter.hideRight();
++        if (greeter.notifyShowingDashFromDrag()) {
              launcher.fadeOut();
+         }
--        if (ApplicationManager.focusedApplicationId != "unity8-dash") {
++        if (!greeter.locked && ApplicationManager.focusedApplicationId != "unity8-dash") {
              ApplicationManager.requestFocusApplication("unity8-dash")
              launcher.fadeOut();
+         }
@@ -758,7 +469,9 @@
              anchors.fill: parent //because this draws indicator menus
              indicators {
                  hides: [launcher]
--                available: tutorial.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
++                available: tutorial.panelEnabled
++                        && (!greeter.locked || AccountsService.enableIndicatorsWhileLocked)
++                        && !greeter.hasLockedApp
                  contentEnabled: tutorial.panelContentEnabled
                  width: parent.width > units.gu(60) ? units.gu(40) : parent.width
@@ -772,7 +485,7 @@
+                 }
+             }
              callHint {
--                greeterShown: greeter.shown || lockscreen.shown
++                greeterShown: greeter.shown
+             }
              property bool topmostApplicationIsFullscreen:
@@ -794,7 +507,9 @@
              anchors.bottom: parent.bottom
              width: parent.width
              dragAreaWidth: shell.edgeSize
--            available: tutorial.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
++            available: tutorial.launcherEnabled
++                    && (!greeter.locked || AccountsService.enableLauncherWhileLocked)
++                    && !greeter.hasLockedApp
              inverted: usageModeSettings.usageMode === "Staged"
              shadeBackground: !tutorial.running
@@ -806,11 +521,10 @@
+                 }
+             }
              onLauncherApplicationSelected: {
--                if (greeter.hasLockedApp) {
--                    greeter.startUnlock()
--                }
--                if (!tutorial.running)
++                if (!tutorial.running) {
++                    greeter.notifyAboutToFocusApp(appId);
                      shell.activateApplication(appId)
++                }
+             }
              onShownChanged: {
                  if (shown) {
 === modified file 'tests/autopilot/unity8/shell/emulators/greeter.py'
 --- tests/autopilot/unity8/shell/emulators/greeter.py	2014-09-08 10:33:50 +0000
 +++ tests/autopilot/unity8/shell/emulators/greeter.py	2015-02-23 15:44:00 +0000
@@ -19,6 +19,7 @@
  import ubuntuuitoolkit
++from autopilot.utilities import sleep
  from unity8.shell.emulators import UnityEmulatorBase
@@ -26,12 +27,27 @@
      """An emulator that understands the greeter screen."""
      def wait_swiped_away(self):
--        self.showProgress.wait_for(0)
++        # We have to be careful here, because coverPage can go away at any time
++        # if there isn't a lockscreen behind it (it hides completely, then
++        # the greeter disposes it).  But if there *is* a lockscreen, then we
++        # need a different check, by looking at its showProgress.  So make our
++        # own wait_for loop and check both possibilities.
++        for i in range(10):
++            if not self.required:
++                return
++            coverPage = self.select_single(objectName='coverPage')
++            if coverPage.showProgress == 0:
++                return
++            sleep(1)
++
++        raise AssertionError("Greeter cover page still up after 10s")
++
      def swipe(self):
          """Swipe the greeter screen away."""
--        self.created.wait_for(True)
--        self.showProgress.wait_for(1)
++        self.waiting.wait_for(False)
++        coverPage = self.select_single(objectName='coverPage')
++        coverPage.showProgress.wait_for(1)
          rect = self.globalRect
          start_x = rect[0] + rect[2] - 3
 === modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
 --- tests/autopilot/unity8/shell/emulators/main_window.py	2015-01-21 04:11:36 +0000
 +++ tests/autopilot/unity8/shell/emulators/main_window.py	2015-02-23 15:44:00 +0000
@@ -35,12 +35,6 @@
      def get_greeter(self):
          return self.select_single(Greeter)
--    def get_greeter_content_loader(self):
--        return self.wait_select_single(
--            "QQuickLoader",
--            objectName="greeterContentLoader"
--        )
--
      def get_login_loader(self):
          return self.select_single("QQuickLoader", objectName="loginLoader")
 === modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
 --- tests/autopilot/unity8/shell/tests/__init__.py	2015-01-21 13:50:14 +0000
 +++ tests/autopilot/unity8/shell/tests/__init__.py	2015-02-23 15:44:00 +0000
@@ -375,9 +375,8 @@
          self._proxy = None
      def wait_for_unity(self):
--        greeter_content_loader = self.main_window.wait_select_single(
--            objectName='greeterContentLoader')
--        greeter_content_loader.progress.wait_for(1)
++        greeter = self.main_window.wait_select_single(objectName='greeter')
++        greeter.waiting.wait_for(False)
      def get_dash(self):
          pid = process_helpers.get_job_pid('unity8-dash')
 === modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
 --- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2015-01-21 13:50:14 +0000
 +++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2015-02-23 15:44:00 +0000
@@ -47,14 +47,13 @@
          self.launch_unity()
          greeter = self.main_window.get_greeter()
--        if greeter.narrowMode:
++        if not greeter.tabletMode:
              greeter.swipe()
              lockscreen = self._wait_for_lockscreen()
              self.main_window.enter_pin_code("1234")
--            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
          else:
              self._enter_prompt_passphrase("1234\n")
--            self.assertThat(greeter.shown, Eventually(Equals(False)))
++        self.assertThat(greeter.shown, Eventually(Equals(False)))
      def test_can_unlock_passphrase_screen(self):
          """Must be able to unlock the passphrase entry screen."""
@@ -63,14 +62,13 @@
          self.launch_unity()
          greeter = self.main_window.get_greeter()
--        if greeter.narrowMode:
++        if not greeter.tabletMode:
              greeter.swipe()
              lockscreen = self._wait_for_lockscreen()
              self._enter_pin_passphrase("password")
--            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
          else:
              self._enter_prompt_passphrase("password")
--            self.assertThat(greeter.shown, Eventually(Equals(False)))
++        self.assertThat(greeter.shown, Eventually(Equals(False)))
      def test_pin_screen_wrong_code(self):
          """Entering the wrong pin code must not dismiss the lock screen."""
@@ -78,18 +76,17 @@
          self.launch_unity()
          greeter = self.main_window.get_greeter()
--        if greeter.narrowMode:
++        if not greeter.tabletMode:
              greeter.swipe()
              lockscreen = self._wait_for_lockscreen()
              self.main_window.enter_pin_code("4321")
              pinentryField = self.main_window.get_pinentryField()
              self.assertThat(pinentryField.text, Eventually(Equals("")))
--            self.assertThat(lockscreen.shown, Eventually(Equals(True)))
          else:
              self._enter_prompt_passphrase("4231\n")
              prompt = self.main_window.get_greeter().get_prompt()
              self.assertThat(prompt.text, Eventually(Equals("")))
--            self.assertThat(greeter.shown, Eventually(Equals(True)))
++        self.assertThat(greeter.shown, Eventually(Equals(True)))
      def test_passphrase_screen_wrong_password(self):
          """Entering the wrong password must not dismiss the lock screen."""
@@ -97,18 +94,17 @@
          self.launch_unity()
          greeter = self.main_window.get_greeter()
--        if greeter.narrowMode:
++        if not greeter.tabletMode:
              greeter.swipe()
              lockscreen = self._wait_for_lockscreen()
              self._enter_pin_passphrase("foobar")
              pinentryField = self.main_window.get_pinentryField()
              self.assertThat(pinentryField.text, Eventually(Equals("")))
--            self.assertThat(lockscreen.shown, Eventually(Equals(True)))
          else:
              self._enter_prompt_passphrase("foobar")
              prompt = self.main_window.get_greeter().get_prompt()
              self.assertThat(prompt.text, Eventually(Equals("")))
--            self.assertThat(greeter.shown, Eventually(Equals(True)))
++        self.assertThat(greeter.shown, Eventually(Equals(True)))
      def _wait_for_lockscreen(self):
          """Wait for the lock screen to load, and return it."""
 === modified file 'tests/plugins/LightDM/CMakeLists.txt'
 --- tests/plugins/LightDM/CMakeLists.txt	2015-01-27 15:50:02 +0000
 +++ tests/plugins/LightDM/CMakeLists.txt	2015-02-23 15:44:00 +0000
@@ -4,17 +4,32 @@
+     )
  qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
++add_executable(GreeterUsersModelTestExec
++    usersmodel.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
++    )
++qt5_use_modules(GreeterUsersModelTestExec Core Test)
++
  include_directories(
      ${CMAKE_CURRENT_BINARY_DIR}
      ${CMAKE_SOURCE_DIR}/plugins/LightDM
++    ${CMAKE_SOURCE_DIR}/plugins/Utils
      ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
--    ${LIBLIGHTDM_INCLUDE_DIRS}
--    )
--
--add_dependencies(GreeterDBusTestExec MockLightDM)
--target_link_libraries(GreeterDBusTestExec -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
--    -llightdm-qt5-2)
++    )
++
++target_link_libraries(GreeterDBusTestExec
++    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
++    -llightdm-qt5-2
++    )
++
++target_link_libraries(GreeterUsersModelTestExec
++    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
++    -llightdm-qt5-2
++    )
  add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
  add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
++
++add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")
 === added file 'tests/plugins/LightDM/usersmodel.cpp'
 --- tests/plugins/LightDM/usersmodel.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/LightDM/usersmodel.cpp	2015-02-23 15:44:00 +0000
@@ -0,0 +1,84 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "UsersModel.h"
++
++#include <QLightDM/UsersModel>
++#include <QtTest>
++
++class GreeterUsersModelTest : public QObject
++{
++    Q_OBJECT
++
++private:
++    static int findName(QAbstractItemModel *model, const QString &name)
++    {
++        for (int i = 0; i < model->rowCount(QModelIndex()); i++) {
++            if (model->data(model->index(i, 0), QLightDM::UsersModel::NameRole).toString() == name) {
++                return i;
++            }
++        }
++        return -1;
++    }
++
++    static QString getStringValue(QAbstractItemModel *model, const QString &name, int role)
++    {
++        int i = findName(model, name);
++        return model->data(model->index(i, 0), role).toString();
++    }
++
++private Q_SLOTS:
++
++    void init()
++    {
++        model = new UsersModel();
++        QVERIFY(model);
++        sourceModel = new QLightDM::UsersModel();
++        QVERIFY(sourceModel);
++    }
++
++    void cleanup()
++    {
++        delete model;
++        delete sourceModel;
++    }
++
++    void testMangleColor()
++    {
++        QString background = getStringValue(sourceModel, "color-background", QLightDM::UsersModel::BackgroundPathRole);
++        QVERIFY(background == "#dd4814");
++
++        background = getStringValue(model, "color-background", QLightDM::UsersModel::BackgroundPathRole);
++        QVERIFY(background == "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>");
++    }
++
++    void testMangleEmptyName()
++    {
++        QString name = getStringValue(sourceModel, "empty-name", QLightDM::UsersModel::RealNameRole);
++        QVERIFY(name == "");
++
++        name = getStringValue(model, "empty-name", QLightDM::UsersModel::RealNameRole);
++        QVERIFY(name == "empty-name");
++    }
++
++private:
++    UsersModel *model;
++    QLightDM::UsersModel *sourceModel;
++};
++
++QTEST_MAIN(GreeterUsersModelTest)
++
++#include "usersmodel.moc"
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2015-02-11 17:11:41 +0000
 +++ tests/qmltests/CMakeLists.txt	2015-02-23 15:44:00 +0000
@@ -60,10 +60,11 @@
  add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
  add_qml_test(Dash/ScopeSettings ScopeSettingString)
  add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
--add_qml_test(Greeter MultiGreeter)
--add_qml_test(Greeter SingleGreeter)
++add_qml_test(Greeter Clock)
++add_qml_test(Greeter Greeter)
  add_qml_test(Greeter Infographics)
--add_qml_test(Greeter Clock)
++add_qml_test(Greeter NarrowView)
++add_qml_test(Greeter WideView)
  add_qml_test(Launcher Launcher)
  add_qml_test(Notifications Notifications)
  add_qml_test(Notifications VisualSnapDecisionsQueue)
 === added file 'tests/qmltests/Greeter/TestView.qml'
 --- tests/qmltests/Greeter/TestView.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Greeter/TestView.qml	2015-02-23 15:44:00 +0000
@@ -0,0 +1,99 @@
++/*
++ * Copyright (C) 2015 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.3
++import Ubuntu.Components 1.1
++import "../Components"
++
++Item {
++    objectName: "testView"
++
++    property real dragHandleLeftMargin
++    property real launcherOffset
++    property int currentIndex
++    property int delayMinutes
++    property real backgroundTopMargin
++    property url background
++    property bool locked
++    property bool alphanumeric
++    property var userModel
++    property var infographicModel
++    readonly property bool fullyShown: _fullyShown
++    readonly property bool required: _required
++
++    property bool _fullyShown: true
++    property bool _required: true
++
++    signal selected(int index)
++    signal responded(string response)
++    signal tease()
++    signal emergencyCall()
++
++    signal _showMessageCalled(string html)
++    signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)
++    signal _showLastChanceCalled()
++    signal _hideCalled()
++    signal _notifyAuthenticationSucceededCalled()
++    signal _notifyAuthenticationFailedCalled()
++    signal _resetCalled()
++    signal _tryToUnlockCalled(bool toTheRight)
++
++    function showMessage(html) {
++        _showMessageCalled(html);
++    }
++
++    function showPrompt(text, isSecret, isDefaultPrompt) {
++        _showPromptCalled(text, isSecret, isDefaultPrompt);
++    }
++
++    function showLastChance() {
++        _showLastChanceCalled();
++    }
++
++    function hide() {
++        _hideCalled();
++        _required = false;
++        _fullyShown = false;
++    }
++
++    function notifyAuthenticationSucceeded() {
++        _notifyAuthenticationSucceededCalled();
++    }
++
++    function notifyAuthenticationFailed() {
++        _notifyAuthenticationFailedCalled();
++    }
++
++    function reset() {
++        _resetCalled();
++    }
++
++    function tryToUnlock(toTheRight) {
++        _tryToUnlockCalled(toTheRight);
++        return true;
++    }
++
++    Rectangle {
++        anchors.fill: parent
++        color: "black"
++
++        Label {
++            text: "Fake view, nothing to see here"
++            color: "white"
++            anchors.centerIn: parent
++        }
++    }
++}
 === added file 'tests/qmltests/Greeter/tst_Greeter.qml'
 --- tests/qmltests/Greeter/tst_Greeter.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Greeter/tst_Greeter.qml	2015-02-23 15:44:00 +0000
@@ -0,0 +1,472 @@
++/*
++ * Copyright 2015 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 "../../../qml/Greeter"
++import Ubuntu.Components 0.1
++import AccountsService 0.1
++import LightDM 0.1 as LightDM
++import Unity.Test 0.1 as UT
++
++Item {
++    width: units.gu(120)
++    height: units.gu(80)
++
++    property url defaultBackground: Qt.resolvedUrl("../../../qml/graphics/tablet_background.jpg")
++
++    Component.onCompleted: {
++        // set the mock mode before loading
++        LightDM.Greeter.mockMode = "full";
++        LightDM.Users.mockMode = "full";
++        loader.active = true;
++    }
++
++    Loader {
++        id: loader
++
++        active: false
++        anchors.fill: parent
++
++        property bool itemDestroyed: false
++        sourceComponent: Component {
++            Greeter {
++                width: loader.width
++                height: loader.height
++                background: defaultBackground
++                viewSource: Qt.resolvedUrl("TestView.qml")
++
++                Component.onDestruction: {
++                    loader.itemDestroyed = true;
++                }
++            }
++        }
++    }
++
++    SignalSpy {
++        id: teaseSpy
++        target: loader.item
++        signalName: "tease"
++    }
++
++    SignalSpy {
++        id: sessionStartedSpy
++        target: loader.item
++        signalName: "sessionStarted"
++    }
++
++    SignalSpy {
++        id: emergencyCallSpy
++        target: loader.item
++        signalName: "emergencyCall"
++    }
++
++    UT.UnityTestCase {
++        id: testCase
++        name: "Greeter"
++        when: windowShown
++
++        property Item greeter: loader.status === Loader.Ready ? loader.item : null
++        property Item view
++
++        SignalSpy {
++            id: viewShowMessageSpy
++            target: testCase.view
++            signalName: "_showMessageCalled"
++        }
++
++        SignalSpy {
++            id: viewShowPromptSpy
++            target: testCase.view
++            signalName: "_showPromptCalled"
++        }
++
++        SignalSpy {
++            id: viewShowLastChanceSpy
++            target: testCase.view
++            signalName: "_showLastChanceCalled"
++        }
++
++        SignalSpy {
++            id: viewHideSpy
++            target: testCase.view
++            signalName: "_hideCalled"
++        }
++
++        SignalSpy {
++            id: viewAuthenticationSucceededSpy
++            target: testCase.view
++            signalName: "_notifyAuthenticationSucceededCalled"
++        }
++
++        SignalSpy {
++            id: viewAuthenticationFailedSpy
++            target: testCase.view
++            signalName: "_notifyAuthenticationFailedCalled"
++        }
++
++        SignalSpy {
++            id: viewResetSpy
++            target: testCase.view
++            signalName: "_resetCalled"
++        }
++
++        SignalSpy {
++            id: viewTryToUnlockSpy
++            target: testCase.view
++            signalName: "_tryToUnlockCalled"
++        }
++
++        function init() {
++            teaseSpy.clear();
++            sessionStartedSpy.clear();
++            emergencyCallSpy.clear();
++            viewShowMessageSpy.clear();
++            viewShowPromptSpy.clear();
++            viewShowLastChanceSpy.clear();
++            viewHideSpy.clear();
++            viewAuthenticationSucceededSpy.clear();
++            viewAuthenticationFailedSpy.clear();
++            viewResetSpy.clear();
++            viewTryToUnlockSpy.clear();
++            tryCompare(greeter, "waiting", false);
++            view = findChild(greeter, "testView");
++            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
++        }
++
++        function cleanup() {
++            loader.itemDestroyed = false;
++            loader.active = false;
++            tryCompare(loader, "status", Loader.Null);
++            tryCompare(loader, "item", null);
++            tryCompare(loader, "itemDestroyed", true);
++            loader.active = true;
++            tryCompare(loader, "status", Loader.Ready);
++            removeTimeConstraintsFromDirectionalDragAreas(loader.item);
++        }
++
++        function getIndexOf(name) {
++            for (var i = 0; i < LightDM.Users.count; i++) {
++                if (name === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
++                    return i;
++                }
++            }
++            fail("Didn't find name")
++            return -1;
++        }
++
++        function selectUser(name) {
++            var i = getIndexOf(name);
++            view.selected(i);
++            verifySelected(name);
++            return i;
++        }
++
++        function verifySelected(name) {
++            var i = getIndexOf(name);
++            compare(view.currentIndex, i);
++            compare(AccountsService.user, name);
++            compare(LightDM.Greeter.authenticationUser, name);
++        }
++
++        function verifyLoggedIn() {
++            tryCompare(sessionStartedSpy, "count", 1);
++            verify(viewAuthenticationSucceededSpy.count > 0);
++            compare(LightDM.Greeter.authenticated, true);
++            compare(greeter.shown, false);
++        }
++
++        function test_unlockPass() {
++            selectUser("has-password");
++            tryCompare(viewShowPromptSpy, "count", 1);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], true);
++
++            view.responded("password");
++            verifyLoggedIn();
++        }
++
++        function test_unlockFail() {
++            selectUser("has-password");
++            tryCompare(viewShowPromptSpy, "count", 1);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], true);
++
++            view.responded("wr0ng p4ssw0rd");
++            tryCompare(viewAuthenticationFailedSpy, "count", 1);
++
++            tryCompare(viewShowPromptSpy, "count", 2);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], true);
++        }
++
++        function test_promptless() {
++            selectUser("no-password");
++            tryCompare(viewAuthenticationSucceededSpy, "count", 1);
++            compare(sessionStartedSpy.count, 1);
++            compare(viewShowPromptSpy.count, 0);
++            compare(viewHideSpy.count, 0);
++            compare(view.locked, false);
++        }
++
++        function test_twoFactorPass() {
++            selectUser("two-factor");
++            tryCompare(viewShowPromptSpy, "count", 1);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], true);
++
++            view.responded("password");
++            tryCompare(viewShowPromptSpy, "count", 2);
++            compare(viewShowPromptSpy.signalArguments[1][0], "otp");
++            compare(viewShowPromptSpy.signalArguments[1][1], false);
++            compare(viewShowPromptSpy.signalArguments[1][2], false);
++
++            view.responded("otp");
++            verifyLoggedIn();
++        }
++
++        function test_twoFactorFailOnFirst() {
++            selectUser("two-factor");
++            tryCompare(viewShowPromptSpy, "count", 1);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], true);
++
++            view.responded("wr0ng p4ssw0rd");
++            tryCompare(viewAuthenticationFailedSpy, "count", 1);
++
++            tryCompare(viewShowPromptSpy, "count", 2);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], true);
++        }
++
++        function test_twoFactorFailOnSecond() {
++            selectUser("two-factor");
++            tryCompare(viewShowPromptSpy, "count", 1);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], true);
++
++            view.responded("password");
++            tryCompare(viewShowPromptSpy, "count", 2);
++            compare(viewShowPromptSpy.signalArguments[1][0], "otp");
++            compare(viewShowPromptSpy.signalArguments[1][1], false);
++            compare(viewShowPromptSpy.signalArguments[1][2], false);
++
++            view.responded("wr0ng p4ssw0rd");
++            tryCompare(viewAuthenticationFailedSpy, "count", 1);
++
++            tryCompare(viewShowPromptSpy, "count", 3);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], true);
++        }
++
++        function test_htmlInfoPrompt() {
++            selectUser("html-info-prompt");
++            tryCompare(viewShowPromptSpy, "count", 1);
++            compare(viewShowMessageSpy.count, 1);
++            compare(viewShowMessageSpy.signalArguments[0][0], "&lt;b&gt;&amp;&lt;/b&gt;");
++        }
++
++        function test_multiInfoPrompt() {
++            selectUser("multi-info-prompt");
++            tryCompare(viewShowPromptSpy, "count", 1);
++            compare(viewShowMessageSpy.count, 3);
++            compare(viewShowMessageSpy.signalArguments[0][0], "Welcome to Unity Greeter");
++            compare(viewShowMessageSpy.signalArguments[1][0], "<font color=\"#df382c\">This is an error</font>");
++            compare(viewShowMessageSpy.signalArguments[2][0], "You should have seen three messages");
++        }
++
++        function test_waiting() {
++            // Make sure we unset 'waiting' on prompt
++            selectUser("has-password");
++            compare(greeter.waiting, true);
++            tryCompare(greeter, "waiting", false);
++
++            // Make sure we unset 'waiting' on authentication
++            selectUser("no-password");
++            compare(greeter.waiting, true);
++            tryCompare(greeter, "waiting", false);
++        }
++
++        function test_locked() {
++            selectUser("has-password");
++            compare(view.locked, true);
++
++            LightDM.Greeter.active = false;
++            compare(view.locked, false);
++            LightDM.Greeter.active = true;
++
++            greeter.forcedUnlock = true;
++            compare(view.locked, false);
++            greeter.forcedUnlock = false;
++
++            selectUser("no-password");
++            tryCompare(view, "locked", false);
++            selectUser("has-password");
++        }
++
++        function test_fullyShown() {
++            compare(greeter.fullyShown, true);
++            view.hide();
++            compare(greeter.fullyShown, false);
++        }
++
++        function test_alphanumeric() {
++            selectUser("has-password");
++            compare(view.alphanumeric, true);
++            selectUser("has-pin");
++            compare(view.alphanumeric, false);
++        }
++
++        function test_background() {
++            greeter.background = "testing";
++            compare(view.background, Qt.resolvedUrl("testing"));
++        }
++
++        function test_notifyAboutToFocusApp() {
++            greeter.notifyAboutToFocusApp("fake-app");
++            compare(viewTryToUnlockSpy.count, 1);
++            compare(viewTryToUnlockSpy.signalArguments[0][0], false);
++        }
++
++        function test_notifyShowingDashFromDrag() {
++            compare(greeter.notifyShowingDashFromDrag("fake-app"), true);
++            compare(viewTryToUnlockSpy.count, 1);
++            compare(viewTryToUnlockSpy.signalArguments[0][0], true);
++        }
++
++        function test_dragHandleLeftMargin() {
++            compare(view.dragHandleLeftMargin, 0);
++            greeter.dragHandleLeftMargin = 5;
++            compare(view.dragHandleLeftMargin, 5);
++        }
++
++        function test_launcherOffset() {
++            compare(view.launcherOffset, 0);
++            greeter.launcherOffset = 5;
++            tryCompare(view, "launcherOffset", 5);
++        }
++
++        function test_laucherOffsetAnimation() {
++            // Our logic for smoothing launcherOffset when it suddenly goes to
++            // zero is a bit complicated.  Let's just make sure it works here.
++
++            launcherOffsetWatcher.target = view;
++
++            // should follow immediately
++            launcherOffsetWatcher.values = [];
++            greeter.launcherOffset = 100;
++            compare(view.launcherOffset, 100);
++            compare(launcherOffsetWatcher.values.length, 1);
++
++            // should interpolate values until it reaches 0
++            launcherOffsetWatcher.values = [];
++            greeter.launcherOffset = 0;
++            tryCompare(view, "launcherOffset", 0);
++            verify(launcherOffsetWatcher.values.length > 1);
++            for (var i = 0; i < launcherOffsetWatcher.values.length - 1; ++i) {
++                verify(launcherOffsetWatcher.values[i] > 0.0);
++                verify(launcherOffsetWatcher.values[i] < 100.0);
++            }
++        }
++        Connections {
++            id: launcherOffsetWatcher
++            property var values: []
++            onLauncherOffsetChanged: {
++                values.push(target.launcherOffset);
++            }
++        }
++
++        function test_backgroundTopMargin() {
++            compare(view.backgroundTopMargin, 0);
++            greeter.y = 5;
++            compare(view.backgroundTopMargin, -5);
++        }
++
++        function test_differentPrompt() {
++            selectUser("different-prompt");
++            tryCompare(viewShowPromptSpy, "count", 1);
++            compare(viewShowPromptSpy.signalArguments[0][0], "Secret word");
++            compare(viewShowPromptSpy.signalArguments[0][1], true);
++            compare(viewShowPromptSpy.signalArguments[0][2], false);
++        }
++
++        function test_authError() {
++            selectUser("auth-error");
++            tryCompare(viewAuthenticationFailedSpy, "count", 1);
++            compare(viewShowPromptSpy.count, 0);
++            compare(view.locked, true);
++        }
++
++        function test_statsWelcomeScreen() {
++            // Test logic in greeter that turns statsWelcomeScreen setting into infographic changes
++            selectUser("has-password");
++            compare(LightDM.Infographic.username, "has-password");
++            AccountsService.statsWelcomeScreen = false;
++            compare(LightDM.Infographic.username, "");
++            AccountsService.statsWelcomeScreen = true;
++            compare(LightDM.Infographic.username, "has-password");
++        }
++
++        function test_dbusRequestAuthenticationUser() {
++            selectUser("no-password");
++            LightDM.Greeter.requestAuthenticationUser("has-password");
++            verifySelected("has-password");
++        }
++
++        function test_dbusHideGreeter() {
++            compare(view.required, true);
++            LightDM.Greeter.hideGreeter();
++            compare(view.required, false);
++            compare(greeter.required, false);
++        }
++
++        function test_dbusShowGreeterFromHiddenState() {
++            greeter.hide();
++            compare(greeter.required, false);
++
++            LightDM.Greeter.showGreeter();
++            compare(greeter.required, true);
++            compare(greeter.fullyShown, true);
++            view = findChild(greeter, "testView");
++            compare(view.required, true);
++
++            // Can't test some of the stuff called on 'view' here because
++            // the view was torn down and created again.  So the spies missed
++            // the good stuff while it down.  See next test for more.
++        }
++
++        function test_dbusShowGreeterFromShownState() {
++            selectUser("has-password");
++            compare(viewResetSpy.count, 1);
++            tryCompare(viewShowPromptSpy, "count", 1);
++
++            viewResetSpy.clear();
++            viewShowPromptSpy.clear();
++
++            LightDM.Greeter.showGreeter();
++            compare(viewResetSpy.count, 1);
++        }
++    }
++}
 === removed file 'tests/qmltests/Greeter/tst_MultiGreeter.qml'
 --- tests/qmltests/Greeter/tst_MultiGreeter.qml	2015-02-02 14:28:32 +0000
 +++ tests/qmltests/Greeter/tst_MultiGreeter.qml	1970-01-01 00:00:00 +0000
@@ -1,475 +0,0 @@
--/*
-- * 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 QtQuick.Layouts 1.1
--import QtTest 1.0
--import ".."
--import "../../../qml/Greeter"
--import Ubuntu.Components 0.1
--import LightDM 0.1 as LightDM
--import Unity.Test 0.1 as UT
--
--Item {
--    id: root
--    width: units.gu(140)
--    height: units.gu(80)
--
--    QtObject {
--        id: fakeInputMethod
--        property bool visible: fakeKeyboard.visible
--        property var keyboardRectangle: QtObject {
--            property real x: fakeKeyboard.x
--            property real y: fakeKeyboard.y
--            property real width: fakeKeyboard.width
--            property real height: fakeKeyboard.height
--        }
--    }
--
--    Binding {
--        target: LightDM.Greeter
--        property: "mockMode"
--        value: "full"
--    }
--    Binding {
--        target: LightDM.Users
--        property: "mockMode"
--        value: "full"
--    }
--
--    Greeter {
--        id: greeter
--        width: units.gu(120)
--        height: root.height
--        inputMethod: fakeInputMethod
--        locked: !LightDM.Greeter.authenticated
--    }
--
--    Component {
--        id: greeterComponent
--        Greeter {
--            SignalSpy {
--                objectName: "selectedSpy"
--                target: parent
--                signalName: "selected"
--            }
--        }
--    }
--
--    Rectangle {
--        id: fakeKeyboard
--        color: "green"
--        opacity: 0.7
--        anchors.bottom: root.bottom
--        width: greeter.width
--        height: greeter.height * 0.6
--        visible: keyboardVisibleCheckbox.checked
--        Text {
--            text: "Keyboard Rectangle"
--            color: "yellow"
--            font.bold: true
--            fontSizeMode: Text.Fit
--            minimumPixelSize: 10; font.pixelSize: 200
--            verticalAlignment: Text.AlignVCenter
--            x: (parent.width - width) / 2
--            y: (parent.height - height) / 2
--            width: parent.width
--            height: parent.height
--        }
--    }
--
--    Item {
--        anchors {
--            top: root.top
--            bottom: root.bottom
--            left: greeter.right
--            right: root.right
--        }
--        RowLayout {
--            Layout.fillWidth: true
--            CheckBox {
--                id: keyboardVisibleCheckbox
--            }
--            Label { text: "Keyboard Visible"; anchors.verticalCenter: parent.verticalCenter }
--        }
--    }
--
--    SignalSpy {
--        id: unlockSpy
--        target: greeter
--        signalName: "unlocked"
--    }
--
--    SignalSpy {
--        id: selectionSpy
--        target: greeter
--        signalName: "selected"
--    }
--
--    SignalSpy {
--        id: tappedSpy
--        target: greeter
--        signalName: "tapped"
--    }
--
--    UT.UnityTestCase {
--        name: "MultiGreeter"
--        when: windowShown
--
--        function cleanup() {
--            keyboardVisibleCheckbox.checked = false;
--        }
--
--        function select_index(i) {
--            // We could be anywhere in list; find target index to know which direction
--            var userlist = findChild(greeter, "userList")
--            if (userlist.currentIndex == i)
--                keyClick(Qt.Key_Escape) // Reset state if we're not moving
--            while (userlist.currentIndex != i) {
--                var next = userlist.currentIndex + 1
--                if (userlist.currentIndex > i) {
--                    next = userlist.currentIndex - 1
--                }
--                var account = findChild(greeter, "username"+next)
--                mouseClick(account, 1, 1)
--                tryCompare(userlist, "currentIndex", next)
--                tryCompare(userlist, "movingInternally", false)
--            }
--        }
--
--        function select_user(name) {
--            // We could be anywhere in list; find target index to know which direction
--            for (var i = 0; i < greeter.model.count; i++) {
--                if (greeter.model.data(i, LightDM.UserRoles.NameRole) == name) {
--                    break
--                }
--            }
--            if (i == greeter.model.count) {
--                fail("Didn't find name")
--                return -1
--            }
--            select_index(i)
--            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++) {
--                data[i] = {tag: greeter.model.data(i, LightDM.UserRoles.NameRole), uid: i }
--            }
--            return data
--        }
--
--        function test_cycle(data) {
--            selectionSpy.clear();
--            var userList = findChild(greeter, "userList")
--            var waitForSignal = data.uid != 0 && userList.currentIndex != data.uid
--            select_index(data.uid)
--            tryCompare(userList, "currentIndex", data.uid)
--            tryCompare(greeter, "locked", data.tag !== "no-password")
--            if (waitForSignal) {
--                selectionSpy.wait()
--                tryCompare(selectionSpy, "count", 1)
--            }
--        }
--
--        function test_unlock_password() {
--            select_user("no-password") // to guarantee a selected signal
--            unlockSpy.clear()
--            select_user("has-password")
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "opacity", 1)
--            mouseClick(passwordInput, 1, 1)
--            compare(unlockSpy.count, 0)
--            typeString("password")
--            keyClick(Qt.Key_Enter)
--            unlockSpy.wait()
--        }
--
--        function test_unlock_wrong_password() {
--            select_user("no-password") // to guarantee a selected signal
--            unlockSpy.clear()
--            select_user("has-password")
--            wait(0) // spin event loop to start any pending animations
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "opacity", 1) // wait for opacity animation to be finished
--            mouseClick(passwordInput, 1, 1)
--            compare(unlockSpy.count, 0)
--            typeString("wr0ng p4ssw0rd")
--            keyClick(Qt.Key_Enter)
--            compare(unlockSpy.count, 0)
--        }
--
--        function test_unlock_no_password() {
--            unlockSpy.clear()
--            select_user("no-password")
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "opacity", 1)
--            mouseClick(passwordInput, 1, 1)
--            unlockSpy.wait()
--            compare(unlockSpy.count, 1)
--        }
--
--        function test_empty_name() {
--            for (var i = 0; i < greeter.model.count; i++) {
--                if (greeter.model.data(i, LightDM.UserRoles.NameRole) == "empty-name") {
--                    compare(greeter.model.data(i, LightDM.UserRoles.RealNameRole), greeter.model.data(i, LightDM.UserRoles.NameRole))
--                    return
--                }
--            }
--            fail("Didn't find empty-name")
--        }
--
--        function test_auth_error() {
--            select_user("auth-error")
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "placeholderText", "Retry")
--        }
--
--        function test_different_prompt() {
--            select_user("different-prompt")
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "placeholderText", "Secret word")
--        }
--
--        function test_no_response() {
--            unlockSpy.clear()
--            select_user("no-response")
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "opacity", 1)
--            mouseClick(passwordInput, 1, 1)
--            compare(unlockSpy.count, 0)
--            typeString("password")
--            keyClick(Qt.Key_Enter)
--            tryCompare(passwordInput, "enabled", false)
--            keyClick(Qt.Key_Escape)
--            tryCompare(passwordInput, "enabled", true)
--            compare(unlockSpy.count, 0)
--        }
--
--        function test_two_factor_correct() {
--            unlockSpy.clear()
--            select_user("two-factor")
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "opacity", 1)
--            tryCompare(passwordInput, "echoMode", TextInput.Password)
--            tryCompare(passwordInput, "placeholderText", "Password")
--            mouseClick(passwordInput, 1, 1)
--            compare(unlockSpy.count, 0)
--            typeString("password")
--            keyClick(Qt.Key_Enter)
--            tryCompare(passwordInput, "echoMode", TextInput.Normal)
--            tryCompare(passwordInput, "placeholderText", "otp")
--            tryCompare(passwordInput, "enabled", true)
--            typeString("otp")
--            keyClick(Qt.Key_Enter)
--            unlockSpy.wait()
--        }
--
--        function test_two_factor_wrong1() {
--            unlockSpy.clear()
--            select_user("two-factor")
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "opacity", 1)
--            tryCompare(passwordInput, "placeholderText", "Password")
--            mouseClick(passwordInput, 1, 1)
--            compare(unlockSpy.count, 0)
--            typeString("wr0ng p4ssw0rd")
--            keyClick(Qt.Key_Enter)
--            tryCompare(passwordInput, "placeholderText", "Password")
--            tryCompare(passwordInput, "enabled", true)
--            compare(unlockSpy.count, 0)
--        }
--
--        function test_two_factor_wrong2() {
--            unlockSpy.clear()
--            select_user("two-factor")
--            var passwordInput = findChild(greeter, "passwordInput")
--            tryCompare(passwordInput, "opacity", 1)
--            tryCompare(passwordInput, "placeholderText", "Password")
--            mouseClick(passwordInput, 1, 1)
--            compare(unlockSpy.count, 0)
--            typeString("password")
--            keyClick(Qt.Key_Enter)
--            tryCompare(passwordInput, "placeholderText", "otp")
--            tryCompare(passwordInput, "enabled", true)
--            typeString("wr0ng p4ssw0rd")
--            keyClick(Qt.Key_Enter)
--            tryCompare(passwordInput, "placeholderText", "Password")
--            tryCompare(passwordInput, "enabled", true)
--            compare(unlockSpy.count, 0)
--        }
--
--        function test_unicode() {
--            var index = select_user("unicode")
--            var label = findChild(greeter, "username"+index)
--            tryCompare(label, "text", "가나다라마")
--        }
--
--        function test_long_name() {
--            var index = select_user("long-name")
--            var label = findChild(greeter, "username"+index)
--            tryCompare(label, "truncated", true)
--        }
--
--        function test_info_prompt() {
--            select_user("info-prompt")
--            var label = findChild(greeter, "infoLabel")
--            tryCompare(label, "text", "Welcome to Unity Greeter")
--            tryCompare(label, "opacity", 1)
--            tryCompare(label, "clip", true)
--            tryCompareFunction(function() {return label.contentWidth > label.width;}, false) // c.f. wide-info-prompt
--            var passwordInput = findChild(greeter, "passwordInput")
--            mouseClick(passwordInput, 1, 1)
--            keyClick(Qt.Key_Escape)
--        }
--
--        function test_info_prompt_escape() {
--            select_user("info-prompt")
--            var passwordInput = findChild(greeter, "passwordInput")
--            mouseClick(passwordInput, 1, 1)
--            keyClick(Qt.Key_Escape)
--            var label = findChild(greeter, "infoLabel")
--            tryCompare(label, "text", "Welcome to Unity Greeter")
--            tryCompare(label, "opacity", 1)
--        }
--
--        function test_wide_info_prompt() {
--            select_user("wide-info-prompt")
--            var label = findChild(greeter, "infoLabel")
--            tryCompare(label, "clip", true)
--            tryCompareFunction(function() {return label.contentWidth > label.width;}, true)
--        }
--
--        function test_html_info_prompt() {
--            select_user("html-info-prompt")
--            var label = findChild(greeter, "infoLabel")
--            tryCompare(label, "text", "&lt;b&gt;&amp;&lt;/b&gt;")
--        }
--
--        function test_long_info_prompt() {
--            select_user("long-info-prompt")
--            var label = findChild(greeter, "infoLabel")
--            tryCompare(label, "text", "Welcome to Unity Greeter<br><br>We like to annoy you with super ridiculously long messages.<br>Like this one<br><br>This is the last line of a multiple line message.")
--            tryCompare(label, "textFormat", Text.StyledText) // for parsing above correctly
--            tryCompare(label, "clip", true)
--            tryCompareFunction(function() {return label.contentWidth > label.width;}, true)
--        }
--
--        function test_multi_info_prompt() {
--            select_user("multi-info-prompt")
--            var label = findChild(greeter, "infoLabel")
--            tryCompare(label, "text", "Welcome to Unity Greeter<br><font color=\"#df382c\">This is an error</font><br>You should have seen three messages")
--            tryCompare(label, "textFormat", Text.StyledText) // for parsing above correctly
--        }
--
--        function test_bg_color() {
--            var index = select_user("color-background")
--            compare(greeter.model.data(index, LightDM.UserRoles.BackgroundPathRole), "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>")
--        }
--
--        function test_bg_none() {
--            var index = select_user("no-background")
--            compare(greeter.model.data(index, LightDM.UserRoles.BackgroundPathRole), "")
--        }
--
--        function test_tappedSignal_data() {
--            return [
--                {tag: "left", posX: units.gu(2)},
--                {tag: "right", posX: greeter.width - units.gu(2)}
--            ]
--        }
--
--        function test_tappedSignal(data) {
--            select_user("no-password");
--            tappedSpy.clear();
--            tap(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(tappedSpy, "count", 1)
--        }
--
--        function test_teaseLockedUnlocked_data() {
--            return [
--                {tag: "unlocked", locked: false, narrow: false},
--                {tag: "locked", locked: true, narrow: false},
--            ];
--        }
--
--        function test_teaseLockedUnlocked(data) {
--            tappedSpy.clear()
--            greeter.locked = data.locked;
--
--            tap(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
--
--            if (!data.locked || data.narrow) {
--                tappedSpy.wait()
--                tryCompare(tappedSpy, "count", 1);
--            } else {
--                // waiting 100ms to make sure nothing happens
--                wait(100);
--                compare(tappedSpy.count, 0, "Greeter teasing not disabled even though it's locked.");
--            }
--
--            // Reset value
--            greeter.locked = false;
--        }
--
--        function test_dbus_set_active_entry() {
--            select_user("no-password") // to guarantee a selected signal
--            selectionSpy.clear()
--            LightDM.Greeter.requestAuthenticationUser("has-password")
--
--            selectionSpy.wait()
--            tryCompare(selectionSpy, "count", 1)
--
--            var userlist = findChild(greeter, "userList")
--            compare(greeter.model.data(userlist.currentIndex, LightDM.UserRoles.NameRole), "has-password")
--        }
--
--        function test_initial_selected_signal() {
--            var greeterObj = greeterComponent.createObject(this)
--            var spy = findChild(greeterObj, "selectedSpy")
--            spy.wait()
--            tryCompare(spy, "count", 1)
--            greeterObj.destroy()
--        }
--
--        function test_login_list_not_covered_by_keyboard() {
--            var loginList = findChild(greeter, "loginLoader").item;
--            compare(loginList.height, greeter.height);
--
--            // when the vkb shows up, loginList is moved up to remain fully uncovered
--
--            keyboardVisibleCheckbox.checked = true;
--
--            tryCompare(loginList, "height", greeter.height - fakeInputMethod.keyboardRectangle.height);
--            tryCompareFunction( function() {
--                var loginListRect = loginList.mapToItem(greeter, 0, 0, loginList.width, loginList.height);
--                return loginListRect.y + loginListRect.height <= fakeInputMethod.keyboardRectangle.y;
--            }, true);
--
--            // once the vkb goes away, loginList goes back to its full height
--
--            keyboardVisibleCheckbox.checked = false;
--
--            tryCompare(loginList, "height", greeter.height);
--        }
--    }
--}
 === added file 'tests/qmltests/Greeter/tst_NarrowView.qml'
 --- tests/qmltests/Greeter/tst_NarrowView.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Greeter/tst_NarrowView.qml	2015-02-23 15:44:00 +0000
@@ -0,0 +1,522 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import QtTest 1.0
++import ".."
++import "../../../qml/Greeter"
++import LightDM 0.1 as LightDM
++import Ubuntu.Components 0.1
++import Unity.Test 0.1 as UT
++
++Item {
++    id: root
++    width: units.gu(90)
++    height: units.gu(80)
++
++    Row {
++        anchors.fill: parent
++        Loader {
++            id: loader
++            width: root.width - controls.width
++            height: parent.height
++
++            property bool itemDestroyed: false
++            sourceComponent: Component {
++                NarrowView {
++                    background: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
++                    userModel: LightDM.Users
++                    infographicModel: LightDM.Infographic
++
++                    launcherOffset: parseFloat(launcherOffsetField.text)
++                    currentIndex: parseInt(currentIndexField.text, 10)
++                    delayMinutes: parseInt(delayMinutesField.text, 10)
++                    backgroundTopMargin: parseFloat(backgroundTopMarginField.text)
++                    locked: lockedCheckBox.checked
++                    alphanumeric: alphanumericCheckBox.checked
++
++                    Component.onDestruction: {
++                        loader.itemDestroyed = true
++                    }
++
++                    onSelected: {
++                        currentIndexField.text = index;
++                    }
++                }
++            }
++        }
++
++        Rectangle {
++            id: controls
++            color: "white"
++            width: units.gu(40)
++            height: parent.height
++
++            Column {
++                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
++                spacing: units.gu(1)
++
++                Row {
++                    Button {
++                        text: "Show Last Chance"
++                        onClicked: loader.item.showLastChance()
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Hide"
++                        onClicked: loader.item.hide()
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Reset"
++                        onClicked: loader.item.reset()
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Show Message"
++                        onClicked: loader.item.showMessage(messageField.text)
++                    }
++                    TextField {
++                        id: messageField
++                        width: units.gu(10)
++                        text: ""
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Show Prompt"
++                        onClicked: loader.item.showPrompt(promptField.text, isSecretCheckBox.checked, isDefaultPromptCheckBox.checked)
++                    }
++                    TextField {
++                        id: promptField
++                        width: units.gu(10)
++                        text: ""
++                    }
++                    CheckBox {
++                        id: isSecretCheckBox
++                    }
++                    Label {
++                        text: "secret"
++                    }
++                    CheckBox {
++                        id: isDefaultPromptCheckBox
++                    }
++                    Label {
++                        text: "default"
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Authenticated"
++                        onClicked: {
++                            if (successCheckBox.checked) {
++                                loader.item.notifyAuthenticationSucceeded();
++                            } else {
++                                loader.item.notifyAuthenticationFailed();
++                            }
++                        }
++                    }
++                    CheckBox {
++                        id: successCheckBox
++                    }
++                    Label {
++                        text: "success"
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Try To Unlock"
++                        onClicked: loader.item.tryToUnlock(toTheRightCheckBox.checked)
++                    }
++                    CheckBox {
++                        id: toTheRightCheckBox
++                    }
++                    Label {
++                        text: "toTheRight"
++                    }
++                }
++                Row {
++                    TextField {
++                        id: launcherOffsetField
++                        width: units.gu(10)
++                        text: "0"
++                    }
++                    Label {
++                        text: "launcherOffset"
++                    }
++                }
++                Row {
++                    TextField {
++                        id: currentIndexField
++                        width: units.gu(10)
++                        text: "0"
++                    }
++                    Label {
++                        text: "currentIndex"
++                    }
++                }
++                Row {
++                    TextField {
++                        id: delayMinutesField
++                        width: units.gu(10)
++                        text: "0"
++                    }
++                    Label {
++                        text: "delayMinutes"
++                    }
++                }
++                Row {
++                    TextField {
++                        id: backgroundTopMarginField
++                        width: units.gu(10)
++                        text: "0"
++                    }
++                    Label {
++                        text: "backgroundTopMargin"
++                    }
++                }
++                Row {
++                    CheckBox {
++                        id: lockedCheckBox
++                    }
++                    Label {
++                        text: "locked"
++                    }
++                }
++                Row {
++                    CheckBox {
++                        id: alphanumericCheckBox
++                    }
++                    Label {
++                        text: "alphanumeric"
++                    }
++                }
++                Row {
++                    Label {
++                        text: "selected: " + selectedSpy.count
++                    }
++                }
++                Row {
++                    Label {
++                        text: "responded: " + respondedSpy.count
++                    }
++                }
++                Row {
++                    Label {
++                        text: "teased: " + teaseSpy.count
++                    }
++                }
++                Row {
++                    Label {
++                        text: "emergency: " + emergencySpy.count
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Reload View"
++                        onClicked: {
++                            loader.active = false;
++                            loader.active = true;
++                        }
++                    }
++                }
++            }
++        }
++    }
++
++    Binding {
++        target: LightDM.Infographic
++        property: "username"
++        value: "single"
++    }
++
++    SignalSpy {
++        id: selectedSpy
++        target: loader.item
++        signalName: "selected"
++    }
++
++    SignalSpy {
++        id: respondedSpy
++        target: loader.item
++        signalName: "responded"
++    }
++
++    SignalSpy {
++        id: teaseSpy
++        target: loader.item
++        signalName: "tease"
++    }
++
++    SignalSpy {
++        id: emergencySpy
++        target: loader.item
++        signalName: "emergencyCall"
++    }
++
++    SignalSpy {
++        id: infographicDataChangedSpy
++        target: LightDM.Infographic
++        signalName: "dataChanged"
++    }
++
++    UT.UnityTestCase {
++        name: "NarrowView"
++        when: windowShown
++
++        property Item view: loader.status === Loader.Ready ? loader.item : null
++
++        function init() {
++            view.currentIndex = 0; // break binding with text field
++
++            selectedSpy.clear();
++            respondedSpy.clear();
++            teaseSpy.clear();
++            emergencySpy.clear();
++            infographicDataChangedSpy.clear();
++        }
++
++        function cleanup() {
++            loader.itemDestroyed = false;
++            loader.active = false;
++            tryCompare(loader, "status", Loader.Null);
++            tryCompare(loader, "item", null);
++            tryCompare(loader, "itemDestroyed", true);
++            loader.active = true;
++            tryCompare(loader, "status", Loader.Ready);
++            removeTimeConstraintsFromDirectionalDragAreas(loader.item);
++        }
++
++        function swipeAwayCover(toTheRight) {
++            if (toTheRight === undefined) {
++                toTheRight = false;
++            }
++
++            tryCompare(view, "fullyShown", true);
++            var touchY = view.height / 2;
++            if (toTheRight) {
++                touchFlick(view, 0, touchY, view.width, touchY);
++            } else {
++                touchFlick(view, view.width, touchY, 0, touchY);
++            }
++            var coverPage = findChild(view, "coverPage");
++            tryCompare(coverPage, "showProgress", 0);
++            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},
++                {tag: "leftWithOffsetPass", x: 10, offset: 10, count: 1},
++                {tag: "leftWithOffsetFail", x: 9, offset: 10, count: 0},
++                {tag: "right", x: view.width, offset: 0, count: 1},
++            ]
++        }
++        function test_tease(data) {
++            view.dragHandleLeftMargin = data.offset;
++            tap(view, data.x, 0);
++            compare(teaseSpy.count, data.count);
++        }
++
++        function test_respondedWithPin() {
++            view.locked = true;
++            swipeAwayCover();
++            enterPin("1234");
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "1234");
++        }
++
++        function test_respondedWithPassphrase() {
++            view.locked = true;
++            view.alphanumeric = true;
++            swipeAwayCover();
++            typeString("test");
++            keyClick(Qt.Key_Enter);
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "test");
++        }
++
++        function test_respondedWithSwipe_data() {
++            return [
++                {tag: "left", toTheRight: false, hiddenX: -view.width},
++                {tag: "right", toTheRight: true, hiddenX: view.width},
++            ];
++        }
++        function test_respondedWithSwipe(data) {
++            swipeAwayCover(data.toTheRight);
++            var coverPage = findChild(view, "coverPage");
++            compare(coverPage.x, data.hiddenX);
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "");
++        }
++
++        function test_emergencyCall() {
++            view.locked = true;
++            swipeAwayCover();
++            var emergencyCallLabel = findChild(view, "emergencyCallLabel");
++            tap(emergencyCallLabel);
++            compare(emergencySpy.count, 1);
++        }
++
++        function test_fullyShown() {
++            tryCompare(view, "fullyShown", true);
++            swipeAwayCover();
++            tryCompare(view, "fullyShown", false);
++            view.locked = true;
++            tryCompare(view, "fullyShown", true);
++            view.locked = false;
++            tryCompare(view, "fullyShown", false);
++        }
++
++        function test_required() {
++            tryCompare(view, "required", true);
++            swipeAwayCover();
++            tryCompare(view, "required", false);
++            view.locked = true;
++            tryCompare(view, "required", true);
++            view.locked = false;
++            tryCompare(view, "required", false);
++        }
++
++        function test_tryToUnlock() {
++            var coverPage = findChild(view, "coverPage");
++            tryCompare(coverPage, "showProgress", 1);
++            compare(view.tryToUnlock(false), true);
++            tryCompare(coverPage, "showProgress", 0);
++            compare(view.tryToUnlock(false), false);
++        }
++
++        /*
++            Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1388359
++            "User metrics can no longer be changed by double tap"
++        */
++        function test_doubleTapSwitchesToNextInfographic() {
++            var infographicPrivate = findInvisibleChild(view, "infographicPrivate");
++            verify(infographicPrivate);
++
++            // wait for the UI to settle down before double tapping it
++            tryCompare(infographicPrivate, "animating", false);
++
++            var dataCircle = findChild(view, "dataCircle");
++            verify(dataCircle);
++
++            tap(dataCircle);
++            wait(1);
++            tap(dataCircle);
++
++            tryCompare(infographicDataChangedSpy, "count", 1);
++        }
++
++        function test_movesBackIntoPlaceWhenNotDraggedFarEnough() {
++            var coverPage = findChild(view, "coverPage");
++
++            var dragEvaluator = findInvisibleChild(coverPage, "edgeDragEvaluator");
++            verify(dragEvaluator);
++
++            // Make it easier to get a rejection/rollback. Otherwise would have to inject
++            // a fake timer into dragEvaluator.
++            // Afterall, we are testing if the CoverPage indeed moves back on a
++            // rollback decision, not the drag evaluation itself.
++            dragEvaluator.minDragDistance = dragEvaluator.maxDragDistance / 2;
++
++            // it starts as fully shown
++            compare(coverPage.x, 0);
++
++            // then we drag it a bit
++            var startX = coverPage.width - 1;
++            var touchY = coverPage.height / 2;
++            var dragXDelta = -(dragEvaluator.minDragDistance * 0.3);
++            touchFlick(coverPage,
++                       startX , touchY, // start pos
++                       startX + dragXDelta, touchY, // end pos
++                       true /* beginTouch */, false /* endTouch  */);
++
++            // which should make it move a bit
++            tryCompareFunction(function() {return coverPage.x < 0;}, true);
++
++            // then we release it
++            touchRelease(coverPage, startX + dragXDelta, touchY);
++
++            // which should make it move back into its original position as it didn't move
++            // far enough to have it hidden
++            tryCompare(coverPage, "x", 0);
++        }
++
++        function test_dragToHide_data() {
++            return [
++                {tag: "left", startX: view.width * 0.95, endX: view.width * 0.1, hiddenX: -view.width},
++                {tag: "right", startX: view.width * 0.1, endX: view.width * 0.95, hiddenX: view.width},
++            ];
++        }
++        function test_dragToHide(data) {
++            var coverPage = findChild(view, "coverPage");
++            compare(coverPage.x, 0);
++            compare(coverPage.visible, true);
++            compare(coverPage.shown, true);
++            compare(coverPage.showProgress, 1);
++            compare(view.fullyShown, true);
++
++            touchFlick(view,
++                    data.startX, view.height / 2, // start pos
++                    data.endX, view.height / 2); // end pos
++
++            tryCompare(coverPage, "x", data.hiddenX);
++            tryCompare(coverPage, "visible", false);
++            tryCompare(coverPage, "shown", false);
++            tryCompare(coverPage, "showProgress", 0);
++            compare(view.fullyShown, false);
++        }
++
++        function test_hiddenViewRemainsHiddenAfterResize_data() {
++            return [
++                {tag: "left", startX: view.width * 0.95, endX: view.width * 0.1},
++                {tag: "right", startX: view.width * 0.1, endX: view.width * 0.95},
++            ];
++        }
++        function test_hiddenViewRemainsHiddenAfterResize(data) {
++            touchFlick(view,
++                    data.startX, view.height / 2, // start pos
++                    data.endX, view.height / 2); // end pos
++
++            var coverPage = findChild(view, "coverPage");
++            tryCompare(coverPage, "x", data.tag == "left" ? -view.width : view.width);
++            tryCompare(coverPage, "visible", false);
++            tryCompare(coverPage, "shown", false);
++            tryCompare(coverPage, "showProgress", 0);
++
++            // flip dimensions to simulate an orientation change
++            view.width = loader.height;
++            view.height = loader.width;
++
++            // All properties should remain consistent
++            tryCompare(coverPage, "x", data.tag == "left" ? -view.width : view.width);
++            tryCompare(coverPage, "visible", false);
++            tryCompare(coverPage, "shown", false);
++            tryCompare(coverPage, "showProgress", 0);
++        }
++    }
++}
 === removed file 'tests/qmltests/Greeter/tst_SingleGreeter.qml'
 --- tests/qmltests/Greeter/tst_SingleGreeter.qml	2014-12-08 18:08:38 +0000
 +++ tests/qmltests/Greeter/tst_SingleGreeter.qml	1970-01-01 00:00:00 +0000
@@ -1,244 +0,0 @@
--/*
-- * 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 "../../../qml/Greeter"
--import AccountsService 0.1
--import LightDM 0.1 as LightDM
--import Ubuntu.Components 0.1
--import Unity.Test 0.1 as UT
--
--Rectangle {
--    color: "darkblue"
--    width: units.gu(60)
--    height: units.gu(80)
--
--    Button {
--        anchors.centerIn: parent
--        text: "Show Greeter"
--        onClicked: {
--            if (greeterLoader.item)
--                greeterLoader.item.show();
--        }
--    }
--
--    Loader {
--        id: greeterLoader
--        anchors.fill: parent
--
--        property bool itemDestroyed: false
--
--        sourceComponent: Component {
--            Greeter {
--                width: greeterLoader.width
--                height: greeterLoader.height
--
--                Component.onDestruction: {
--                    greeterLoader.itemDestroyed = true;
--                }
--                SignalSpy {
--                    objectName: "selectedSpy"
--                    target: parent
--                    signalName: "selected"
--                }
--            }
--        }
--    }
--
--    SignalSpy {
--        id: unlockSpy
--        target: greeterLoader.item
--        signalName: "unlocked"
--    }
--
--    SignalSpy {
--        id: tappedSpy
--        target: greeterLoader.item
--        signalName: "tapped"
--    }
--
--    SignalSpy {
--        id: infographicDataChangedSpy
--        target: LightDM.Infographic
--        signalName: "dataChanged"
--    }
--
--    UT.UnityTestCase {
--        name: "SingleGreeter"
--        when: windowShown
--
--        property Greeter greeter: greeterLoader.item
--
--        function cleanup() {
--            AccountsService.statsWelcomeScreen = true
--
--            // force a reload so that we get a fresh Greeter for the next test
--            greeterLoader.itemDestroyed = false;
--            greeterLoader.active = false;
--            tryCompare(greeterLoader, "itemDestroyed", true);
--
--            unlockSpy.clear();
--            tappedSpy.clear();
--
--            greeterLoader.active = true;
--            tryCompare(greeterLoader, "status", Loader.Ready);
--            removeTimeConstraintsFromDirectionalDragAreas(greeterLoader.item);
--        }
--
--        function test_properties() {
--            compare(greeter.multiUser, false)
--            compare(greeter.narrowMode, true)
--        }
--
--        function test_teasingArea_data() {
--            return [
--                {tag: "left", posX: units.gu(2), leftPressed: true, rightPressed: false},
--                {tag: "right", posX: greeter.width - units.gu(2), leftPressed: false, rightPressed: true}
--            ]
--        }
--
--        function test_teasingArea(data) {
--            tappedSpy.clear()
--            tap(greeter, data.posX, greeter.height - units.gu(1))
--            tappedSpy.wait()
--            tryCompare(tappedSpy, "count", 1)
--        }
--
--        function test_statsWelcomeScreen() {
--            // Test logic in greeter that turns statsWelcomeScreen setting into infographic changes
--            compare(AccountsService.statsWelcomeScreen, true)
--            tryCompare(LightDM.Infographic, "username", "single")
--            AccountsService.statsWelcomeScreen = false
--            tryCompare(LightDM.Infographic, "username", "")
--            AccountsService.statsWelcomeScreen = true
--            tryCompare(LightDM.Infographic, "username", "single")
--        }
--
--        function test_initial_selected_signal() {
--            var selectedSpy = findChild(greeter, "selectedSpy");
--            selectedSpy.wait();
--            tryCompare(selectedSpy, "count", 1);
--        }
--
--        /*
--            Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1388359
--            "User metrics can no longer be changed by double tap"
--        */
--        function test_doubleTapSwitchesToNextInfographic() {
--            infographicDataChangedSpy.clear();
--
--            var infographicPrivate = findInvisibleChild(greeter, "infographicPrivate");
--            verify(infographicPrivate);
--
--            // wait for the UI to settle down before double tapping it
--            tryCompare(infographicPrivate, "animating", false);
--
--            var dataCircle = findChild(greeter, "dataCircle");
--            verify(dataCircle);
--
--            tap(dataCircle);
--            wait(1);
--            tap(dataCircle);
--
--            tryCompare(infographicDataChangedSpy, "count", 1);
--        }
--
--        function test_movesBackIntoPlaceWhenNotDraggedFarEnough() {
--
--            var dragEvaluator = findInvisibleChild(greeter, "edgeDragEvaluator");
--            verify(dragEvaluator);
--
--            // Make it easier to get a rejection/rollback. Otherwise would have to inject
--            // a fake timer into dragEvaluator.
--            // Afterall, we are testing if the Greeter indeed moves back on a
--            // rollback decision, not the drag evaluation itself.
--            dragEvaluator.minDragDistance = dragEvaluator.maxDragDistance / 2;
--
--            // it starts as fully shown
--            compare(greeter.x, 0);
--
--            // then we drag it a bit
--            var startX = greeter.width - 1;
--            var touchY = greeter.height / 2;
--            var dragXDelta = -(dragEvaluator.minDragDistance * 0.3);
--            touchFlick(greeter,
--                       startX , touchY, // start pos
--                       startX + dragXDelta, touchY, // end pos
--                       true /* beginTouch */, false /* endTouch  */);
--
--            // which should make it move a bit
--            tryCompareFunction(function(){return greeter.x < 0;}, true);
--
--            // then we release it
--            touchRelease(greeter, startX + dragXDelta, touchY);
--
--            // which should make it move back into its original position as it didn't move
--            // far enough to have it hidden
--            tryCompare(greeter, "x", 0);
--        }
--
--        function test_dragToHide_data() {
--            return [
--                {tag: "left", startX: greeter.width * 0.95, endX: greeter.width * 0.1, hiddenX: -greeter.width},
--                {tag: "right", startX: greeter.width * 0.1, endX: greeter.width * 0.95, hiddenX: greeter.width},
--            ];
--        }
--        function test_dragToHide(data) {
--            compare(greeter.x, 0);
--            compare(greeter.visible, true);
--            compare(greeter.shown, true);
--            compare(greeter.showProgress, 1);
--
--            touchFlick(greeter,
--                    data.startX, greeter.height / 2, // start pos
--                    data.endX, greeter.height / 2); // end pos
--
--            tryCompare(greeter, "x", data.hiddenX);
--            tryCompare(greeter, "visible", false);
--            tryCompare(greeter, "shown", false);
--            tryCompare(greeter, "showProgress", 0);
--        }
--
--        function test_hiddenGreeterRemainsHiddenAfterResize_data() {
--            return [
--                {tag: "left", startX: greeter.width * 0.95, endX: greeter.width * 0.1},
--                {tag: "right", startX: greeter.width * 0.1, endX: greeter.width * 0.95},
--            ];
--        }
--        function test_hiddenGreeterRemainsHiddenAfterResize(data) {
--            touchFlick(greeter,
--                    data.startX, greeter.height / 2, // start pos
--                    data.endX, greeter.height / 2); // end pos
--
--            tryCompare(greeter, "x", data.tag == "left" ? -greeter.width : greeter.width);
--            tryCompare(greeter, "visible", false);
--            tryCompare(greeter, "shown", false);
--            tryCompare(greeter, "showProgress", 0);
--
--            // flip dimensions to simulate an orientation change
--            greeter.width = greeterLoader.height;
--            greeter.height = greeterLoader.width;
--
--            // All properties should remain consistent
--            tryCompare(greeter, "x", data.tag == "left" ? -greeter.width : greeter.width);
--            tryCompare(greeter, "visible", false);
--            tryCompare(greeter, "shown", false);
--            tryCompare(greeter, "showProgress", 0);
--        }
--    }
--}
 === added file 'tests/qmltests/Greeter/tst_WideView.qml'
 --- tests/qmltests/Greeter/tst_WideView.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Greeter/tst_WideView.qml	2015-02-23 15:44:00 +0000
@@ -0,0 +1,519 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import QtTest 1.0
++import ".."
++import "../../../qml/Greeter"
++import LightDM 0.1 as LightDM
++import Ubuntu.Components 0.1
++import Unity.Test 0.1 as UT
++
++Item {
++    id: root
++    width: units.gu(120)
++    height: units.gu(80)
++
++    Binding {
++        target: LightDM.Users
++        property: "mockMode"
++        value: "full"
++    }
++
++    Row {
++        anchors.fill: parent
++        Loader {
++            id: loader
++            width: root.width - controls.width
++            height: parent.height
++
++            property bool itemDestroyed: false
++            sourceComponent: Component {
++                WideView {
++                    id: view
++
++                    background: Qt.resolvedUrl("../../../qml/graphics/tablet_background.jpg")
++                    userModel: LightDM.Users
++                    infographicModel: LightDM.Infographic
++
++                    launcherOffset: parseFloat(launcherOffsetField.text)
++                    currentIndex: parseInt(currentIndexField.text, 10)
++                    delayMinutes: parseInt(delayMinutesField.text, 10)
++                    backgroundTopMargin: parseFloat(backgroundTopMarginField.text)
++                    locked: lockedCheckBox.checked
++                    inputMethod: fakeInputMethod
++
++                    Component.onDestruction: {
++                        loader.itemDestroyed = true
++                    }
++
++                    onSelected: {
++                        currentIndexField.text = index;
++                    }
++
++                    QtObject {
++                        id: fakeInputMethod
++                        property bool visible: fakeKeyboard.visible
++                        property var keyboardRectangle: QtObject {
++                            property real x: fakeKeyboard.x
++                            property real y: fakeKeyboard.y
++                            property real width: fakeKeyboard.width
++                            property real height: fakeKeyboard.height
++                        }
++                    }
++
++                    Rectangle {
++                        id: fakeKeyboard
++                        color: "green"
++                        opacity: 0.7
++                        anchors.bottom: view.bottom
++                        width: view.width
++                        height: view.height * 0.6
++                        visible: keyboardVisibleCheckBox.checked
++                        Text {
++                            text: "Keyboard Rectangle"
++                            color: "yellow"
++                            font.bold: true
++                            fontSizeMode: Text.Fit
++                            minimumPixelSize: 10; font.pixelSize: 200
++                            verticalAlignment: Text.AlignVCenter
++                            x: (parent.width - width) / 2
++                            y: (parent.height - height) / 2
++                            width: parent.width
++                            height: parent.height
++                        }
++                    }
++
++                }
++            }
++        }
++
++        Rectangle {
++            id: controls
++            color: "white"
++            width: units.gu(40)
++            height: parent.height
++
++            Column {
++                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
++                spacing: units.gu(1)
++
++                Row {
++                    Button {
++                        text: "Show Last Chance"
++                        onClicked: loader.item.showLastChance()
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Hide"
++                        onClicked: loader.item.hide()
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Reset"
++                        onClicked: loader.item.reset()
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Show Message"
++                        onClicked: loader.item.showMessage(messageField.text)
++                    }
++                    TextField {
++                        id: messageField
++                        width: units.gu(10)
++                        text: ""
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Show Prompt"
++                        onClicked: loader.item.showPrompt(promptField.text, isSecretCheckBox.checked, isDefaultPromptCheckBox.checked)
++                    }
++                    TextField {
++                        id: promptField
++                        width: units.gu(10)
++                        text: ""
++                    }
++                    CheckBox {
++                        id: isSecretCheckBox
++                    }
++                    Label {
++                        text: "secret"
++                    }
++                    CheckBox {
++                        id: isDefaultPromptCheckBox
++                    }
++                    Label {
++                        text: "default"
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Authenticated"
++                        onClicked: {
++                            if (successCheckBox.checked) {
++                                loader.item.notifyAuthenticationSucceeded();
++                            } else {
++                                loader.item.notifyAuthenticationFailed();
++                            }
++                        }
++                    }
++                    CheckBox {
++                        id: successCheckBox
++                    }
++                    Label {
++                        text: "success"
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Try To Unlock"
++                        onClicked: loader.item.tryToUnlock(toTheRightCheckBox.checked)
++                    }
++                    CheckBox {
++                        id: toTheRightCheckBox
++                    }
++                    Label {
++                        text: "toTheRight"
++                    }
++                }
++                Row {
++                    TextField {
++                        id: launcherOffsetField
++                        width: units.gu(10)
++                        text: "0"
++                    }
++                    Label {
++                        text: "launcherOffset"
++                    }
++                }
++                Row {
++                    TextField {
++                        id: currentIndexField
++                        width: units.gu(10)
++                        text: "0"
++                    }
++                    Label {
++                        text: "currentIndex"
++                    }
++                }
++                Row {
++                    TextField {
++                        id: delayMinutesField
++                        width: units.gu(10)
++                        text: "0"
++                    }
++                    Label {
++                        text: "delayMinutes"
++                    }
++                }
++                Row {
++                    TextField {
++                        id: backgroundTopMarginField
++                        width: units.gu(10)
++                        text: "0"
++                    }
++                    Label {
++                        text: "backgroundTopMargin"
++                    }
++                }
++                Row {
++                    CheckBox {
++                        id: lockedCheckBox
++                    }
++                    Label {
++                        text: "locked"
++                    }
++                }
++                Row {
++                    Label {
++                        text: "selected: " + selectedSpy.count
++                    }
++                }
++                Row {
++                    Label {
++                        text: "responded: " + respondedSpy.count
++                    }
++                }
++                Row {
++                    Label {
++                        text: "teased: " + teaseSpy.count
++                    }
++                }
++                Row {
++                    Label {
++                        text: "emergency: " + emergencySpy.count
++                    }
++                }
++                Row {
++                    Button {
++                        text: "Reload View"
++                        onClicked: {
++                            loader.active = false;
++                            loader.active = true;
++                        }
++                    }
++                }
++                Row {
++                    CheckBox {
++                        id: keyboardVisibleCheckBox
++                    }
++                    Label {
++                        text: "Keyboard Visible"
++                    }
++                }
++            }
++        }
++    }
++
++    SignalSpy {
++        id: selectedSpy
++        target: loader.item
++        signalName: "selected"
++    }
++
++    SignalSpy {
++        id: respondedSpy
++        target: loader.item
++        signalName: "responded"
++    }
++
++    SignalSpy {
++        id: teaseSpy
++        target: loader.item
++        signalName: "tease"
++    }
++
++    SignalSpy {
++        id: emergencySpy
++        target: loader.item
++        signalName: "emergencyCall"
++    }
++
++    UT.UnityTestCase {
++        name: "WideView"
++        when: windowShown
++
++        property Item view: loader.status === Loader.Ready ? loader.item : null
++
++        function init() {
++            view.currentIndex = 0; // break binding with text field
++            selectedSpy.clear();
++            respondedSpy.clear();
++            teaseSpy.clear();
++            emergencySpy.clear();
++        }
++
++        function cleanup() {
++            keyboardVisibleCheckBox.checked = false;
++
++            loader.itemDestroyed = false;
++            loader.active = false;
++            tryCompare(loader, "status", Loader.Null);
++            tryCompare(loader, "item", null);
++            tryCompare(loader, "itemDestroyed", true);
++            loader.active = true;
++            tryCompare(loader, "status", Loader.Ready);
++            removeTimeConstraintsFromDirectionalDragAreas(loader.item);
++        }
++
++        function getIndexOf(name) {
++            for (var i = 0; i < LightDM.Users.count; i++) {
++                if (name === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
++                    return i;
++                }
++            }
++            fail("Didn't find name")
++            return -1;
++        }
++
++        function selectUser(name) {
++            var i = getIndexOf(name);
++            view.currentIndex = i;
++            return i;
++        }
++
++        function swipeAwayCover() {
++            tryCompare(view, "fullyShown", true);
++            var touchY = view.height / 2;
++            touchFlick(view, view.width, touchY, 0, touchY);
++            var coverPage = findChild(view, "coverPage");
++            tryCompare(coverPage, "showProgress", 0);
++            waitForRendering(view);
++        }
++
++        function test_tease_data() {
++            return [
++                {tag: "locked", x: 0, offset: 0, count: 0, locked: true},
++                {tag: "left", x: 0, offset: 0, count: 1, locked: false},
++                {tag: "leftWithOffsetPass", x: 10, offset: 10, count: 1, locked: false},
++                {tag: "leftWithOffsetFail", x: 9, offset: 10, count: 0, locked: false},
++                {tag: "right", x: view.width, offset: 0, count: 1, locked: false},
++            ]
++        }
++        function test_tease(data) {
++            view.locked = data.locked;
++            view.dragHandleLeftMargin = data.offset;
++            tap(view, data.x, 0);
++            compare(teaseSpy.count, data.count);
++        }
++
++        function test_selected() {
++            var delegate = findChild(view, "username2");
++            tap(delegate);
++            compare(selectedSpy.count, 1);
++            compare(selectedSpy.signalArguments[0][0], 2);
++            compare(view.currentIndex, 0); // confirm we didn't change
++        }
++
++        function test_respondedWithPassword() {
++            view.locked = true;
++            view.showPrompt("Prompt", true, true);
++            var passwordInput = findChild(view, "passwordInput");
++            compare(passwordInput.placeholderText, "Prompt");
++            compare(passwordInput.echoMode, TextInput.Password);
++            tap(passwordInput);
++            typeString("password");
++            keyClick(Qt.Key_Enter);
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "password");
++        }
++
++        function test_respondedWithNonSecret() {
++            view.locked = true;
++            view.showPrompt("otp", false, false);
++            var passwordInput = findChild(view, "passwordInput");
++            compare(passwordInput.placeholderText, "otp");
++            compare(passwordInput.echoMode, TextInput.Normal);
++            tap(passwordInput);
++            typeString("foo");
++            keyClick(Qt.Key_Enter);
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "foo");
++        }
++
++        function test_respondedWithSwipe() {
++            swipeAwayCover();
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "");
++        }
++
++        function test_fullyShown() {
++            tryCompare(view, "fullyShown", true);
++            swipeAwayCover();
++            tryCompare(view, "fullyShown", false);
++        }
++
++        function test_required() {
++            tryCompare(view, "required", true);
++            swipeAwayCover();
++            tryCompare(view, "required", false);
++        }
++
++        function test_showMessage() {
++            view.showMessage("Welcome to Unity Greeter");
++            view.showMessage("<font color=\"#df382c\">This is an error</font>");
++            view.showMessage("You should have seen three messages and this is a really long message too. wow so long much length");
++            var infoLabel = findChild(view, "infoLabel");
++            compare(infoLabel.text, "Welcome to Unity Greeter<br><font color=\"#df382c\">This is an error</font><br>You should have seen three messages and this is a really long message too. wow so long much length");
++            compare(infoLabel.textFormat, Text.StyledText);
++            compare(infoLabel.clip, true);
++            verify(infoLabel.contentWidth > infoLabel.width);
++            verify(infoLabel.opacity < 1);
++            tryCompare(infoLabel, "opacity", 1);
++        }
++
++        // Escape is used to reset the authentication, especially if PAM is unresponsive
++        function test_escape() {
++            view.currentIndex = 1;
++            view.locked = true;
++            view.showPrompt("Prompt", true, true);
++            var passwordInput = findChild(view, "passwordInput");
++            tap(passwordInput);
++            compare(passwordInput.focus, true);
++            compare(passwordInput.enabled, true);
++
++            typeString("password");
++            keyClick(Qt.Key_Enter);
++            compare(passwordInput.focus, false);
++            compare(passwordInput.enabled, false);
++
++            compare(selectedSpy.count, 0);
++            keyClick(Qt.Key_Escape);
++            compare(selectedSpy.count, 1);
++            compare(selectedSpy.signalArguments[0][0], 1);
++
++            view.reset();
++            compare(passwordInput.focus, false);
++            compare(passwordInput.enabled, true);
++        }
++
++        function test_unicode() {
++            var index = selectUser("unicode");
++            var label = findChild(view, "username" + index);
++            tryCompare(label, "text", "가나다라마");
++        }
++
++        function test_longName() {
++            var index = selectUser("long-name");
++            var label = findChild(view, "username" + index);
++            tryCompare(label, "truncated", true);
++        }
++
++        function test_promptless() {
++            var passwordInput = findChild(view, "passwordInput");
++
++            view.locked = true;
++            compare(passwordInput.placeholderText, "Retry");
++            tap(passwordInput);
++            compare(respondedSpy.count, 0);
++            compare(selectedSpy.count, 1);
++            compare(selectedSpy.signalArguments[0][0], 0);
++            selectedSpy.clear();
++
++            view.locked = false;
++            compare(passwordInput.placeholderText, "Tap to unlock");
++            tap(passwordInput);
++            compare(selectedSpy.count, 0);
++            compare(respondedSpy.count, 1);
++            compare(respondedSpy.signalArguments[0][0], "");
++        }
++
++        function test_loginListNotCoveredByKeyboard() {
++            var loginList = findChild(view, "loginList");
++            compare(loginList.height, view.height);
++
++            // when the vkb shows up, loginList is moved up to remain fully uncovered
++
++            keyboardVisibleCheckBox.checked = true;
++
++            tryCompare(loginList, "height", view.height - view.inputMethod.keyboardRectangle.height);
++            tryCompareFunction( function() {
++                var loginListRect = loginList.mapToItem(view, 0, 0, loginList.width, loginList.height);
++                return loginListRect.y + loginListRect.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);
++        }
++    }
++}
 === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
 --- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-02-05 20:20:28 +0000
 +++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-02-23 15:44:00 +0000
@@ -112,9 +112,9 @@
          function init() {
              tryCompare(shell, "enabled", true); // enabled by greeter when ready
--            swipeAwayGreeter();
              AccountsService.demoEdges = false;
              AccountsService.demoEdges = true;
++            swipeAwayGreeter();
+         }
          function cleanup() {
@@ -151,13 +151,14 @@
+         }
          function swipeAwayGreeter() {
--            var greeter = findChild(shell, "greeter");
--            tryCompare(greeter, "showProgress", 1);
++            var coverPage = findChild(shell, "coverPage");
++            tryCompare(coverPage, "showProgress", 1);
              touchFlick(shell, halfWidth, halfHeight, shell.width, halfHeight);
              // wait until the animation has finished
--            tryCompare(greeter, "showProgress", 0);
++            var greeter = findChild(shell, "greeter");
++            tryCompare(greeter, "required", false);
              waitForRendering(greeter);
+         }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-02-11 17:12:49 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-02-23 15:44:00 +0000
@@ -19,9 +19,11 @@
  import QtQuick 2.0
  import QtTest 1.0
++import AccountsService 0.1
  import GSettings 1.0
  import LightDM 0.1 as LightDM
  import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 1.0 as ListItem
  import Ubuntu.Telephony 0.1 as Telephony
  import Unity.Application 0.1
  import Unity.Connectivity 0.1
@@ -80,7 +82,7 @@
+         }
          Rectangle {
--            color: "white"
++            color: "darkgrey"
              width: units.gu(30)
              height: shellLoader.height
@@ -98,11 +100,23 @@
                              var greeter = testCase.findChild(shellLoader.item, "greeter");
                              if (!greeter.shown) {
--                                greeter.show();
++                                LightDM.Greeter.showGreeter();
+                             }
+                         }
+                     }
+                 }
++                ListItem.ItemSelector {
++                    anchors { left: parent.left; right: parent.right }
++                    activeFocusOnPress: false
++                    text: "LightDM mock mode"
++                    model: ["single", "single-passphrase", "single-pin"]
++                    onSelectedIndexChanged: {
++                        shellLoader.active = false;
++                        LightDM.Greeter.mockMode = model[selectedIndex];
++                        LightDM.Users.mockMode = model[selectedIndex];
++                        shellLoader.active = true;
++                    }
++                }
+             }
+         }
+     }
@@ -284,11 +298,13 @@
          function test_leftEdgeDrag_data() {
              return [
--                {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true},
--                {tag: "with launcher", revealLauncher: true, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true},
--                {tag: "small swipe", revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app", launcherHides: false},
--                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true},
--                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "unity8-dash", launcherHides: false}
++                {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
++                {tag: "with launcher", revealLauncher: true, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
++                {tag: "small swipe", revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app", launcherHides: false, greeterShown: false},
++                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
++                {tag: "small swipe with greeter", revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app", launcherHides: false, greeterShown: true},
++                {tag: "long swipe with greeter", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: true},
++                {tag: "swipe over dash", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "unity8-dash", launcherHides: false, greeterShown: false},
              ];
+         }
@@ -299,6 +315,12 @@
              ApplicationManager.focusApplication(data.focusedApp)
              waitUntilApplicationWindowIsFullyVisible();
++            var greeter = findChild(shell, "greeter");
++            if (data.greeterShown) {
++                LightDM.Greeter.showGreeter();
++                tryCompare(greeter, "fullyShown", true);
++            }
++
              if (data.revealLauncher) {
                  dragLauncherIntoView();
+             }
@@ -306,8 +328,10 @@
              swipeFromLeftEdge(data.swipeLength);
              if (data.appHides) {
                  waitUntilDashIsFocused();
++                tryCompare(greeter, "shown", false);
              } else {
                  waitUntilApplicationWindowIsFullyVisible();
++                compare(greeter.fullyShown, data.greeterShown);
+             }
              var launcher = findChild(shell, "launcherPanel");
@@ -335,20 +359,20 @@
              // Suspend while call is active...
              callManager.foregroundCall = phoneCall;
              Powerd.status = Powerd.Off;
--            tryCompare(greeter, "showProgress", 0);
++            tryCompare(greeter, "shown", false);
              // Now try again after ending call
              callManager.foregroundCall = null;
              Powerd.status = Powerd.On;
              Powerd.status = Powerd.Off;
--            tryCompare(greeter, "showProgress", 1);
++            tryCompare(greeter, "fullyShown", true);
              tryCompare(ApplicationManager, "suspended", true);
              compare(mainApp.state, ApplicationInfoInterface.Suspended);
              // And wake up
              Powerd.status = Powerd.On;
--            tryCompare(greeter, "showProgress", 1);
++            tryCompare(greeter, "fullyShown", true);
              // Swipe away greeter to focus app
              swipeAwayGreeter();
@@ -359,14 +383,14 @@
          function swipeAwayGreeter() {
              var greeter = findChild(shell, "greeter");
--            tryCompare(greeter, "showProgress", 1);
++            tryCompare(greeter, "fullyShown", true);
              var touchX = shell.width - (shell.edgeSize / 2);
              var touchY = shell.height / 2;
              touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
              // wait until the animation has finished
--            tryCompare(greeter, "showProgress", 0);
++            tryCompare(greeter, "shown", false);
              waitForRendering(greeter);
+         }
@@ -608,12 +632,12 @@
              waitUntilDashIsFocused();
--            greeter.show();
--            tryCompare(greeter, "showProgress", 1);
++            LightDM.Greeter.showGreeter();
++            tryCompare(greeter, "fullyShown", true);
              // The main point of this test
              ApplicationManager.requestFocusApplication("dialer-app");
--            tryCompare(greeter, "showProgress", 0);
++            tryCompare(greeter, "shown", false);
              waitForRendering(greeter);