Unity 8

Merge lp:~mterry/unity8/split into lp:unity8

split
Merge into trunk

Proposed by Michael Terry on 2014-03-12

Status:	Superseded
Proposed branch:	lp:~mterry/unity8/split
Merge into:	lp:unity8
Diff against target:	4772 lines (+2210/-905) 91 files modified CMakeLists.txt (+1/-0) data/51-unity8-greeter.conf (+2/-0) data/CMakeLists.txt (+13/-0) data/unity8-greeter-init.conf (+9/-0) data/unity8-greeter-ofono.conf (+22/-0) data/unity8-greeter-wrapper (+67/-0) data/unity8-greeter.desktop.in (+5/-0) debian/changelog (+6/-0) debian/control (+16/-0) debian/copyright (+1/-1) debian/rules (+0/-4) debian/unity8-greeter.install (+6/-0) debian/unity8-private.install (+1/-0) debian/unity8.install (+0/-1) plugins/AccountsService/AccountsService.cpp (+34/-11) plugins/AccountsService/AccountsService.h (+9/-0) plugins/CMakeLists.txt (+1/-0) plugins/LightDM/CMakeLists.txt (+6/-9) plugins/LightDM/URLDispatcher.cpp (+55/-0) plugins/LightDM/URLDispatcher.h (+34/-0) plugins/LightDM/plugin.cpp (+9/-0) plugins/SessionBroadcast/SessionBroadcast.cpp (+30/-0) plugins/SessionBroadcast/SessionBroadcast.h (+10/-0) plugins/SessionManager/CMakeLists.txt (+27/-0) plugins/SessionManager/SessionManager.cpp (+107/-0) plugins/SessionManager/SessionManager.h (+60/-0) plugins/SessionManager/plugin.cpp (+35/-0) plugins/SessionManager/plugin.h (+35/-0) plugins/SessionManager/qmldir (+2/-0) qml/Components/BasicShell.qml (+84/-0) qml/Components/EdgeDemo.qml (+1/-53) qml/Components/Lockscreen.qml (+0/-19) qml/Components/PageHeader.qml (+3/-2) qml/Dash/ScopeListView.qml (+3/-2) qml/Greeter/Clock.qml (+1/-1) qml/Greeter/Greeter.qml (+147/-53) qml/Greeter/GreeterContent.qml (+51/-54) qml/Greeter/GreeterEdgeDemo.qml (+102/-0) qml/Greeter/Infographics.qml (+3/-2) qml/GreeterShell.qml (+285/-0) qml/Hud/Hud.qml (+2/-5) qml/Notifications/NotificationMenuItemFactory.qml (+0/-1) qml/Panel/Panel.qml (+1/-1) qml/Shell.qml (+38/-195) run (+6/-4) src/CMakeLists.txt (+15/-3) src/main.cpp (+16/-4) tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py (+3/-7) tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py (+0/-1) tests/autopilot/unity8/indicators/tests/test_indicators.py (+0/-2) tests/autopilot/unity8/process_helpers.py (+0/-57) tests/autopilot/unity8/shell/tests/__init__.py (+16/-4) tests/autopilot/unity8/shell/tests/disabled_test_hud.py (+1/-7) tests/autopilot/unity8/shell/tests/test_emulators.py (+0/-1) tests/autopilot/unity8/shell/tests/test_lock_screen.py (+12/-13) tests/autopilot/unity8/shell/tests/test_notifications.py (+0/-11) tests/mocks/AccountsService/AccountsService.cpp (+9/-0) tests/mocks/AccountsService/AccountsService.h (+7/-0) tests/mocks/CMakeLists.txt (+2/-1) tests/mocks/LightDM/demo/CMakeLists.txt (+0/-21) tests/mocks/LightDM/demo/GreeterPrivate.cpp (+0/-70) tests/mocks/LightDM/demo/UsersModelPrivate.cpp (+0/-41) tests/mocks/LightDM/qmldir (+0/-2) tests/mocks/SessionManager/CMakeLists.txt (+19/-0) tests/mocks/SessionManager/SessionManager.cpp (+43/-0) tests/mocks/SessionManager/SessionManager.h (+49/-0) tests/mocks/SessionManager/plugin.cpp (+34/-0) tests/mocks/SessionManager/plugin.h (+34/-0) tests/mocks/SessionManager/qmldir (+2/-0) tests/mocks/liblightdm/CMakeLists.txt (+0/-53) tests/mocks/liblightdm/full/CMakeLists.txt (+3/-2) tests/mocks/liblightdm/single-passphrase/CMakeLists.txt (+3/-2) tests/mocks/liblightdm/single-pin/CMakeLists.txt (+3/-2) tests/mocks/liblightdm/single/CMakeLists.txt (+3/-2) tests/plugins/CMakeLists.txt (+2/-1) tests/plugins/LightDM/CMakeLists.txt (+5/-4) tests/plugins/SessionManager/CMakeLists.txt (+48/-0) tests/plugins/SessionManager/LightDMSessionServer.cpp (+38/-0) tests/plugins/SessionManager/LightDMSessionServer.h (+40/-0) tests/plugins/SessionManager/LoginManagerServer.cpp (+34/-0) tests/plugins/SessionManager/LoginManagerServer.h (+37/-0) tests/plugins/SessionManager/LoginSessionServer.cpp (+25/-0) tests/plugins/SessionManager/LoginSessionServer.h (+39/-0) tests/plugins/SessionManager/client.cpp (+88/-0) tests/plugins/SessionManager/interfaces.xml (+22/-0) tests/plugins/SessionManager/server.cpp (+57/-0) tests/qmltests/CMakeLists.txt (+36/-48) tests/qmltests/Greeter/tst_Phone.qml (+11/-67) tests/qmltests/Greeter/tst_Tablet.qml (+36/-8) tests/qmltests/tst_GreeterShell.qml (+79/-0) tests/qmltests/tst_Shell.qml (+9/-53)
To merge this branch:	bzr merge lp:~mterry/unity8/split
Related bugs:	Link a bug report
Related blueprints:	Make Fake Phablet Greeter a Real One (Undefined) Unity8 greeter and associated components/activities, 14.10 tasks. (Undefined)

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-03-27
Albert Astals Cid (community)		2014-03-12	Needs Fixing on 2014-03-25
Review via email: mp+210664@code.launchpad.net

This proposal has been superseded by a proposal from 2014-03-27.

Commit message

Split the welcome screen into its own executable and allow it to be a proper LightDM greeter.

Description of the change

Split the welcome screen into its own executable and allow it to be a proper LightDM greeter.

Phew! Long time coming. First commit to this branch back in July 2013! It's just taken whipping the rest of the system into shape to avoid regressions to make this landable.

List of major changes and notes:
- Adds new executable (unity8-greeter) that gets its own package. This uses the same main.cpp as unity8, but with different Qml and a few #ifdef tweaks.
- Adds a new plugin SessionManager so that bits of code can still know if the session is active. Since rather integral code (PageHeader.qml) uses the plugin, I added the plugin directory to the default qmluitests list of includes. This cleaned up that CMakeLists.txt file considerably.
- Expands existing plugin SessionBroadcast to actually make requests of unity-greeter-session-broadcast (i.e. use the greeter-side of its API). This involves adding a Depends on that program.
- I had to split the current edge demo support in two (part of it is in greeter, part of it is in user session).
- Similarly, I split Shell.qml into three files: Shell.qml, GreeterShell.qml, and Components/BasicShell.qml (for shared code).
- We no longer use demo data for the greeter in production (still do in tests of course).
- I added a new -G option to ./run to get the greeter.
- And the expected new tests and test changes.

== Known Regressions ==
- The messaging menu will not show contact info in the greeter. You will see numbers, but not avatar/name. Design never really finished fleshing out the indicator experience in the greeter. Wanted to see it land first, I've heard. Ted knows more about state there.
- When turning off the display, if you turn it back on within a few seconds, you just see a spinner animation. This is expected. It's waiting for the greeter to come up again. I believe we can get it to come up faster in future, and/or come up with a clever way to let you cancel a lock request (but that might require lightdm changes and be a post-14.04 change).

== Checklist ==
* Are there any related MPs required for this MP to build/function as expected? Please list.
- (Note none of these are needed to build or play around with split -- they all just enhance the experience / fix bugs)
- lp:~mterry/session-manager-touch/split
- lp:~unity-team/unity-system-compositor/new-gl-screen
- lp:~mterry/unity-system-compositor/switch-after-buffers
- lp:~mterry/gsettings-ubuntu-touch-schemas/volume
- Mir 0.1.18

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

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
- There are packaging changes, but I'm in that team.

* If you changed the UI, has there been a design review?
- The only UI changes in this set of branches are boot animation oriented. This branch fades in greeter elements and lp:~mterry/session-manager-touch/split enables a boot/interstitial animation. Design review is coming.

lp:~mterry/unity8/split updated on 2014-03-12

197. By Michael Terry on 2014-03-12: Drop unused code

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-12:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-13

198. By Michael Terry on 2014-03-13: Move hideIndicatorMenu to be shared between greeter and shell, as both have indicators that want to call it
199. By Michael Terry on 2014-03-13: Start maliit-server in greeter

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-13:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-13

200. By Michael Terry on 2014-03-13: clear greeter mir socket on greeter start

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-13:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-17:

Doesn't merge cleanly with trunk

review: Needs Fixing

lp:~mterry/unity8/split updated on 2014-03-17

201. By Michael Terry on 2014-03-16: Merge from trunk
202. By Michael Terry on 2014-03-17: Merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-18

203. By Michael Terry on 2014-03-18: Move OSKController to end of shell files, so that input is grabbed appropriately

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-19:

Shouldn't you use m_user instead of qgetenv("USER") ?

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-19:

I suggest to use QProcess::startDetached in Upstart.cpp so that we don't need to keep the QProcess around in memory forever. Also i guess it would make sense to check that we can start it properly and fail gracefully if not?

lp:~mterry/unity8/split updated on 2014-03-19

204. By Michael Terry on 2014-03-19: Move upstart launching to wrapper script

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-19:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-19

205. By Michael Terry on 2014-03-19: Adjust to new UGSB api

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-19:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-03-19:

Albert, I moved the /sbin/init call to unity8-greeter-wrapper. This way it will be easier once we add a wizard (which will likely be launched from the wrapper and want /sbin/init too). So that's another way of fixing the use of QProcess I guess. :)

Regarding qgetenv("USER") vs m_user. m_user is the currently selected user. qgetenv("USER") is obviously the user for the session. We use the latter in "ForCurrentUser" methods which are called for the lightdm user (rather than the selected user). Like noting that the greeter edge demo has been run (vs the edge demo for a user).

lp:~mterry/unity8/split updated on 2014-03-20

206. By Michael Terry on 2014-03-20: Merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-20:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-24

207. By Michael Terry on 2014-03-24: Set language for greeter environment if user has set one

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-25

208. By Michael Terry on 2014-03-25: Merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

Should unity8-greeter package declare it's dependency in libglib2.0-bin since the greeter-wrapper script ends up in that package and is using the gdbus command?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

In AccountsService constructor you have
m_user(qgetenv("USER")),
and then
setUser(qgetenv("USER"));

I guess you can remove the first one and save a getenv call?

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

In AccountsService constructor you have
    setUser(qgetenv("USER"));
    updateDemoEdgesForCurrentUser();
couldn't you use
    updateDemoEdges();
and save a getenv call?

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

You don't emit the changed signal from setDemoEdgesForCurrentUser neither from setDemoEdges

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

Can you explain why we need demoEdgesForCurrentUser() and demoEdges() to be separate?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

Remove
+#include <QProcess>
+#include <unistd.h>
from URLDispatcher.cpp

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

Replace
+#include <QtQml>
by
+#include <QtQml/qqml.h>

No need to include 30 files without need :)

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

Do you really need m_parent in URLDispatcherInterface ? I mean you're forcing the URLDispatcherInterface constructor to get a URLDispatcher *parent parameter that you pass down to QObject so we could just save the m_parent pointer and in ::DispatchURL just do static_cast<URLDispatcher *>(parent()), no?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

I'd remove the m_broadcaster(NULL) myself since you're initializing it like 3 lines below, but if you really want to initialize it at least use nullptr

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

With this we don't get the greeter anymore when doing ./run i guess that's ok?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

./run -G on my desktop gives me a phone shaped UI but shows me users unlike trunk does, is this on purpose?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

Remove tests/autopilot/unity8/shell/tests/test_greeter.py.THIS

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

Why all those changes in tests/qmltests/CMakeLists.txt ?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

No test replacement for test_searchIndicatorHidesOnGreeterShown ?

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25:

After installing all the resulting packages of this branch and restarting the phone the greeter does not show up on reboot.

review: Needs Fixing

lp:~mterry/unity8/split updated on 2014-03-25

209. By Michael Terry on 2014-03-25: Add back accidentally remove input filter area
210. By Michael Terry on 2014-03-25: Fade in different components as design wants
211. By Michael Terry on 2014-03-25: Fix some review nits

Revision history for this message

Michael Terry (mterry) wrote on 2014-03-25:

- Made unity8-greeter Depend on libglib2.0-bin
- Dropped extra qgetenv call in AccountsService constructor
- Removed extra headers from URLDispatcher.cpp
- Switched to <QtQml/qqml.h>
- Dropped m_parent from URLDispatcherInterface
- Dropped m_broadcaster(NULL)
- Removed tests/autopilot/unity8/shell/tests/test_greeter.py.THIS

- Yeah, it's expected that ./run no longer gives greeter. And if you want to use mocks with -G, you need to also pass -f, like ./run -fG

- So the deal with demoEdgesForCurrentUser and demoEdges. The AccountsService plugin as a whole points at a single user for its various values (statsWelcomeScreen, backgroundFile, etc). When in the session, we want that to be the current user ($USER). In the greeter, that will be whomever is selected in the greeter (think multi-user case). So that's why m_user defaults to $USER but is changeable. But consider the case of the edge demo. There is a greeter component to that and a user session component. The greeter decides to show its edge demo based on the lightdm user's field. But if the user skips the demo from the greeter, the greeter needs to set the user's edge demo field to false too, so the user doesn't see it once they log in. So I added a special member variable demoEdgesForCurrentUser that always tracks the current user that the greeter could use for its own demo decision and it could continue using demoEdges to set the user's demo field to false if it wanted to. That's why they are completely separate fields.

- tests/qmltests/CMakeLists.txt has all those changes because of the change in qml/Components/PageHeader.qml. It needed to start using the SessionManager plugin (to reset search when screen is locked). So any test using it needed to start using the mock plugin search path. And looking through the tests, almost every test either already had the binary plugin dir manually specified or would need it because of this change. So I added it to the default includes for tests. And that let me clean up nearly all the test calls to not need manually specified paths.

- test_searchIndicatorHidesOnGreeterShown has no replacement because it doesn't make sense anymore. In greeter, the search indicator is never shown. And in the session, when the session is locked, it doesn't care about hiding the search indicator since it doesn't share a panel with the greeter anymore.

- I'm not sure why nothing showed up for you on reboot. Except maybe you didn't rebuild the various packages depending on Mir 0.1.18 (platform-api, unity-mir)? It might be easiest to use the PPA we're using for testing: https://launchpad.net/~ci-train-ppa-service/+archive/landing-004

- Yeah, it's expected that ./run no longer gives greeter.  And if you want to use mocks with -G, you need to also pass -f, like ./run -fG

- So the deal with demoEdgesForCurrentUser and demoEdges.  The AccountsService plugin as a whole points at a single user for its various values (statsWelcomeScreen, backgroundFile, etc).  When in the session, we want that to be the current user ($USER).  In the greeter, that will be whomever is selected in the greeter (think multi-user case).  So that's why m_user defaults to $USER but is changeable.  But consider the case of the edge demo.  There is a greeter component to that and a user session component.  The greeter decides to show its edge demo based on the lightdm user's field.  But if the user skips the demo from the greeter, the greeter needs to set the user's edge demo field to false too, so the user doesn't see it once they log in.  So I added a special member variable demoEdgesForCurrentUser that always tracks the current user that the greeter could use for its own demo decision and it could continue using demoEdges to set the user's demo field to false if it wanted to.  That's why they are completely separate fields.

- tests/qmltests/CMakeLists.txt has all those changes because of the change in qml/Components/PageHeader.qml.  It needed to start using the SessionManager plugin (to reset search when screen is locked).  So any test using it needed to start using the mock plugin search path.  And looking through the tests, almost every test either already had the binary plugin dir manually specified or would need it because of this change.  So I added it to the default includes for tests.  And that let me clean up nearly all the test calls to not need manually specified paths.

- test_searchIndicatorHidesOnGreeterShown has no replacement because it doesn't make sense anymore.  In greeter, the search indicator is never shown.  And in the session, when the session is locked, it doesn't care about hiding the search indicator since it doesn't share a panel with the greeter anymore.

- I'm not sure why nothing showed up for you on reboot.  Except maybe you didn't rebuild the various packages depending on Mir 0.1.18 (platform-api, unity-mir)?  It might be easiest to use the PPA we're using for testing: https://launchpad.net/~ci-train-ppa-service/+archive/landing-004

lp:~mterry/unity8/split updated on 2014-03-25

212. By Michael Terry on 2014-03-25: Move lockscreen files to Components so that notifications can use them
213. By Michael Terry on 2014-03-25: Hide lockscreen that might appear behind greeter until greeter finishes fading in
214. By Michael Terry on 2014-03-25: Drop dbus-x11 dep (we use gdbus now) and ubuntu-touch-session dep (it will depend on us, not the other way)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-25

215. By Michael Terry on 2014-03-25: Edge demo fixes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-25

216. By Michael Terry on 2014-03-25: Only use ubuntu-touch-session if available
217. By Michael Terry on 2014-03-25: Workaround accountsservice bug with system user data

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-26

218. By Michael Terry on 2014-03-26: Keep infographic animations same speed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-26:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-26

219. By Michael Terry on 2014-03-26: Depend on dbus-x11 for dbus-launch
220. By Michael Terry on 2014-03-26: Lazily start indicators, and only once unity8 is ready to receive them

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-26:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-27

221. By Michael Terry on 2014-03-27: Handle needing to wait for ofonod on first boot

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-27:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-03-27

222. By Michael Terry on 2014-03-27: Merge in greeter-ux-fixes branch
223. By Michael Terry on 2014-03-27: Merge greeter-ux-fixes again

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-27:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/split updated on 2014-05-29

224. By Michael Terry on 2014-03-31: Merge in greeter-ux-fixes
225. By Michael Terry on 2014-04-02: Merge from greeter-ux-fixes
226. By Michael Terry on 2014-04-08: Merge from greeter-ux-fixes
227. By Michael Terry on 2014-04-09: Move the unity8-greeter-started upstart event into src/main.cpp where maliit will be ready to go instead of just crashing
228. By Michael Terry on 2014-04-09: Add unity8-greeter-starting emission so we can start the wizard that way if we want
229. By Michael Terry on 2014-04-10: Merge from greeter-ux-fixes
230. By Michael Terry on 2014-04-14: Merge from trunk
231. By Michael Terry on 2014-04-14: Set language after starting upstart job to let customization do it's thing
232. By Michael Terry on 2014-04-18: Merge from greeter-ux-fixes
233. By Michael Terry on 2014-04-18: Pretend that the greeter session is an ubuntu-touch session, so that indicator-network will start
234. By Michael Terry on 2014-04-23: Test
235. By Michael Terry on 2014-04-23: Fix indicators not coming up in split session
236. By Michael Terry on 2014-04-25: Remove testing code that slipped in
237. By Michael Terry on 2014-04-25: Use new resettable support in lightdm
238. By Michael Terry on 2014-04-30: Merge from trunk
239. By Michael Terry on 2014-05-01: Merge from trunk
240. By Michael Terry on 2014-05-05: Remove fade in animations for now
241. By Michael Terry on 2014-05-05: Merge from trunk
242. By Michael Terry on 2014-05-05: Merge from trunk
243. By Michael Terry on 2014-05-05: Fix debian/changelog
244. By Michael Terry on 2014-05-06: Mark as resettable before connecting to LightDM
245. By Michael Terry on 2014-05-06: Specify minimum version of liblightdm needed
246. By Michael Terry on 2014-05-06: Completely remove fade-in animations for now; this removes the last visual change in the split greeter
247. By Michael Terry on 2014-05-07: Fix autopilot tests
248. By Michael Terry on 2014-05-07: Stop the swipe hint animation when greeter is swiped away
249. By Michael Terry on 2014-05-07: Fix syncing of stored launcher items
250. By Michael Terry on 2014-05-08: Disable ofono using pulseaudio
251. By Michael Terry on 2014-05-08: Merge from trunk
252. By Michael Terry on 2014-05-09: Just launch ofono-setup; it's what session does now and ofonod doesn't use its upstart job anymore apparently
253. By Michael Terry on 2014-05-09: Add back darkener-rectangle for infographic use
254. By Michael Terry on 2014-05-09: Consolidate unity8-greeter session upstart scripts
255. By Michael Terry on 2014-05-13: Merge from trunk
256. By Michael Terry on 2014-05-14: Review fixes
257. By Michael Terry on 2014-05-15: Merge from trunk
258. By Michael Terry on 2014-05-15: Drop unneeded QScreen include
259. By Michael Terry on 2014-05-15: Specify USC_SOCKET in lightdm's init session, so anyone that wants to can find USC (like the welcome wizard
260. By Michael Terry on 2014-05-16: Whoops, requestHomeShown support must have gotten lost in a merge
261. By Michael Terry on 2014-05-18: Workaround bug in logind not telling us when a session becomes inactive, and also hide launcher when that happens
262. By Michael Terry on 2014-05-18: Merge from trunk
263. By Michael Terry on 2014-05-18: Remove unneeded Revealer, especially since the Revealer class is dead
264. By Michael Terry on 2014-05-19: Animate away the tablet greeter when clicking Tap to Unlock
265. By Michael Terry on 2014-05-19: Set locale as well as language when starting greeter
266. By Michael Terry on 2014-05-20: Move alpha-setting down so we don't show some extra frames with transparency
267. By Michael Terry on 2014-05-20: Fix background for sim lockscreen
268. By Michael Terry on 2014-05-21: Make launcher available in tablet mode again
269. By Michael Terry on 2014-05-21: Hide indicators as well as launcher when session becomes inactive
270. By Michael Terry on 2014-05-23: Merge from trunk
271. By Michael Terry on 2014-05-23: Fix notification margins
272. By Michael Terry on 2014-05-28: Merge from trunk
273. By Michael Terry on 2014-05-29: Handle short appIds in launcher data
274. By Michael Terry on 2014-05-29: Add method to mock
275. By Michael Terry on 2014-05-29: undo accidental commits
276. By Michael Terry on 2014-05-29: More reliably mark greeter as re-enabled

Unmerged revisions

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2014-01-30 22:32:37 +0000
 +++ CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -96,6 +96,7 @@
  declare_autopilot_test(shell unity8.shell ${CMAKE_SOURCE_DIR}/tests/autopilot/)
  set(SHELL_APP unity8)
++set(GREETER_APP unity8-greeter)
  set(SCOPE_TOOL unity-scope-tool)
  include_directories(
 === added file 'data/51-unity8-greeter.conf'
 --- data/51-unity8-greeter.conf	1970-01-01 00:00:00 +0000
 +++ data/51-unity8-greeter.conf	2014-03-27 20:58:22 +0000
@@ -0,0 +1,2 @@
++[SeatDefaults]
++greeter-session=unity8-greeter
 === modified file 'data/CMakeLists.txt'
 --- data/CMakeLists.txt	2013-12-20 15:37:27 +0000
 +++ data/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -1,8 +1,21 @@
  # generate desktop file
  configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)
++configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)
  configure_file(${SCOPE_TOOL}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_TOOL}.desktop @ONLY)
  # install desktop files
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop ${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_TOOL}.desktop
      DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
+     )
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters
++    )
++install(FILES 51-${GREETER_APP}.conf
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d
++    )
++install(FILES ${GREETER_APP}-wrapper
++    DESTINATION ${CMAKE_INSTALL_BINDIR}
++    )
++install(FILES unity8-greeter-init.conf unity8-greeter-ofono.conf
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
++    )
 === added file 'data/unity8-greeter-init.conf'
 --- data/unity8-greeter-init.conf	1970-01-01 00:00:00 +0000
 +++ data/unity8-greeter-init.conf	2014-03-27 20:58:22 +0000
@@ -0,0 +1,9 @@
++description "Unity 8 Greeter initialization"
++author "Michael Terry <mterry@ubuntu.com>"
++
++start on unity8-greeter-started
++task
++
++script
++    start --no-wait maliit-server || true
++end script
 === added file 'data/unity8-greeter-ofono.conf'
 --- data/unity8-greeter-ofono.conf	1970-01-01 00:00:00 +0000
 +++ data/unity8-greeter-ofono.conf	2014-03-27 20:58:22 +0000
@@ -0,0 +1,22 @@
++description "Unity 8 Greeter ofono start"
++author "Michael Terry <mterry@ubuntu.com>"
++
++start on unity8-greeter-started
++stop on started :sys:ofono
++task
++
++script
++    # Is ofonod ready?
++    if pidof onofod >/dev/null; then
++        stop
++    else
++        # Wait 30 seconds.  If ofono starts earlier, upstart will kill us.
++        # If 30 seconds go by, try starting ofono-setup anyway, but it will
++        # probably fail.
++        sleep 30
++    fi
++end script
++
++post-stop script
++    start --no-wait ofono-setup
++end script
 === added file 'data/unity8-greeter-wrapper'
 --- data/unity8-greeter-wrapper	1970-01-01 00:00:00 +0000
 +++ data/unity8-greeter-wrapper	2014-03-27 20:58:22 +0000
@@ -0,0 +1,67 @@
++#!/bin/sh
++# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-
++#
++# Copyright (C) 2011,2013 Canonical Ltd
++# Author: Michael Terry <michael.terry@canonical.com>
++#
++# 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 of the License.
++#
++# See http://www.gnu.org/copyleft/gpl.html the full text of the license.
++
++# This wrapper merely ensures that init and friends live only as long as this
++# script does.  Otherwise, it's very easy for some processes to not notice that
++# the session died.  We could try to do this in-process, but we want to do this
++# cleanup even if the greeter aborts.
++
++trap cleanup TERM EXIT
++
++cleanup()
++{
++    trap - TERM EXIT
++    # Kill upstart and indicators
++    pkill -u lightdm -x init
++    if [ -n "$CMD_PID" ]; then
++        kill "$CMD_PID"
++    fi
++    exit 0
++}
++
++# Define language here for phone if available.  When phone user switches their
++# language, they expect that to affect the greeter too.  But the user doesn't
++# have permission to switch system language, only their own.  So we notice if
++# the phablet user exists and use their language if so.  TODO: talk to design
++# about whether we should switch language on fly as users are selected (this
++# is very hard to do technically).
++if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then
++    USER_LANG=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)
++    if [ -n "$USER_LANG" ]; then
++        export LANGUAGE="$USER_LANG"
++    fi
++fi
++
++SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
++rm -f $SUB_SOCKET # clear socket in case we were hard shut down
++
++# If touch session script (which sets up grid units and mir variables) is available, use it
++TOUCH_WRAPPER=
++if [ -x /usr/bin/ubuntu-touch-session ]; then
++    TOUCH_WRAPPER=/usr/bin/ubuntu-touch-session
++fi
++
++# Normal unity8 sessions are entirely driven by Upstart.  But greeters
++# are special.  They need access to the file descriptors that lightdm
++# creates for them and don't want to start all the services that a normal
++# session would.  So it's inconvenient to live within an upstart session.
++# But... we still want to use Upstart for some services.  So launch here.
++MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/init --user --startup-event=unity8-greeter-started &
++INIT_PID=$!
++while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
++export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
++
++export MIR_SERVER_FILE=$SUB_SOCKET
++exec $TOUCH_WRAPPER $@ &
++CMD_PID=$!
++wait $CMD_PID
++CMD_PID=
 === added file 'data/unity8-greeter.desktop.in'
 --- data/unity8-greeter.desktop.in	1970-01-01 00:00:00 +0000
 +++ data/unity8-greeter.desktop.in	2014-03-27 20:58:22 +0000
@@ -0,0 +1,5 @@
++[Desktop Entry]
++Type=Application
++Name=Unity 8 Greeter
++Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter
++X-LightDM-Session-Type=mir
 === modified file 'debian/changelog'
 --- debian/changelog	2014-03-24 16:10:24 +0000
 +++ debian/changelog	2014-03-27 20:58:22 +0000
@@ -1,3 +1,9 @@
++unity8 (7.85+14.04.20140306-0ubuntu1) UNRELEASED; urgency=medium
++
++  * Bump version for Breaks due to unity8-greeter
++
++ -- Michael Terry <mterry@ubuntu.com>  Wed, 12 Mar 2014 14:39:45 -0400
++
  unity8 (7.84+14.04.20140324.4-0ubuntu1) trusty; urgency=low
    [ Michal Hruby ]
 === modified file 'debian/control'
 --- debian/control	2014-03-24 11:49:06 +0000
 +++ debian/control	2014-03-27 20:58:22 +0000
@@ -15,6 +15,7 @@
                 libhud-client2-dev,
                 libnih-dbus-dev,
                 libnih-dev,
++               liblightdm-qt5-3-dev,
                 libpulse-dev,
                 libqmenumodel-dev (>= 0.2.7),
                 libunity-api-dev (>= 7.80.4),
@@ -83,6 +84,7 @@
           qtdeclarative5-ubuntu-ui-toolkit-plugin,
           qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
           qtdeclarative5-xmllistmodel-plugin,
++         unity-greeter-session-broadcast,
           unity-launcher-impl-3,
           unity-notifications-impl-2,
           unity8-fake-env | qtubuntu-shell,
@@ -102,6 +104,19 @@
  Description: Unity 8 shell
   The Unity 8 shell is the primary user interface for Ubuntu devices.
++Package: unity8-greeter
++Architecture: any
++Depends: dbus-x11,
++         libglib2.0-bin,
++         lightdm,
++         unity8 (>= ${source:Version}),
++         ${misc:Depends},
++         ${shlibs:Depends},
++Replaces: unity8 (<< 7.85),
++Breaks: unity8 (<< 7.85),
++Description: Ubuntu QML greeter
++ The Ubuntu QML greeter is the primary greeter for Ubuntu devices.
++
  Package: unity8-autopilot
  Architecture: all
  Depends: gir1.2-glib-2.0,
@@ -120,6 +135,7 @@
           ubuntu-ui-toolkit-autopilot,
           unity8 (>= ${source:Version}),
           unity8-fake-env (>= ${source:Version}),
++         unity8-greeter (>= ${source:Version}),
           url-dispatcher-tools,
           ${misc:Depends},
           ${python:Depends},
 === modified file 'debian/copyright'
 --- debian/copyright	2013-06-26 08:16:38 +0000
 +++ debian/copyright	2014-03-27 20:58:22 +0000
@@ -22,7 +22,7 @@
   On Debian systems, the full text of the GNU General Public License
   version 3 can be found in the file /usr/share/common-licenses/GPL-3.
--Files: tests/mocks/LightDM/UsersModel.h tests/mocks/LightDM/Greeter.h
++Files: tests/mocks/liblightdm/UsersModel.h tests/mocks/liblightdm/Greeter.h
  Copyright: 2013 Canonical Ltd.
 -2011 David Edmundson
 -2011 Robert Ancell
 === modified file 'debian/rules'
 --- debian/rules	2014-03-24 11:32:45 +0000
 +++ debian/rules	2014-03-27 20:58:22 +0000
@@ -35,7 +35,3 @@
  # use private lib directories
  override_dh_makeshlibs:
  	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
--
--# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
--override_dh_shlibdeps:
--	dh_shlibdeps -XlibMockLightDM-qml.so
 === added file 'debian/unity8-greeter.install'
 --- debian/unity8-greeter.install	1970-01-01 00:00:00 +0000
 +++ debian/unity8-greeter.install	2014-03-27 20:58:22 +0000
@@ -0,0 +1,6 @@
++usr/bin/unity8-greeter
++usr/bin/unity8-greeter-wrapper
++usr/share/lightdm
++usr/share/unity8/GreeterShell.qml
++usr/share/unity8/Greeter
++usr/share/upstart/sessions/unity8-greeter-*.conf
 === modified file 'debian/unity8-private.install'
 --- debian/unity8-private.install	2013-12-12 16:45:35 +0000
 +++ debian/unity8-private.install	2014-03-27 20:58:22 +0000
@@ -4,6 +4,7 @@
  usr/lib/*/unity8/qml/DashViews
  usr/lib/*/unity8/qml/Powerd
  usr/lib/*/unity8/qml/SessionBroadcast
++usr/lib/*/unity8/qml/SessionManager
  usr/lib/*/unity8/qml/Ubuntu
  usr/lib/*/unity8/qml/Unity
  usr/lib/*/unity8/qml/Utils
 === modified file 'debian/unity8.install'
 --- debian/unity8.install	2014-03-05 12:52:57 +0000
 +++ debian/unity8.install	2014-03-27 20:58:22 +0000
@@ -4,7 +4,6 @@
  usr/share/unity8/Bottombar
  usr/share/unity8/Components
  usr/share/unity8/Dash
--usr/share/unity8/Greeter
  usr/share/unity8/Hud
  usr/share/unity8/Launcher
  usr/share/unity8/Notifications
 === modified file 'plugins/AccountsService/AccountsService.cpp'
 --- plugins/AccountsService/AccountsService.cpp	2013-10-11 13:32:36 +0000
 +++ plugins/AccountsService/AccountsService.cpp	2014-03-27 20:58:22 +0000
@@ -24,7 +24,6 @@
  AccountsService::AccountsService(QObject* parent)
    : QObject(parent),
      m_service(new AccountsServiceDBusAdaptor(this)),
--    m_user(qgetenv("USER")),
      m_demoEdges(false),
      m_statsWelcomeScreen(false)
+ {
@@ -32,6 +31,9 @@
              this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
      connect(m_service, SIGNAL(maybeChanged(const QString &)),
              this, SLOT(maybeChanged(const QString &)));
++
++    setUser(qgetenv("USER"));
++    updateDemoEdgesForCurrentUser();
+ }
  QString AccountsService::user() const
@@ -57,9 +59,22 @@
  void AccountsService::setDemoEdges(bool demoEdges)
+ {
      m_demoEdges = demoEdges;
++    Q_EMIT demoEdgesChanged();
      m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
+ }
++bool AccountsService::demoEdgesForCurrentUser() const
++{
++    return m_demoEdgesForCurrentUser;
++}
++
++void AccountsService::setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser)
++{
++    m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;
++    Q_EMIT demoEdgesForCurrentUserChanged();
++    m_service->setUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges", demoEdgesForCurrentUser);
++}
++
  QString AccountsService::backgroundFile() const
+ {
      return m_backgroundFile;
@@ -79,6 +94,15 @@
+     }
+ }
++void AccountsService::updateDemoEdgesForCurrentUser()
++{
++    auto demoEdgesForCurrentUser = m_service->getUserProperty(qgetenv("USER"), "com.canonical.unity.AccountsService", "demo-edges").toBool();
++    if (m_demoEdgesForCurrentUser != demoEdgesForCurrentUser) {
++        m_demoEdgesForCurrentUser = demoEdgesForCurrentUser;
++        Q_EMIT demoEdgesForCurrentUserChanged();
++    }
++}
++
  void AccountsService::updateBackgroundFile()
+ {
      auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
@@ -99,13 +123,14 @@
  void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
+ {
--    if (m_user != user) {
--        return;
--    }
--
      if (interface == "com.canonical.unity.AccountsService") {
          if (changed.contains("demo-edges")) {
--            updateDemoEdges();
++            if (qgetenv("USER") == user) {
++                updateDemoEdgesForCurrentUser();
++            }
++            if (m_user == user) {
++                updateDemoEdges();
++            }
+         }
      } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
          if (changed.contains("StatsWelcomeScreen")) {
@@ -116,10 +141,8 @@
  void AccountsService::maybeChanged(const QString &user)
+ {
--    if (m_user != user) {
--        return;
++    if (m_user == user) {
++        // Standard properties might have changed
++        updateBackgroundFile();
+     }
--
--    // Standard properties might have changed
--    updateBackgroundFile();
+ }
 === modified file 'plugins/AccountsService/AccountsService.h'
 --- plugins/AccountsService/AccountsService.h	2013-09-24 18:50:56 +0000
 +++ plugins/AccountsService/AccountsService.h	2014-03-27 20:58:22 +0000
@@ -35,6 +35,10 @@
                  READ demoEdges
                  WRITE setDemoEdges
                  NOTIFY demoEdgesChanged)
++    Q_PROPERTY (bool demoEdgesForCurrentUser
++                READ demoEdgesForCurrentUser
++                WRITE setDemoEdgesForCurrentUser
++                NOTIFY demoEdgesForCurrentUserChanged)
      Q_PROPERTY (QString backgroundFile
                  READ backgroundFile
                  NOTIFY backgroundFileChanged)
@@ -49,12 +53,15 @@
      void setUser(const QString &user);
      bool demoEdges() const;
      void setDemoEdges(bool demoEdges);
++    bool demoEdgesForCurrentUser() const;
++    void setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser);
      QString backgroundFile() const;
      bool statsWelcomeScreen() const;
  Q_SIGNALS:
      void userChanged();
      void demoEdgesChanged();
++    void demoEdgesForCurrentUserChanged();
      void backgroundFileChanged();
      void statsWelcomeScreenChanged();
@@ -64,12 +71,14 @@
  private:
      void updateDemoEdges();
++    void updateDemoEdgesForCurrentUser();
      void updateBackgroundFile();
      void updateStatsWelcomeScreen();
      AccountsServiceDBusAdaptor *m_service;
      QString m_user;
      bool m_demoEdges;
++    bool m_demoEdgesForCurrentUser;
      QString m_backgroundFile;
      bool m_statsWelcomeScreen;
  };
 === modified file 'plugins/CMakeLists.txt'
 --- plugins/CMakeLists.txt	2013-12-12 16:45:35 +0000
 +++ plugins/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -4,6 +4,7 @@
  add_subdirectory(DashViews)
  add_subdirectory(Powerd)
  add_subdirectory(SessionBroadcast)
++add_subdirectory(SessionManager)
  add_subdirectory(Ubuntu)
  add_subdirectory(Unity)
  add_subdirectory(Utils)
 === modified file 'plugins/LightDM/CMakeLists.txt'
 --- plugins/LightDM/CMakeLists.txt	2013-12-17 14:56:25 +0000
 +++ plugins/LightDM/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -3,24 +3,23 @@
  # Dependencies
  include(FindPkgConfig)
++pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
  pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
--# TODO: Once we split out a separate greeter process, uncomment these lines
--#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}
      ${CMAKE_SOURCE_DIR}/plugins/Utils
--    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
--    #${LIBLIGHTDM_INCLUDE_DIRS}
++    ${LIBLIGHTDM_INCLUDE_DIRS}
      ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
+ )
  set(QMLPLUGIN_SRC
--    ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
++    ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
      DBusGreeterList.cpp
      Greeter.cpp
      plugin.cpp
++    URLDispatcher.cpp
      UsersModel.cpp
+     )
@@ -29,13 +28,11 @@
+     )
  target_link_libraries(LightDM-qml
--    MockLightDM-demo
--# TODO: Once we split out a separate greeter process, uncomment these lines
--#    ${LIBLIGHTDM_LDFLAGS}
++    ${LIBLIGHTDM_LDFLAGS}
      ${LIBUSERMETRICSOUTPUT_LDFLAGS}
+     )
--qt5_use_modules(LightDM-qml DBus Gui Qml)
++qt5_use_modules(LightDM-qml DBus Qml)
  # export the qmldir qmltypes and plugin files
  export_qmlfiles(LightDM LightDM)
 === added file 'plugins/LightDM/URLDispatcher.cpp'
 --- plugins/LightDM/URLDispatcher.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/URLDispatcher.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,55 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "URLDispatcher.h"
++
++#include <QDBusConnection>
++
++class URLDispatcherInterface : public QObject
++{
++    Q_OBJECT
++    Q_CLASSINFO("D-Bus Interface", "com.canonical.URLDispatcher")
++
++public:
++    explicit URLDispatcherInterface(URLDispatcher *parent);
++
++    Q_SCRIPTABLE void DispatchURL(const QString &url);
++};
++
++URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)
++  : QObject(parent)
++{
++}
++
++void URLDispatcherInterface::DispatchURL(const QString &url)
++{
++    Q_EMIT static_cast<URLDispatcher *>(parent())->dispatchURL(url);
++}
++
++URLDispatcher::URLDispatcher(QObject *parent)
++  : QObject(parent)
++{
++    // This class also manages our url-dispatcher interception.  We intercept
++    // url-dispatcher because rather than spawning the handler for the URL in
++    // our own session, we want to do notify the user session to do it for us
++    // (and start an unlock in the process).
++    QDBusConnection connection = QDBusConnection::sessionBus();
++    URLDispatcherInterface *dispatcher = new URLDispatcherInterface(this);
++    connection.registerObject("/com/canonical/URLDispatcher", dispatcher, QDBusConnection::ExportScriptableContents);
++    connection.registerService("com.canonical.URLDispatcher");
++}
++
++#include "URLDispatcher.moc"
 === added file 'plugins/LightDM/URLDispatcher.h'
 --- plugins/LightDM/URLDispatcher.h	1970-01-01 00:00:00 +0000
 +++ plugins/LightDM/URLDispatcher.h	2014-03-27 20:58:22 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef UNITY_URLDISPATCHER_H
++#define UNITY_URLDISPATCHER_H
++
++#include <QObject>
++#include <QString>
++
++class URLDispatcher : public QObject
++{
++    Q_OBJECT
++
++public:
++    explicit URLDispatcher(QObject *parent=0);
++
++Q_SIGNALS:
++    void dispatchURL(const QString &url);
++};
++
++#endif
 === modified file 'plugins/LightDM/plugin.cpp'
 --- plugins/LightDM/plugin.cpp	2013-12-03 16:55:03 +0000
 +++ plugins/LightDM/plugin.cpp	2014-03-27 20:58:22 +0000
@@ -20,6 +20,7 @@
  #include "plugin.h"
  #include "DBusGreeterList.h"
  #include "Greeter.h"
++#include "URLDispatcher.h"
  #include "UsersModel.h"
  #include <libusermetricsoutput/ColorTheme.h>
  #include <libusermetricsoutput/UserMetrics.h>
@@ -46,6 +47,13 @@
      return greeter;
+ }
++static QObject *dispatcher_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return new URLDispatcher();
++}
++
  static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
      Q_UNUSED(engine)
@@ -67,6 +75,7 @@
      Q_ASSERT(uri == QLatin1String("LightDM"));
      qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
++    qmlRegisterSingletonType<URLDispatcher>(uri, 0, 1, "URLDispatcher", dispatcher_provider);
      qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
      qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
      qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);
 === modified file 'plugins/SessionBroadcast/SessionBroadcast.cpp'
 --- plugins/SessionBroadcast/SessionBroadcast.cpp	2013-09-12 17:58:21 +0000
 +++ plugins/SessionBroadcast/SessionBroadcast.cpp	2014-03-27 20:58:22 +0000
@@ -18,11 +18,26 @@
  #include "SessionBroadcast.h"
  #include <QDBusConnection>
++#include <QDBusConnectionInterface>
++#include <QDBusInterface>
  SessionBroadcast::SessionBroadcast(QObject* parent)
    : QObject(parent)
+ {
      auto connection = QDBusConnection::SM_BUSNAME();
++    auto interface = connection.interface();
++    interface->startService("com.canonical.Unity.Greeter.Broadcast");
++    m_broadcaster = new QDBusInterface("com.canonical.Unity.Greeter.Broadcast",
++                                       "/com/canonical/Unity/Greeter/Broadcast",
++                                       "com.canonical.Unity.Greeter.Broadcast",
++                                       connection, this);
++
++    connection.connect("com.canonical.Unity.Greeter.Broadcast",
++                       "/com/canonical/Unity/Greeter/Broadcast",
++                       "com.canonical.Unity.Greeter.Broadcast",
++                       "StartUrl",
++                       this,
++                       SLOT(onStartUrl(const QString &, const QString &)));
      connection.connect("com.canonical.Unity.Greeter.Broadcast",
                         "/com/canonical/Unity/Greeter/Broadcast",
@@ -32,6 +47,21 @@
                         SLOT(onShowHome(const QString &)));
+ }
++void SessionBroadcast::requestUrlStart(const QString &username, const QString &url)
++{
++    m_broadcaster->asyncCall("RequestUrlStart", username, url);
++}
++
++void SessionBroadcast::onStartUrl(const QString &username, const QString &url)
++{
++    // Since this signal is just used for testing, we don't *really* care if
++    // username matches, but just in case we do eventually use the signal, we
++    // should only listen to our own requests.
++    if (username == qgetenv("USER")) {
++        Q_EMIT startUrl(url);
++    }
++}
++
  void SessionBroadcast::onShowHome(const QString &username)
+ {
      // Only listen to requests meant for us
 === modified file 'plugins/SessionBroadcast/SessionBroadcast.h'
 --- plugins/SessionBroadcast/SessionBroadcast.h	2013-09-12 17:58:21 +0000
 +++ plugins/SessionBroadcast/SessionBroadcast.h	2014-03-27 20:58:22 +0000
@@ -31,11 +31,21 @@
  public:
      explicit SessionBroadcast(QObject *parent = 0);
++    Q_INVOKABLE void requestUrlStart(const QString &username, const QString &url);
++
  Q_SIGNALS:
++    // This signal isn't actually used by the shell
++    // (unity-greeter-session-broadcast handles launching an app for us), but
++    // it's useful for testing the plugin.
++    void startUrl(const QString &url);
      void showHome();
  private Q_SLOTS:
++    void onStartUrl(const QString &username, const QString &url);
      void onShowHome(const QString &username);
++
++private:
++    QDBusInterface *m_broadcaster;
  };
  #endif
 === added directory 'plugins/SessionManager'
 === added file 'plugins/SessionManager/CMakeLists.txt'
 --- plugins/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ plugins/SessionManager/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -0,0 +1,27 @@
++# export_qmlplugin macro
++include(Plugins)
++
++set(QMLPLUGIN_SRC
++    plugin.cpp
++    SessionManager.cpp
++    )
++
++include_directories(
++    ${Qt5DBus_INCLUDE_DIRS}
++    )
++
++add_definitions(-DSM_BUSNAME=systemBus)
++
++add_library(SessionManager-qml MODULE
++    ${QMLPLUGIN_SRC}
++    )
++
++target_link_libraries(SessionManager-qml
++    ${Qt5DBus_LIBRARIES}
++    )
++
++qt5_use_modules(SessionManager-qml Qml)
++
++# export the qmldir qmltypes and plugin files
++export_qmlfiles(SessionManager SessionManager)
++export_qmlplugin(SessionManager 0.1 SessionManager TARGETS SessionManager-qml)
 === added file 'plugins/SessionManager/SessionManager.cpp'
 --- plugins/SessionManager/SessionManager.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/SessionManager/SessionManager.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,107 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "SessionManager.h"
++#include <QtCore/QEvent>
++#include <QtDBus/QDBusPendingReply>
++
++SessionManager::SessionManager(QObject* parent)
++  : QObject(parent),
++    l1_manager(NULL),
++    l1_session(NULL),
++    ldm_session(NULL),
++    is_active(true) // assume we're active w/o logind
++{
++    l1_manager = new QDBusInterface("org.freedesktop.login1",
++                                    "/org/freedesktop/login1",
++                                    "org.freedesktop.login1.Manager",
++                                    QDBusConnection::SM_BUSNAME(), this);
++    if (l1_manager->isValid() && QString(qgetenv("XDG_SESSION_ID")) != "") {
++        QDBusPendingCall pcall = l1_manager->asyncCall("GetSession", QString(qgetenv("XDG_SESSION_ID")));
++        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
++        QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
++                         this, SLOT(getSessionSlot(QDBusPendingCallWatcher*)));
++    }
++
++    if (QString(qgetenv("XDG_SESSION_PATH")) != "") {
++        ldm_session = new QDBusInterface("org.freedesktop.DisplayManager",
++                                         QString(qgetenv("XDG_SESSION_PATH")),
++                                         "org.freedesktop.DisplayManager.Session",
++                                         QDBusConnection::SM_BUSNAME(), this);
++    }
++}
++
++bool SessionManager::active() const
++{
++    // We cache this value for performance reasons, as QDBusInterface does not
++    // cache for us.
++    return is_active;
++}
++
++void SessionManager::lock()
++{
++    // We use ldm_session to handle locking rather than l1_session, because
++    // l1_session doesn't have permissions to lock from the user session, but
++    // ldm_session does.  This is what the rest of Ubuntu uses to lock.
++    if (ldm_session != NULL && ldm_session->isValid())
++        ldm_session->asyncCall("Lock");
++}
++
++void SessionManager::getSessionSlot(QDBusPendingCallWatcher *watcher)
++{
++    QDBusPendingReply<QDBusObjectPath> reply = *watcher;
++    if (!reply.isError()) {
++        QDBusObjectPath path = reply.argumentAt<0>();
++        l1_session = new QDBusInterface("org.freedesktop.login1",
++                                        path.path(),
++                                        "org.freedesktop.login1.Session",
++                                        l1_manager->connection(), this);
++
++        l1_manager->connection().connect("org.freedesktop.login1",
++                                         path.path(),
++                                         "org.freedesktop.DBus.Properties",
++                                         "PropertiesChanged",
++                                         this,
++                                         SLOT(propertiesChanged(QString, QVariantMap, QStringList)));
++
++        propertiesChanged("", QVariantMap(), QStringList() << "Active");
++    }
++    watcher->deleteLater();
++}
++
++void SessionManager::propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
++{
++    Q_UNUSED(interface)
++
++    QVariant value = changed.value("Active");
++
++    // If Active isn't in changed, check if we were at least notified about it
++    // changing on the server.  Also check if IdleHint was modified, because
++    // sometimes logind does not emit a changed signal for Active becoming
++    // false, but will emit for IdleHint when that does happen.
++    if (!value.isValid() && (invalid.contains("Active") || invalid.contains("IdleHint") || changed.contains("IdleHint")) && l1_session->isValid()) {
++        value = l1_session->property("Active");
++        if (!value.isValid())
++            value = QVariant(false);
++    }
++
++    if (value.isValid() && value.toBool() != is_active) {
++        is_active = value.toBool();
++        Q_EMIT activeChanged();
++    }
++}
 === added file 'plugins/SessionManager/SessionManager.h'
 --- plugins/SessionManager/SessionManager.h	1970-01-01 00:00:00 +0000
 +++ plugins/SessionManager/SessionManager.h	2014-03-27 20:58:22 +0000
@@ -0,0 +1,60 @@
++/*
++ * Copyright (C) 2012,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/>.
++ *
++ * Authors: Gerry Boland <gerry.boland@canonical.com>
++ *          Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef UNITY_SESSIONMANAGER_H
++#define UNITY_SESSIONMANAGER_H
++
++#include <QtCore/QObject>
++#include <QtCore/QString>
++#include <QtCore/QStringList>
++#include <QtCore/QVariantMap>
++#include <QtDBus/QDBusInterface>
++#include <QtDBus/QDBusPendingCallWatcher>
++
++class SessionManager: public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(bool active
++               READ active
++               NOTIFY activeChanged
++               FINAL)
++
++public:
++    explicit SessionManager(QObject *parent = 0);
++
++    bool active() const;
++
++public Q_SLOTS:
++    void lock();
++
++Q_SIGNALS:
++    void activeChanged();
++
++private Q_SLOTS:
++    void getSessionSlot(QDBusPendingCallWatcher *watcher);
++    void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
++
++private:
++    QDBusInterface *l1_manager;
++    QDBusInterface *l1_session;
++    QDBusInterface *ldm_session;
++    bool is_active;
++};
++
++#endif
 === added file 'plugins/SessionManager/plugin.cpp'
 --- plugins/SessionManager/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/SessionManager/plugin.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2012,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/>.
++ *
++ * Authors: Gerry Boland <gerry.boland@canonical.com>
++ *          Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "plugin.h"
++#include "SessionManager.h"
++#include <QtQml/qqml.h>
++
++static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return new SessionManager();
++}
++
++void SessionManagerPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("SessionManager"));
++    qmlRegisterSingletonType<SessionManager>(uri, 0, 1, "SessionManager", sessionmanager_provider);
++}
 === added file 'plugins/SessionManager/plugin.h'
 --- plugins/SessionManager/plugin.h	1970-01-01 00:00:00 +0000
 +++ plugins/SessionManager/plugin.h	2014-03-27 20:58:22 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright (C) 2012,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/>.
++ *
++ * Authors: Gerry Boland <gerry.boland@canonical.com>
++ *          Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef SESSIONMANAGER_PLUGIN_H
++#define SESSIONMANAGER_PLUGIN_H
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlExtensionPlugin>
++
++class SessionManagerPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri);
++};
++
++#endif
 === added file 'plugins/SessionManager/qmldir'
 --- plugins/SessionManager/qmldir	1970-01-01 00:00:00 +0000
 +++ plugins/SessionManager/qmldir	2014-03-27 20:58:22 +0000
@@ -0,0 +1,2 @@
++module SessionManager
++plugin SessionManager-qml
 === added file 'qml/Components/BasicShell.qml'
 --- qml/Components/BasicShell.qml	1970-01-01 00:00:00 +0000
 +++ qml/Components/BasicShell.qml	2014-03-27 20:58:22 +0000
@@ -0,0 +1,84 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Unity.Application 0.1
++import "../Components"
++
++FocusScope {
++    id: shell
++
++    // this is only here to select the width / height of the window if not running fullscreen
++    property bool tablet: false
++    width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
++    height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
++
++    property real edgeSize: units.gu(2)
++
++    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "../graphics/tablet_background.jpg" : "../graphics/phone_background.jpg")
++    property url background
++    property url backgroundSource
++    property url backgroundFallbackSource
++    property url backgroundFinal: (backgroundSource != undefined && backgroundSource != "") ? backgroundSource : (backgroundFallbackSource != undefined && backgroundFallbackSource != "") ? backgroundFallbackSource : shell.defaultBackground
++    onBackgroundFinalChanged: shell.background = backgroundFinal
++
++    // This is a dummy image that is needed to determine if the picture url
++    // in backgroundSettings points to a valid picture file.
++    // We can't do this with the real background image because setting a
++    // new source in onStatusChanged triggers a binding loop detection
++    // inside Image, which causes it not to render even though a valid source
++    // would be set. We don't mind about this image staying black and just
++    // use it for verification to populate the source for the real
++    // background image.
++    Image {
++        source: shell.background
++        height: 0
++        width: 0
++        sourceSize.height: 0
++        sourceSize.width: 0
++        onStatusChanged: {
++            if (status == Image.Error) {
++                if (source != shell.defaultBackground) {
++                    shell.background = defaultBackground
++                } else {
++                    // In case even our default background fails to load...
++                    shell.background = "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#000'/></svg>"
++                }
++            }
++        }
++    }
++
++    VolumeControl {
++        id: volumeControl
++    }
++
++    Keys.onVolumeUpPressed: volumeControl.volumeUp()
++    Keys.onVolumeDownPressed: volumeControl.volumeDown()
++
++    function hideIndicatorMenu(delay) {
++        panel.hideIndicatorMenu(delay);
++    }
++
++    focus: true
++    onFocusChanged: if (!focus) forceActiveFocus();
++
++    Binding {
++        target: i18n
++        property: "domain"
++        value: "unity8"
++    }
++}
 === modified file 'qml/Components/EdgeDemo.qml'
 --- qml/Components/EdgeDemo.qml	2014-01-29 22:19:15 +0000
 +++ qml/Components/EdgeDemo.qml	2014-03-27 20:58:22 +0000
@@ -15,13 +15,11 @@
   */
  import AccountsService 0.1
--import LightDM 0.1 as LightDM
  import QtQuick 2.0
  Item {
      id: demo
--    property Item greeter
      property Item dash
      property Item launcher
      property Item indicators
@@ -36,7 +34,6 @@
      property bool paused: false
      onPausedChanged: {
--        if (d.rightEdgeDemo)  d.rightEdgeDemo.paused = paused
          if (d.topEdgeDemo)    d.topEdgeDemo.paused = paused
          if (d.bottomEdgeDemo) d.bottomEdgeDemo.paused = paused
          if (d.leftEdgeDemo)   d.leftEdgeDemo.paused = paused
@@ -45,16 +42,6 @@
      function hideEdgeDemoInShell() {
          AccountsService.demoEdges = false;
--        stopDemo();
--    }
--
--    function hideEdgeDemoInGreeter() {
--        // TODO: AccountsService.demoEdges = false as lightdm user
--    }
--
--    function hideEdgeDemos() {
--        hideEdgeDemoInGreeter();
--        hideEdgeDemoInShell();
+     }
      function stopDemo() {
@@ -62,7 +49,6 @@
          dashEnabled = true
          panelEnabled = true
          panelContentEnabled = true
--        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
          if (d.topEdgeDemo)    d.topEdgeDemo.destroy()
          if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()
          if (d.leftEdgeDemo)   d.leftEdgeDemo.destroy()
@@ -79,24 +65,17 @@
          panelEnabled = false;
          panelContentEnabled = false;
--        // Begin with either greeter or dash, depending on which is visible
--        if (greeter && greeter.shown) {
--            startRightEdgeDemo()
--        } else {
--            startTopEdgeDemo()
--        }
++        startTopEdgeDemo()
+     }
      QtObject {
          id: d
          property Component overlay
--        property QtObject rightEdgeDemo
          property QtObject topEdgeDemo
          property QtObject bottomEdgeDemo
          property QtObject leftEdgeDemo
          property QtObject finalEdgeDemo
          property bool showEdgeDemo: AccountsService.demoEdges
--        property bool showEdgeDemoInGreeter: AccountsService.demoEdges // TODO: AccountsService.demoEdges as lightdm user
          onShowEdgeDemoChanged: {
              stopDemo()
@@ -106,37 +85,6 @@
+         }
+     }
--    function startRightEdgeDemo() {
--        if (demo.greeter) {
--            d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
--                "edge": "right",
--                "title": i18n.tr("Right edge"),
--                "text": i18n.tr("Try swiping from the right edge to unlock the phone"),
--                "anchors.fill": demo.greeter,
--            });
--        }
--        if (d.rightEdgeDemo) {
--            d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)
--        } else {
--            stopDemo();
--        }
--    }
--
--    Connections {
--        target: demo.greeter
--
--        function hide() {
--            if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
--                d.rightEdgeDemo.hide()
--                hideEdgeDemoInGreeter()
--                startTopEdgeDemo()
--            }
--        }
--
--        onUnlocked: hide()
--        onShownChanged: if (!greeter.shown) hide()
--    }
--
      function startTopEdgeDemo() {
          demo.panelEnabled = true;
          if (demo.dash && demo.underlay) {
 === renamed file 'qml/Greeter/Lockscreen.qml' => 'qml/Components/Lockscreen.qml'
 --- qml/Greeter/Lockscreen.qml	2013-12-18 20:09:55 +0000
 +++ qml/Components/Lockscreen.qml	2014-03-27 20:58:22 +0000
@@ -16,7 +16,6 @@
  import QtQuick 2.0
  import Ubuntu.Components 0.1
--import "../Components"
  Showable {
      id: root
@@ -56,24 +55,6 @@
          pinPadLoader.item.clear(showAnimation);
+     }
--    Rectangle {
--        // In case background fails to load or is undefined
--        id: backgroundBackup
--        anchors.fill: parent
--        color: "black"
--    }
--
--    Image {
--        id: backgroundImage
--        objectName: "lockscreenBackground"
--        anchors {
--            fill: parent
--            topMargin: backgroundTopMargin
--        }
--        source: root.required ? root.background : ""
--        fillMode: Image.PreserveAspectCrop
--    }
--
      MouseArea {
          anchors.fill: root
+     }
 === modified file 'qml/Components/PageHeader.qml'
 --- qml/Components/PageHeader.qml	2014-02-25 15:43:42 +0000
 +++ qml/Components/PageHeader.qml	2014-03-27 20:58:22 +0000
@@ -18,6 +18,7 @@
  import Ubuntu.Components 0.1
  import Ubuntu.Components.Popups 0.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
++import SessionManager 0.1
  import Unity 0.2
  Item {
@@ -51,8 +52,8 @@
+     }
      Connections {
--        target: greeter
--        onShownChanged: if (shown) resetSearch()
++        target: SessionManager
++        onActiveChanged: if (!SessionManager.active) resetSearch()
+     }
      Flickable {
 === renamed file 'qml/Greeter/PassphraseLockscreen.qml' => 'qml/Components/PassphraseLockscreen.qml'
 === renamed file 'qml/Greeter/PinLockscreen.qml' => 'qml/Components/PinLockscreen.qml'
 === modified file 'qml/Dash/ScopeListView.qml'
 --- qml/Dash/ScopeListView.qml	2013-12-12 16:45:35 +0000
 +++ qml/Dash/ScopeListView.qml	2014-03-27 20:58:22 +0000
@@ -16,13 +16,14 @@
  import QtQuick 2.0
  import DashViews 0.1
++import SessionManager 0.1
  ListViewWithPageHeader {
      maximumFlickVelocity: height * 10
      flickDeceleration: height * 2
      Connections {
--        target: greeter
--        onShownChanged: if (greeter.shown) showHeader()
++        target: SessionManager
++        onActiveChanged: if (!SessionManager.active) showHeader()
+     }
+ }
 === modified file 'qml/Greeter/Clock.qml'
 --- qml/Greeter/Clock.qml	2013-10-11 12:14:33 +0000
 +++ qml/Greeter/Clock.qml	2014-03-27 20:58:22 +0000
@@ -42,7 +42,7 @@
          busName: "com.canonical.indicator.datetime"
          actionsObjectPath: "/com/canonical/indicator/datetime"
--        menuObjectPath: clock.active ? "/com/canonical/indicator/datetime/phone" : ""
++        menuObjectPath: clock.active ? "/com/canonical/indicator/datetime/phone_greeter" : ""
          Indicators.RootActionState {
              menu: timeModel.model
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2014-03-05 08:06:19 +0000
 +++ qml/Greeter/Greeter.qml	2014-03-27 20:58:22 +0000
@@ -23,15 +23,15 @@
  Showable {
      id: greeter
      enabled: shown
--    created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
++    created: greeterContentLoader.status == Loader.Ready
--    property url defaultBackground
++    property url background
      // 1 when fully shown and 0 when fully hidden
      property real showProgress: MathUtils.clamp((width + x) / width, 0, 1)
      showAnimation: StandardAnimation { property: "x"; to: 0 }
--    hideAnimation: StandardAnimation { property: "x"; to: -width }
++    hideAnimation: __leftHideAnimation
      property alias dragHandleWidth: dragHandle.width
      property alias model: greeterContentLoader.model
@@ -40,19 +40,105 @@
      readonly property bool narrowMode: !multiUser && height > width
      readonly property bool multiUser: LightDM.Users.count > 1
--    readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready &&
--                                              greeterContentLoader.item.leftTeaserPressed
--    readonly property bool rightTeaserPressed: greeterContentLoader.status == Loader.Ready &&
--                                               greeterContentLoader.item.rightTeaserPressed
--
      readonly property int currentIndex: greeterContentLoader.currentIndex
++    property var __leftHideAnimation: StandardAnimation { property: "x"; to: -width }
++    property var __rightHideAnimation: StandardAnimation { property: "x"; to: width }
++
      signal selected(int uid)
      signal unlocked(int uid)
--
--    onRightTeaserPressedChanged: {
--        if (rightTeaserPressed && (!locked || narrowMode) && x == 0) {
--            teasingTimer.start();
++    signal tease()
++
++    function hideRight() {
++        hideAnimation = __rightHideAnimation
++        hide()
++    }
++
++    Connections {
++        target: __rightHideAnimation
++        // Reset hide animation to default once we're finished with it
++        onRunningChanged: if (!__rightHideAnimation.running) greeter.hideAnimation = __leftHideAnimation
++    }
++
++    // Bi-directional revealer
++    DraggingArea {
++        id: dragHandle
++        anchors.fill: parent
++        enabled: greeter.narrowMode || !greeter.locked
++        orientation: Qt.Horizontal
++        propagateComposedEvents: true
++
++        Component.onCompleted: {
++            // set evaluators to baseline of dragValue == 0
++            leftEvaluator.reset()
++            rightEvaluator.reset()
++        }
++
++        function maybeTease() {
++            if (!greeter.locked || greeter.narrowMode)
++                greeter.tease();
++        }
++
++        onClicked: maybeTease()
++        onDragStart: maybeTease()
++        onPressAndHold: {} // eat event, but no need to tease, as drag will cover it
++
++        onDragEnd: {
++            if (rightEvaluator.shouldAutoComplete())
++                greeter.hideRight()
++            else if (leftEvaluator.shouldAutoComplete())
++                greeter.hide();
++            else
++                greeter.show(); // undo drag
++        }
++
++        onDragValueChanged: {
++            // dragValue is kept as a "step" value since we do this x adjusting on the fly
++            greeter.x += dragValue
++        }
++
++        EdgeDragEvaluator {
++            id: rightEvaluator
++            trackedPosition: dragHandle.dragValue + greeter.x
++            maxDragDistance: parent.width
++            direction: Direction.Rightwards
++        }
++
++        EdgeDragEvaluator {
++            id: leftEvaluator
++            trackedPosition: dragHandle.dragValue + greeter.x
++            maxDragDistance: parent.width
++            direction: Direction.Leftwards
++        }
++    }
++
++    Rectangle {
++        // To hide lockscreen until background finished fading in
++        id: backgroundBackup
++        anchors {
++            fill: parent
++            topMargin: -greeter.y
++        }
++        color: "black"
++    }
++
++    CrossFadeImage {
++        id: backgroundImage
++        objectName: "greeterBackground"
++        anchors {
++            fill: parent
++            topMargin: -greeter.y
++        }
++        source: greeter.background
++        fillMode: Image.PreserveAspectCrop
++
++        StandardAnimation {
++            running: true
++            target: backgroundImage
++            property: "opacity"
++            from: 0.0
++            to: 1.0
++            duration: 800
+         }
+     }
@@ -63,7 +149,6 @@
          property var model: LightDM.Users
          property int currentIndex: 0
          property var infographicModel: LightDM.Infographic
--        readonly property int backgroundTopMargin: -greeter.y
          source: required ? "GreeterContent.qml" : ""
@@ -82,45 +167,54 @@
+         }
+     }
--    Timer {
--        id: teasingTimer
--        interval: 200
--    }
--
--    states: [
--        State {
--            name: "teasing"
--            when: teasingTimer.running
--            PropertyChanges {
--                target: greeter
--                x: -dragHandle.hintDisplacement
--            }
--        }
--    ]
--    transitions: [
--        Transition {
--            from: "*"
--            to: "*"
--            NumberAnimation {
--                target: greeter
--                property: "x"
--                duration: 300
--                easing.type: Easing.OutCubic
--            }
--        }
--    ]
--
--    DragHandle {
--        id: dragHandle
--
--        anchors.top: parent.top
--        anchors.bottom: parent.bottom
--        anchors.right: parent.right
--
--        hintDisplacement: units.gu(2)
--
--        enabled: greeter.narrowMode || !greeter.locked
--
--        direction: Direction.Leftwards
++    onTease: showLabelAnimation.start()
++
++    Label {
++        id: swipeHint
++        visible: greeter.shown
++        property real baseOpacity: 0.5
++        opacity: 0.0
++        anchors.horizontalCenter: parent.horizontalCenter
++        anchors.bottom: parent.bottom
++        anchors.bottomMargin: units.gu(5)
++        text: i18n.tr("Swipe to 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"
+     }
+ }
 === modified file 'qml/Greeter/GreeterContent.qml'
 --- qml/Greeter/GreeterContent.qml	2014-02-20 20:14:40 +0000
 +++ qml/Greeter/GreeterContent.qml	2014-03-27 20:58:22 +0000
@@ -20,65 +20,13 @@
  import LightDM 0.1 as LightDM
  import "../Components"
--MouseArea {
++Item {
      id: root
      anchors.fill: parent
--    property bool ready: background.source == "" || background.status == Image.Ready || background.status == Image.Error
--    property bool leftTeaserPressed: teasingMouseArea.pressed &&
--                                     teasingMouseArea.mouseX < teasingMouseArea.width / 2
--    property bool rightTeaserPressed: teasingMouseArea.pressed &&
--                                     teasingMouseArea.mouseX > teasingMouseArea.width / 2
--
      signal selected(int uid)
      signal unlocked(int uid)
--    Rectangle {
--        // In case background fails to load
--        id: backgroundBackup
--        anchors.fill: parent
--        color: "black"
--    }
--
--    property url backgroundValue: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : greeter.defaultBackground
--    onBackgroundValueChanged: background.source = backgroundValue
--
--    CrossFadeImage {
--        id: background
--        objectName: "greeterBackground"
--        anchors {
--            fill: parent
--            topMargin: backgroundTopMargin
--        }
--        fillMode: Image.PreserveAspectCrop
--    }
--
--    // See Shell.qml's backgroundSettings treatment for why we need a separate
--    // Image, but it boils down to avoiding binding loop detection.
--    Image {
--        source: background.source
--        height: 0
--        width: 0
--        sourceSize.height: 0
--        sourceSize.width: 0
--        onStatusChanged: {
--            if (status == Image.Error && source != greeter.defaultBackground) {
--                background.source = greeter.defaultBackground
--            }
--        }
--    }
--
--    Rectangle {
--        anchors.fill: parent
--        color: "black"
--        opacity: 0.4
--    }
--
--    MouseArea {
--        id: teasingMouseArea
--        anchors.fill: parent
--    }
--
      Loader {
          id: loginLoader
          objectName: "loginLoader"
@@ -129,6 +77,7 @@
          objectName: "infographics"
          height: narrowMode ? parent.height : 0.75 * parent.height
          model: greeterContentLoader.infographicModel
++        opacity: 0.0
          property string selectedUser
          property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
@@ -150,16 +99,64 @@
              left: narrowMode ? root.left : loginLoader.right
              right: root.right
+         }
++
++        ParallelAnimation {
++            id: infoFadeAnimation
++            StandardAnimation {
++                target: infographics
++                property: "opacity"
++                from: 0.0
++                to: 1.0
++                duration: 800
++            }
++            StandardAnimation {
++                target: infographics
++                property: "scale"
++                from: 0.9
++                to: 1.0
++                duration: 800
++            }
++        }
++
++        Timer {
++            running: true
++            interval: 200
++            onTriggered: infoFadeAnimation.start()
++        }
+     }
      Clock {
          id: clock
--        visible: narrowMode
++        opacity: 0.0
          anchors {
              top: parent.top
              topMargin: units.gu(2)
              horizontalCenter: parent.horizontalCenter
+         }
++
++        ParallelAnimation {
++            id: clockFadeAnimation
++            StandardAnimation {
++                target: clock
++                property: "opacity"
++                from: 0.0
++                to: 1.0
++                duration: 600
++            }
++            StandardAnimation {
++                target: clock
++                property: "scale"
++                from: 0.9
++                to: 1.0
++                duration: 600
++            }
++        }
++
++        Timer {
++            running: narrowMode
++            interval: 600
++            onTriggered: clockFadeAnimation.start()
++        }
+     }
+ }
 === added file 'qml/Greeter/GreeterEdgeDemo.qml'
 --- qml/Greeter/GreeterEdgeDemo.qml	1970-01-01 00:00:00 +0000
 +++ qml/Greeter/GreeterEdgeDemo.qml	2014-03-27 20:58:22 +0000
@@ -0,0 +1,102 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import AccountsService 0.1
++import LightDM 0.1 as LightDM
++import QtQuick 2.0
++
++Item {
++    id: demo
++
++    property Item greeter
++
++    property bool active: false
++    property bool paused: false
++
++    onPausedChanged: {
++        if (d.rightEdgeDemo)  d.rightEdgeDemo.paused = paused
++    }
++
++    function hideEdgeDemoInShell() {
++        AccountsService.demoEdges = false;
++    }
++
++    function hideEdgeDemoInGreeter() {
++        AccountsService.demoEdgesForCurrentUser = false;
++    }
++
++    function hideEdgeDemos() {
++        hideEdgeDemoInGreeter();
++        hideEdgeDemoInShell();
++    }
++
++    function startDemo() {
++        if (!d.overlay) {
++            d.overlay = Qt.createComponent("../Components/EdgeDemoOverlay.qml")
++        }
++        startRightEdgeDemo()
++    }
++
++    function stopDemo() {
++        active = false
++        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
++    }
++
++    QtObject {
++        id: d
++        property Component overlay
++        property QtObject rightEdgeDemo
++        property bool showEdgeDemoInGreeter: AccountsService.demoEdgesForCurrentUser && AccountsService.demoEdges
++
++        onShowEdgeDemoInGreeterChanged: {
++            stopDemo()
++            if (d.showEdgeDemoInGreeter) {
++                startDemo()
++            }
++        }
++    }
++
++    function startRightEdgeDemo() {
++        active = true;
++        if (demo.greeter) {
++            d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
++                "edge": "right",
++                "title": i18n.tr("Right edge"),
++                "text": i18n.tr("Try swiping from the right edge to unlock the phone"),
++                "anchors.fill": demo.greeter,
++            });
++        }
++        if (d.rightEdgeDemo) {
++            d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)
++        } else {
++            stopDemo();
++        }
++    }
++
++    Connections {
++        target: demo.greeter
++
++        function hide() {
++            if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
++                d.rightEdgeDemo.hide()
++                hideEdgeDemoInGreeter()
++            }
++        }
++
++        onUnlocked: hide()
++        onShownChanged: if (!greeter.shown) hide()
++    }
++}
 === modified file 'qml/Greeter/Infographics.qml'
 --- qml/Greeter/Infographics.qml	2013-10-11 16:17:18 +0000
 +++ qml/Greeter/Infographics.qml	2014-03-27 20:58:22 +0000
@@ -59,8 +59,6 @@
      visible: model.label !== ""
--    Component.onCompleted: startShowAnimation()
--
      Item {
          id: dataCircle
          objectName: "dataCircle"
@@ -457,5 +455,8 @@
                      !circleGrowAnimTimer.running)
                  infographic.model.nextDataSource()
+         }
++
++        onClicked: mouse.accepted = false
++        onPressed: mouse.accepted = false
+     }
+ }
 === added file 'qml/GreeterShell.qml'
 --- qml/GreeterShell.qml	1970-01-01 00:00:00 +0000
 +++ qml/GreeterShell.qml	2014-03-27 20:58:22 +0000
@@ -0,0 +1,285 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import AccountsService 0.1
++import GSettings 1.0
++import LightDM 0.1 as LightDM
++import Powerd 0.1
++import QtQuick 2.0
++import SessionBroadcast 0.1
++import Ubuntu.Components 0.1
++import Unity.Application 0.1
++import Unity.Launcher 0.1
++import "Components"
++import "Greeter"
++import "Launcher"
++import "Panel"
++import "Notifications"
++import Unity.Notifications 1.0 as NotificationBackend
++
++BasicShell {
++    id: shell
++
++    function activateApplication(appId) {
++        SessionBroadcast.requestUrlStart(LightDM.Greeter.authenticationUser, appId)
++        greeter.hide()
++    }
++
++    GSettings {
++        id: backgroundSettings
++        schema.id: "org.gnome.desktop.background"
++    }
++    backgroundFallbackSource: backgroundSettings.pictureUri // for ease of customization by system builders
++    backgroundSource: AccountsService.backgroundFile
++
++    Lockscreen {
++        id: lockscreen
++        objectName: "lockscreen"
++
++        hides: [launcher, panel.indicators]
++        shown: false
++        enabled: true
++        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
++        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
++        y: panel.panelHeight
++        x: required ? 0 : - width
++        width: parent.width
++        height: parent.height - panel.panelHeight
++        pinLength: 4
++
++        onEntered: LightDM.Greeter.respond(passphrase);
++        onCancel: greeter.show()
++
++        Component.onCompleted: {
++            if (LightDM.Users.count == 1) {
++                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
++            }
++        }
++    }
++
++    Connections {
++        target: LightDM.Greeter
++
++        onShowPrompt: {
++            if (LightDM.Users.count == 1) {
++                // TODO: There's no better way for now to determine if its a PIN or a passphrase.
++                if (text == "PIN") {
++                    lockscreen.alphaNumeric = false
++                } else {
++                    lockscreen.alphaNumeric = true
++                }
++                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
++                lockscreen.show();
++            }
++        }
++
++        onAuthenticationComplete: {
++            if (LightDM.Greeter.promptless) {
++                return;
++            }
++            if (LightDM.Greeter.authenticated) {
++                lockscreen.hide();
++            } else {
++                lockscreen.clear(true);
++            }
++        }
++    }
++
++    Item {
++        // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
++        width: parent.width
++        height: parent.height
++        x: launcher.progress
++        Behavior on x {SmoothedAnimation{velocity: 600}}
++
++        Rectangle {
++            anchors.fill: parent
++            color: "black"
++            opacity: (1 - Math.abs(greeter.x) / shell.width) * 0.8
++        }
++
++        Greeter {
++            id: greeter
++            objectName: "greeter"
++
++            available: true
++            hides: [launcher, panel.indicators]
++            shown: true
++            background: shell.background
++
++            y: panel.panelHeight
++            width: parent.width
++            height: parent.height - panel.panelHeight
++
++            dragHandleWidth: shell.edgeSize
++
++            function login() {
++                enabled = false;
++                LightDM.Greeter.startSessionSync();
++            }
++
++            onShownChanged: {
++                if (shown) {
++                    lockscreen.reset();
++                    // If there is only one user, we start authenticating with that one here.
++                    // If there are more users, the Greeter will handle that
++                    if (LightDM.Users.count == 1) {
++                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
++                    }
++                    greeter.forceActiveFocus();
++                }
++            }
++
++            onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress == 0) login()
++
++            onUnlocked: login()
++            onSelected: {
++                // Update launcher items for new user
++                var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
++                AccountsService.user = user;
++                LauncherModel.setUser(user);
++            }
++            onTease: launcher.tease()
++        }
++    }
++
++    InputFilterArea {
++        anchors.fill: parent
++        blockInput: true
++    }
++
++    Revealer {
++        id: greeterRevealer
++        objectName: "greeterRevealer"
++
++        property real animatedProgress: MathUtils.clamp(-dragPosition / closedValue, 0, 1)
++        target: greeter
++        width: greeter.width
++        height: greeter.height
++        handleSize: shell.edgeSize
++        orientation: Qt.Horizontal
++        enabled: !greeter.locked
++    }
++
++    Item {
++        id: overlay
++
++        anchors.fill: parent
++
++        Panel {
++            id: panel
++            anchors.fill: parent //because this draws indicator menus
++            indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
++            indicators {
++                hides: [launcher]
++                available: !edgeDemo.active
++            }
++            fullscreenMode: initialPanelDelay.running
++            searchVisible: false
++        }
++
++        Timer {
++            id: initialPanelDelay
++            running: true
++            interval: 300
++        }
++
++        Launcher {
++            id: launcher
++
++            anchors.top: parent.top
++            anchors.bottom: parent.bottom
++            width: parent.width
++            dragAreaWidth: shell.edgeSize
++            available: greeter.narrowMode && !edgeDemo.active
++            onLauncherApplicationSelected: {
++                shell.activateApplication("application:///" + appId + ".desktop")
++            }
++            onShownChanged: {
++                if (shown) {
++                    panel.indicators.hide()
++                }
++            }
++            onDash: {
++                hide()
++                greeter.hideRight()
++            }
++            onShowDashHome: greeter.show()
++        }
++
++        Notifications {
++            id: notifications
++
++            model: NotificationBackend.Model
++            anchors {
++                top: parent.top
++                right: parent.right
++                bottom: parent.bottom
++                leftMargin: units.gu(1)
++                rightMargin: units.gu(1)
++                topMargin: panel.panelHeight + units.gu(1)
++            }
++            states: [
++                State {
++                    name: "narrow"
++                    when: overlay.width <= units.gu(60)
++                    AnchorChanges { target: notifications; anchors.left: parent.left }
++                },
++                State {
++                    name: "wide"
++                    when: overlay.width > units.gu(60)
++                    AnchorChanges { target: notifications; anchors.left: undefined }
++                    PropertyChanges { target: notifications; width: units.gu(38) }
++                }
++            ]
++
++            InputFilterArea {
++                anchors { left: parent.left; right: parent.right }
++                height: parent.contentHeight
++                blockInput: height > 0
++            }
++        }
++    }
++
++    OSKController {
++        anchors.topMargin: panel.panelHeight
++        anchors.fill: parent // as needs to know the geometry of the shell
++    }
++
++    Connections {
++        id: powerConnection
++        target: Powerd
++
++        onDisplayPowerStateChange: {
++            if (status == Powerd.Off) {
++                greeter.show();
++                edgeDemo.paused = true;
++            } else if (status == Powerd.On) {
++                edgeDemo.paused = false;
++            }
++        }
++    }
++
++    Connections {
++        target: LightDM.URLDispatcher
++        onDispatchURL: shell.activateApplication(url)
++    }
++
++    GreeterEdgeDemo {
++        id: edgeDemo
++        greeter: greeter
++    }
++}
 === modified file 'qml/Hud/Hud.qml'
 --- qml/Hud/Hud.qml	2013-06-05 22:03:08 +0000
 +++ qml/Hud/Hud.qml	2014-03-27 20:58:22 +0000
@@ -227,10 +227,7 @@
          width: parent.width
          onYChanged: {
--            if (greeter.shown) {
--                showAnimation.duration = 0
--                hideAnimation.duration = 0
--            } else if (!showAnimation.running && !hideAnimation.running) {
++            if (!showAnimation.running && !hideAnimation.running) {
                  if (parent.height > 0) {
                      showAnimation.duration = Math.min(showableAnimationDuration * (1 - (parent.height - y) / parent.height), showableAnimationDuration)
                      hideAnimation.duration = showableAnimationDuration - showAnimation.duration
@@ -491,6 +488,6 @@
          anchors.top: hudContentClipper.top
          anchors.bottom: hudContentClipper.bottom
          fillMode: Image.Tile
--        source: "graphics/dropshadow_right.png"
++        source: "../graphics/dropshadow_right.png"
+     }
+ }
 === modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
 --- qml/Notifications/NotificationMenuItemFactory.qml	2013-12-23 12:26:18 +0000
 +++ qml/Notifications/NotificationMenuItemFactory.qml	2014-03-27 20:58:22 +0000
@@ -20,7 +20,6 @@
  import QtQuick 2.0
  import Ubuntu.Components 0.1
  import "../Components"
--import "../Greeter"
  Loader {
      id: menuFactory
 === modified file 'qml/Panel/Panel.qml'
 --- qml/Panel/Panel.qml	2014-01-14 15:35:57 +0000
 +++ qml/Panel/Panel.qml	2014-03-27 20:58:22 +0000
@@ -62,7 +62,7 @@
          height: __panelMinusSeparatorLineHeight
          y: 0
--        Behavior on y { StandardAnimation {} }
++        Behavior on y { StandardAnimation {duration: 500} }
+     }
      PanelSeparatorLine {
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2014-03-19 22:21:57 +0000
 +++ qml/Shell.qml	2014-03-27 20:58:22 +0000
@@ -21,11 +21,10 @@
  import Ubuntu.Components 0.1
  import Ubuntu.Gestures 0.1
  import Unity.Launcher 0.1
--import LightDM 0.1 as LightDM
  import Powerd 0.1
  import SessionBroadcast 0.1
++import SessionManager 0.1
  import "Dash"
--import "Greeter"
  import "Launcher"
  import "Panel"
  import "Hud"
@@ -35,17 +34,9 @@
  import "Notifications"
  import Unity.Notifications 1.0 as NotificationBackend
--FocusScope {
++BasicShell {
      id: shell
--    // this is only here to select the width / height of the window if not running fullscreen
--    property bool tablet: false
--    width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
--    height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
--
--    property real edgeSize: units.gu(2)
--    property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
--    property url background
      readonly property real panelHeight: panel.panelHeight
      property bool dashShown: dash.shown
@@ -85,9 +76,7 @@
      readonly property string currentFocusedAppId: ApplicationManager.focusedApplicationId
      readonly property bool fullscreenMode: {
--        if (greeter.shown || lockscreen.shown) {
--            return false;
--        } else if (mainStage.usingScreenshots) { // Window Manager animating so want to re-evaluate fullscreen mode
++        if (mainStage.usingScreenshots) { // Window Manager animating so want to re-evaluate fullscreen mode
              return mainStage.switchingFromFullscreenToFullscreen;
          } else if (applicationManager.mainStageFocusedApplication) {
              return applicationManager.mainStageFocusedApplication.fullscreen;
@@ -120,17 +109,7 @@
          id: backgroundSettings
          schema.id: "org.gnome.desktop.background"
+     }
--    property url gSettingsPicture: backgroundSettings.pictureUri != undefined && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : shell.defaultBackground
--    onGSettingsPictureChanged: {
--        shell.background = gSettingsPicture
--    }
--
--    VolumeControl {
--        id: volumeControl
--    }
--
--    Keys.onVolumeUpPressed: volumeControl.volumeUp()
--    Keys.onVolumeDownPressed: volumeControl.volumeDown()
++    backgroundSource: backgroundSettings.pictureUri
      Item {
          id: underlay
@@ -171,7 +150,6 @@
              id: dash
              objectName: "dash"
--            available: !greeter.shown && !lockscreen.shown
              hides: [stages, launcher, panel.indicators]
              shown: disappearingAnimationProgress !== 1.0
              enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled
@@ -189,16 +167,10 @@
              contentScale: 1.0 - 0.2 * disappearingAnimationProgress
              opacity: 1.0 - disappearingAnimationProgress
--            property real disappearingAnimationProgress: {
--                if (greeter.shown) {
--                    return greeter.showProgress;
--                } else {
--                    return stagesOuterContainer.showProgress;
--                }
--            }
++            property real disappearingAnimationProgress: stagesOuterContainer.showProgress
--            // FIXME: only necessary because stagesOuterContainer.showProgress and
--            // greeterRevealer.animatedProgress are not animated
++            // FIXME: only necessary because stagesOuterContainer.showProgress
++            // is not animated
              Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}
+         }
+     }
@@ -222,7 +194,6 @@
              property bool fullyShown: shown && x == 0 && parent.x == 0
              property bool fullyHidden: !shown && x == width
--            available: !greeter.shown
              hides: [panel.indicators]
              shown: false
              opacity: 1.0
@@ -324,7 +295,7 @@
                              && sideStage[sideStageRevealer.boundProperty] == sideStageRevealer.openedValue
                  shouldUseScreenshots: !fullyShown || mainStage.usingScreenshots || sideStageRevealer.pressed
--                available: !greeter.shown && !lockscreen.shown && enabled
++                available: enabled
                  hides: [launcher, panel.indicators]
                  shown: false
                  showAnimation: StandardAnimation { property: "x"; duration: 350; to: sideStageRevealer.openedValue; easing.type: Easing.OutQuint }
@@ -365,7 +336,7 @@
                  width: shell.edgeSize
                  direction: Direction.Leftwards
--                enabled: greeter.showProgress == 0 && edgeDemo.dashEnabled
++                enabled: edgeDemo.dashEnabled
                  property bool haveApps: mainStage.applications.count > 0 || sideStage.applications.count > 0
                  maxTotalDragDistance: haveApps ? parent.width : parent.width * 0.7
@@ -375,155 +346,43 @@
+         }
+     }
--    Lockscreen {
--        id: lockscreen
--        objectName: "lockscreen"
--
--        readonly property int backgroundTopMargin: -panel.panelHeight
--
--        hides: [launcher, panel.indicators, hud]
--        shown: false
--        enabled: true
--        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
--        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
--        y: panel.panelHeight
--        x: required ? 0 : - width
--        width: parent.width
--        height: parent.height - panel.panelHeight
--        background: shell.background
--        pinLength: 4
--
--        onEntered: LightDM.Greeter.respond(passphrase);
--        onCancel: greeter.show()
--
--        Component.onCompleted: {
--            if (LightDM.Users.count == 1) {
--                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
--            }
--        }
++    InputFilterArea {
++        anchors.fill: parent
++        blockInput: !applicationFocused || launcher.shown
++                    || panel.indicators.shown || hud.shown
+     }
      Connections {
--        target: LightDM.Greeter
--
--        onShowPrompt: {
--            if (LightDM.Users.count == 1) {
--                // TODO: There's no better way for now to determine if its a PIN or a passphrase.
--                if (text == "PIN") {
--                    lockscreen.alphaNumeric = false
--                } else {
--                    lockscreen.alphaNumeric = true
--                }
--                lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
--                lockscreen.show();
--            }
--        }
--
--        onAuthenticationComplete: {
--            if (LightDM.Greeter.promptless) {
--                return;
--            }
--            if (LightDM.Greeter.authenticated) {
--                lockscreen.hide();
--            } else {
--                lockscreen.clear(true);
--            }
--        }
--    }
--
--    Greeter {
--        id: greeter
--        objectName: "greeter"
--
--        available: true
--        hides: [launcher, panel.indicators, hud]
--        shown: true
--
--        defaultBackground: shell.background
--
--        y: panel.panelHeight
--        width: parent.width
--        height: parent.height - panel.panelHeight
--
--        dragHandleWidth: shell.edgeSize
++        id: sessionConnection
++        target: SessionManager
          property var previousMainApp: null
          property var previousSideApp: null
          function removeApplicationFocus() {
--            greeter.previousMainApp = applicationManager.mainStageFocusedApplication;
--            greeter.previousSideApp = applicationManager.sideStageFocusedApplication;
++            sessionConnection.previousMainApp = applicationManager.mainStageFocusedApplication;
++            sessionConnection.previousSideApp = applicationManager.sideStageFocusedApplication;
              applicationManager.unfocusCurrentApplication();
+         }
          function restoreApplicationFocus() {
--            if (greeter.previousMainApp) {
--                applicationManager.focusApplication(greeter.previousMainApp);
--                greeter.previousMainApp = null;
++            if (sessionConnection.previousMainApp) {
++                applicationManager.focusApplication(sessionConnection.previousMainApp);
++                sessionConnection.previousMainApp = null;
+             }
--            if (greeter.previousSideApp) {
--                applicationManager.focusApplication(greeter.previousSideApp);
--                greeter.previousSideApp = null;
++            if (sessionConnection.previousSideApp) {
++                applicationManager.focusApplication(sessionConnection.previousSideApp);
++                sessionConnection.previousSideApp = null;
+             }
+         }
--        onShownChanged: {
--            if (shown) {
--                lockscreen.reset();
--                // If there is only one user, we start authenticating with that one here.
--                // If there are more users, the Greeter will handle that
--                if (LightDM.Users.count == 1) {
--                    LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
--                }
--                greeter.forceActiveFocus();
++        onActiveChanged: {
++            if (SessionManager.active) {
++                restoreApplicationFocus();
++            } else {
                  removeApplicationFocus();
--            } else {
--                restoreApplicationFocus();
--            }
--        }
--
--        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);
--        }
--
--        onLeftTeaserPressedChanged: {
--            if (leftTeaserPressed) {
--                launcher.tease();
--            }
--        }
--
--        Connections {
--            target: applicationManager
--            ignoreUnknownSignals: true
--            // If any app is focused when greeter is open, it's due to a user action
--            // like a snap decision (say, an incoming call).
--            // TODO: these should be protected to only unlock for certain applications / certain usecases
--            // potentially only in connection with a notification.
--            onMainStageFocusedApplicationChanged: {
--                if (greeter.shown && applicationManager.mainStageFocusedApplication) {
--                    greeter.previousMainApp = null // make way for new focused app
--                    greeter.previousSideApp = null
--                    greeter.hide()
--                }
--            }
--            onSideStageFocusedApplicationChanged: {
--                if (greeter.shown && applicationManager.sideStageFocusedApplication) {
--                    greeter.previousMainApp = null // make way for new focused app
--                    greeter.previousSideApp = null
--                    greeter.hide()
--                }
--            }
--        }
--    }
--
--    InputFilterArea {
--        anchors.fill: parent
--        blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
--                    || panel.indicators.shown || hud.shown
++            }
++        }
+     }
      Connections {
@@ -534,7 +393,7 @@
              // We ignore any display-off signals when the proximity sensor
              // is active.  This usually indicates something like a phone call.
              if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {
--                greeter.showNow();
++                SessionManager.lock();
+             }
              // No reason to chew demo CPU when user isn't watching
@@ -546,17 +405,12 @@
+         }
+     }
--    function showHome() {
--        var animate = !greeter.shown && !stages.shown
--        greeter.hide()
++    function showHome(fromLauncher) {
++        var animate = fromLauncher && !stages.shown
          dash.setCurrentScope("clickscope", animate, false)
          stages.hide()
+     }
--    function hideIndicatorMenu(delay) {
--        panel.hideIndicatorMenu(delay);
--    }
--
      Item {
          id: overlay
@@ -572,7 +426,7 @@
                  contentEnabled: edgeDemo.panelContentEnabled
+             }
              fullscreenMode: shell.fullscreenMode
--            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
++            searchVisible: dash.shown && dash.searchable
              InputFilterArea {
                  anchors {
@@ -591,7 +445,7 @@
              width: parent.width > units.gu(60) ? units.gu(40) : parent.width
              height: parent.height
--            available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown && edgeDemo.dashEnabled
++            available: !panel.indicators.shown && edgeDemo.dashEnabled
              shown: false
              showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }
              hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }
@@ -646,14 +500,14 @@
              anchors.bottom: parent.bottom
              width: parent.width
              dragAreaWidth: shell.edgeSize
--            available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
--
++            available: edgeDemo.launcherEnabled
              onShowDashHome: {
                  if (edgeDemo.running)
                      return;
--                showHome()
++                showHome(true)
+             }
++
              onDash: {
                  if (stages.shown) {
                      stages.hide();
@@ -665,7 +519,6 @@
                  if (edgeDemo.running)
                      return;
--                greeter.hide()
                  shell.activateApplication(appId)
+             }
              onShownChanged: {
@@ -711,9 +564,6 @@
+         }
+     }
--    focus: true
--    onFocusChanged: if (!focus) forceActiveFocus();
--
      InputFilterArea {
          anchors {
              top: parent.top
@@ -734,12 +584,6 @@
          blockInput: true
+     }
--    Binding {
--        target: i18n
--        property: "domain"
--        value: "unity8"
--    }
--
      OSKController {
          anchors.topMargin: panel.panelHeight
          anchors.fill: parent // as needs to know the geometry of the shell
@@ -771,7 +615,6 @@
      EdgeDemo {
          id: edgeDemo
--        greeter: greeter
          launcher: launcher
          dash: dash
          indicators: panel.indicators
@@ -780,6 +623,6 @@
      Connections {
          target: SessionBroadcast
--        onShowHome: showHome()
++        onShowHome: showHome(false)
+     }
+ }
 === added file 'qml/graphics/dropshadow_left@20.png'
 Binary files qml/graphics/dropshadow_left@20.png	1970-01-01 00:00:00 +0000 and qml/graphics/dropshadow_left@20.png	2014-03-27 20:58:22 +0000 differ
 === renamed file 'qml/Hud/graphics/dropshadow_right@20.png' => 'qml/graphics/dropshadow_right@20.png'
 === modified file 'run'
 --- run	2013-12-17 14:56:25 +0000
 +++ run	2014-03-27 20:58:22 +0000
@@ -18,13 +18,14 @@
      echo " -p, --pinlock Use a pin protected user." >&2
      echo " -k, --keylock Use a passphrase protected user." >&2
      echo " -g, --gdb Run through gdb." >&2
++    echo " -G, --greeter  Run the greeter instead of the shell." >&2
      echo " -h, --help Show this help." >&2
      echo " -m, --nomousetouch Run without -mousetouch argument." >&2
      echo >&2
      exit 1
+ }
--ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,help,nomousetouch" -o "fpkghm" -- "$@"`
++ARGS=`getopt -n$0 -u -a --longoptions="fake,pinlock,keylock,gdb,greeter,help,nomousetouch" -o "fpkgGhm" -- "$@"`
  [ $? -ne 0 ] && usage
  eval set -- "$ARGS"
@@ -35,6 +36,7 @@
         -p|--pinlock)  PINLOCK=true;;
         -k|--keylock)  KEYLOCK=true;;
         -g|--gdb)   GDB=true;;
++       -G|--greeter)  QML_PHONE_SHELL_PATH=./builddir/src/unity8-greeter;;
         -h|--help)  usage;;
         -m|--nomousetouch)  MOUSE_TOUCH=false;;
         --)         shift;break;;
@@ -44,17 +46,17 @@
  if $FAKE; then
    export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
--  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single
++  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single
  fi
  if $PINLOCK; then
    export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
--  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-pin
++  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single-pin
  fi
  if $KEYLOCK; then
    export QML2_IMPORT_PATH=$QML2_IMPORT_PATH:$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
--  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase
++  export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/liblightdm/single-passphrase
  fi
  # Force icon theme if running on the desktop, otherwise gnome theme (if running
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2014-01-09 08:59:44 +0000
 +++ src/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -15,24 +15,36 @@
      ${CMAKE_SOURCE_DIR}/tests/*.svg
+ )
--add_executable(${SHELL_APP}
++set(COMMON_SRCS
      ApplicationArguments.h
      main.cpp
      MouseTouchAdaptor.cpp
      ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
--)
++    )
++add_executable(${SHELL_APP} ${COMMON_SRCS})
++add_executable(${GREETER_APP} ${COMMON_SRCS})
++
++set_target_properties(${SHELL_APP} PROPERTIES
++    COMPILE_DEFINITIONS "UNITY8_GREETER=0"
++    )
++set_target_properties(${GREETER_APP} PROPERTIES
++    COMPILE_DEFINITIONS "UNITY8_GREETER=1"
++    )
  qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
++qt5_use_modules(${GREETER_APP} Gui Qml Quick Test)
  pkg_check_modules(XCB REQUIRED xcb)
  if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
      set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
++    set_target_properties(${GREETER_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
      target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
++    target_link_libraries(${GREETER_APP} ${XCB_LDFLAGS})
  endif()
  # install binaries
--install(TARGETS ${SHELL_APP}
++install(TARGETS ${SHELL_APP} ${GREETER_APP}
       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+      )
 === modified file 'src/main.cpp'
 --- src/main.cpp	2014-03-05 12:52:57 +0000
 +++ src/main.cpp	2014-03-27 20:58:22 +0000
@@ -20,6 +20,7 @@
  // Qt
  #include <QtQuick/QQuickView>
  #include <QtGui/QGuiApplication>
++#include <QtGui/QScreen>
  #include <QtQml/QQmlEngine>
  #include <QtQml/QQmlContext>
  #include <qpa/qplatformnativeinterface.h>
@@ -41,7 +42,7 @@
+ {
      const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";
--    QGuiApplication::setApplicationName("Unity 8");
++    QGuiApplication::setApplicationName(UNITY8_GREETER ? "Unity 8 Greeter" : "Unity 8");
      QGuiApplication *application;
      if (isUbuntuMirServer) {
          QLibrary unityMir("unity-mir", 1);
@@ -61,7 +62,7 @@
      QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");
      if (indicatorProfile.isEmpty()) {
--        indicatorProfile = "phone";
++        indicatorProfile = UNITY8_GREETER ? "phone_greeter" : "phone";
+     }
      resolveIconTheme();
@@ -115,7 +116,7 @@
      nativeInterface->setProperty("ubuntuSessionType", 1);
      view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
--    QUrl source(::qmlDirectory()+"Shell.qml");
++    QUrl source(::qmlDirectory() + (UNITY8_GREETER ? "GreeterShell.qml" : "Shell.qml"));
      prependImportPaths(view->engine(), ::overrideImportPaths());
      appendImportPaths(view->engine(), ::fallbackImportPaths());
@@ -123,12 +124,23 @@
          QStringList importPaths = view->engine()->importPathList();
          importPaths.replaceInStrings(QRegExp("qt5/imports$"), "qt5/imports/Unity-Mir");
          view->engine()->setImportPathList(importPaths);
++
++#if UNITY8_GREETER
++        // Add alpha to surface, so that the greeter can bleed through
++        QSurfaceFormat format;
++        format.setAlphaBufferSize(8);
++        view->setFormat(format);
++#endif
+     }
      view->setSource(source);
--    view->setColor("transparent");
++    view->setColor(Qt::transparent);
      if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || args.contains(QLatin1String("-fullscreen"))) {
++        // First, size window equal to screen (fake a real WM fullscreen mode).
++        // Then, in case we are actually running inside a windowing system,
++        // nicely set actual WM fullscreen hint for its benefit.
++        view->resize(view->screen()->size());
          view->showFullScreen();
      } else {
          view->show();
 === modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
 --- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-02-05 19:14:49 +0000
 +++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-03-27 20:58:22 +0000
@@ -21,7 +21,6 @@
  from __future__ import absolute_import
--from unity8.process_helpers import unlock_unity
  from unity8.shell import disable_qml_mocking
  from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
@@ -75,8 +74,7 @@
      @disable_qml_mocking
      def test_can_launch_application(self):
          """Must be able to launch an application."""
--        unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
++        self.launch_unity()
          app = self._launch_app("messaging-app")
@@ -89,8 +87,7 @@
      @disable_qml_mocking
      def test_can_launch_multiple_applications(self):
          """A second application launched must be focused."""
--        unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
++        self.launch_unity()
          self._launch_app("messaging-app")
          self.assertThat(
@@ -110,8 +107,7 @@
          brought back to the focused state.
          """
--        unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
++        self.launch_unity()
          self._launch_app("messaging-app")
          self.assertThat(
 === modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py'
 --- tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-02-24 19:56:26 +0000
 +++ tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py	2014-03-27 20:58:22 +0000
@@ -55,7 +55,6 @@
          self._qml_mock_enabled = False
          self._data_dirs_mock_enabled = False
          unity_proxy = self.launch_unity()
--        process_helpers.unlock_unity(unity_proxy)
      def create_test_application(self):
          fake_application = fixture_setup.FakeApplication(self.test_qml)
 === modified file 'tests/autopilot/unity8/indicators/tests/test_indicators.py'
 --- tests/autopilot/unity8/indicators/tests/test_indicators.py	2013-12-05 20:58:30 +0000
 +++ tests/autopilot/unity8/indicators/tests/test_indicators.py	2014-03-27 20:58:22 +0000
@@ -22,7 +22,6 @@
  from autopilot import platform
  from testtools import skipIf
--from unity8.process_helpers import unlock_unity
  from unity8.shell.tests import UnityTestCase
@@ -45,6 +44,5 @@
      def test_indicator_exists(self):
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          indicator = self.main_window.get_indicator(self.indicator_name)
          self.assertIsNotNone(indicator)
 === modified file 'tests/autopilot/unity8/process_helpers.py'
 --- tests/autopilot/unity8/process_helpers.py	2014-02-23 01:46:02 +0000
 +++ tests/autopilot/unity8/process_helpers.py	2014-03-27 20:58:22 +0000
@@ -32,63 +32,6 @@
  class CannotAccessUnity(Exception):
      pass
--
--def unlock_unity(unity_proxy_obj=None):
--    """Helper function that attempts to unlock the unity greeter.
--
--    If unity_proxy_object is None create a proxy object by querying for the
--    running unity process.
--    Otherwise re-use the passed proxy object.
--
--    :raises RuntimeError: if the greeter attempts and fails to be unlocked.
--
--    :raises RuntimeWarning: when the greeter cannot be found because it is
--      already unlocked.
--    :raises CannotAccessUnity: if unity is not introspectable or cannot be
--      found on dbus.
--    :raises CannotAccessUnity: if unity's upstart status is not "start" or the
--      upstart job cannot be found at all.
--
--    """
--    if unity_proxy_obj is None:
--        try:
--            pid = _get_unity_pid()
--            unity = _get_unity_proxy_object(pid)
--            main_window = unity.select_single(main_window_emulator.QQuickView)
--        except ProcessSearchError as e:
--            raise CannotAccessUnity(
--                "Cannot introspect unity, make sure that it has been started "
--                "with testability. Perhaps use the function "
--                "'restart_unity_with_testability' this module provides."
--                "(%s)"
--                % str(e)
--            )
--    else:
--        main_window = unity_proxy_obj.select_single(
--            main_window_emulator.QQuickView)
--
--    greeter = main_window.get_greeter()
--    if greeter.created == False:
--        raise RuntimeWarning("Greeter appears to be already unlocked.")
--
--    # Because of potential input jerkiness under heavy load,
--    # retry unlocking the greeter two times.
--    # https://bugs.launchpad.net/ubuntu/+bug/1260113
--
--    retries = 3
--    while retries > 0:
--        try:
--            greeter.swipe()
--        except AssertionError:
--            retries -= 1
--            if retries == 0:
--                raise
--            logger.info("Failed to unlock greeter, trying again...")
--        else:
--            logger.info("Greeter unlocked, continuing.")
--            break
--
--
  def restart_unity_with_testability(*args):
      """Restarts (or starts) unity with testability enabled.
 === modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
 --- tests/autopilot/unity8/shell/tests/__init__.py	2014-03-05 09:45:28 +0000
 +++ tests/autopilot/unity8/shell/tests/__init__.py	2014-03-27 20:58:22 +0000
@@ -249,9 +249,9 @@
                  "%s=%s" % (key, value)
              ], stderr=subprocess.STDOUT)
--    def launch_unity(self, **kwargs):
++    def _launch(self, executable, ready_func, **kwargs):
          """Launch the unity shell, return a proxy object for it."""
--        binary_path = get_binary_path()
++        binary_path = get_binary_path(executable)
          lib_path = get_lib_path()
          logger.info(
@@ -293,11 +293,19 @@
          # Ensure that the dash is visible before we return:
          logger.debug("Unity started, waiting for it to be ready.")
--        self.assertUnityReady()
++        ready_func()
          logger.debug("Unity loaded and ready.")
          return app_proxy
++    def launch_unity(self, **kwargs):
++        """Launch the unity shell, return a proxy object for it."""
++        return self._launch("unity8", self.assertUnityReady, **kwargs)
++
++    def launch_greeter(self, **kwargs):
++        """Launch the unity shell, return a proxy object for it."""
++        return self._launch("unity8-greeter", self.assertGreeterReady, **kwargs)
++
      def _launch_unity_with_upstart(self, binary_path, args):
          logger.info("Starting unity")
          self._patch_environment("QT_LOAD_TESTABILITY", 1)
@@ -344,7 +352,7 @@
      def _get_lightdm_mock_path(self, mock_type):
          lib_path = get_mocks_library_path()
          lightdm_mock_path = os.path.abspath(
--            os.path.join(lib_path, "LightDM", mock_type)
++            os.path.join(lib_path, "liblightdm", mock_type)
+         )
          if not os.path.exists(lightdm_mock_path):
@@ -386,6 +394,10 @@
+         )
          self.assertThat(home_scope.isCurrent, Eventually(Equals(True)))
++    def assertGreeterReady(self):
++        greeter = self.main_window.get_greeter()
++        self.assertThat(greeter.created, Eventually(Equals(True)))
++
      def get_dash(self):
          dash = self._proxy.wait_select_single(Dash)
          return dash
 === modified file 'tests/autopilot/unity8/shell/tests/disabled_test_hud.py'
 --- tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-03-17 11:44:05 +0000
 +++ tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-03-27 20:58:22 +0000
@@ -19,8 +19,7 @@
  from __future__ import absolute_import
--from unity8.process_helpers import unlock_unity
--from unity8.shell import with_lightdm_mock, DragMixin
++from unity8.shell import DragMixin
  from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
  from testtools.matchers import Equals
@@ -40,7 +39,6 @@
          """
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          hud_show_button = self.main_window.get_hud_show_button()
          edge_drag_area = self.main_window.get_hud_edge_drag_area()
          hud = self.main_window.get_hud()
@@ -81,7 +79,6 @@
          """
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          hud_show_button = self.main_window.get_hud_show_button()
          hud = self.main_window.get_hud()
@@ -117,7 +114,6 @@
      def test_hide_hud_click(self):
          """Tapping the close button of the Hud must dismiss it."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          hud = self.main_window.get_hud()
          self._launch_test_app_from_app_screen()
@@ -134,7 +130,6 @@
          """
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          hud = self.main_window.get_hud()
          self._launch_test_app_from_app_screen()
@@ -151,7 +146,6 @@
      def test_launcher_hides_hud(self):
          """Opening the Launcher while the Hud is active must close the Hud."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          hud = self.main_window.get_hud()
          launcher = self.main_window.get_launcher()
 === modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
 --- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-03-17 10:42:57 +0000
 +++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-03-27 20:58:22 +0000
@@ -46,7 +46,6 @@
      def setUp(self):
          super(DashBaseTestCase, self).setUp()
          unity_proxy = self.launch_unity()
--        process_helpers.unlock_unity(unity_proxy)
          self.dash = self.main_window.get_dash()
 === modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
 --- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-02-22 00:12:49 +0000
 +++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2014-03-27 20:58:22 +0000
@@ -20,7 +20,6 @@
  from __future__ import absolute_import
--from unity8.process_helpers import unlock_unity
  from unity8.shell import with_lightdm_mock
  from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
@@ -47,41 +46,41 @@
      @with_lightdm_mock("single-pin")
      def test_can_unlock_pin_screen(self):
          """Must be able to unlock the PIN entry lock screen."""
--        unity_proxy = self.launch_unity()
++        self.launch_greeter()
          greeter = self.main_window.get_greeter()
          if greeter.narrowMode:
--            unlock_unity(unity_proxy)
++            greeter.swipe()
              lockscreen = self._wait_for_lockscreen()
              self._enter_pincode("1234")
              self.assertThat(lockscreen.shown, Eventually(Equals(False)))
          else:
              self._enter_prompt_passphrase("1234")
--            self.assertThat(greeter.shown, Eventually(Equals(False)))
++            self.assertThat(greeter.enabled, Eventually(Equals(False)))
      @with_lightdm_mock("single-passphrase")
      def test_can_unlock_passphrase_screen(self):
          """Must be able to unlock the passphrase entry screen."""
--        unity_proxy = self.launch_unity()
++        self.launch_greeter()
          greeter = self.main_window.get_greeter()
          if greeter.narrowMode:
--            unlock_unity(unity_proxy)
++            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.enabled, Eventually(Equals(False)))
      @with_lightdm_mock("single-pin")
      def test_pin_screen_wrong_code(self):
          """Entering the wrong pin code must not dismiss the lock screen."""
--        unity_proxy = self.launch_unity()
++        self.launch_greeter()
          greeter = self.main_window.get_greeter()
          if greeter.narrowMode:
--            unlock_unity(unity_proxy)
++            greeter.swipe()
              lockscreen = self._wait_for_lockscreen()
              self._enter_pincode("4321")
              pinentryField = self.main_window.get_pinentryField()
@@ -91,16 +90,16 @@
              self._enter_prompt_passphrase("4231")
              prompt = self.main_window.get_greeter().get_prompt()
              self.assertThat(prompt.text, Eventually(Equals("")))
--            self.assertThat(greeter.shown, Eventually(Equals(True)))
++            self.assertThat(greeter.enabled, Eventually(Equals(True)))
      @with_lightdm_mock("single-passphrase")
      def test_passphrase_screen_wrong_password(self):
          """Entering the wrong password must not dismiss the lock screen."""
--        unity_proxy = self.launch_unity()
++        self.launch_greeter()
          greeter = self.main_window.get_greeter()
          if greeter.narrowMode:
--            unlock_unity(unity_proxy)
++            greeter.swipe()
              lockscreen = self._wait_for_lockscreen()
              self._enter_pin_passphrase("foobar")
              pinentryField = self.main_window.get_pinentryField()
@@ -110,7 +109,7 @@
              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.enabled, Eventually(Equals(True)))
      def _wait_for_lockscreen(self):
          """Wait for the lock screen to load, and return it."""
 === modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
 --- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-03-12 11:24:54 +0000
 +++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-03-27 20:58:22 +0000
@@ -21,7 +21,6 @@
  from __future__ import absolute_import
--from unity8.process_helpers import unlock_unity
  from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
  from testtools.matchers import Equals, NotEquals
@@ -123,7 +122,6 @@
      def test_interactive(self):
          """Interactive notification must react upon click on itself."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
@@ -162,7 +160,6 @@
          """Rejecting a call should make notification expand and
              offer more options."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          summary = "Incoming call"
          body = "Frank Zappa\n+44 (0)7736 027340"
@@ -339,7 +336,6 @@
      def test_icon_summary_body(self):
          """Notification must display the expected summary and body text."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
@@ -379,7 +375,6 @@
          """Notification must display the expected summary and secondary
          icon."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
@@ -417,7 +412,6 @@
          """Notifications must be displayed in order according to their
          urgency."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
@@ -504,7 +498,6 @@
      def test_summary_and_body(self):
          """Notification must display the expected summary- and body-text."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
@@ -529,7 +522,6 @@
      def test_summary_only(self):
          """Notification must display only the expected summary-text."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
@@ -547,7 +539,6 @@
          """Notification must allow updating its contents while being
          displayed."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
@@ -585,7 +576,6 @@
          """Notification must allow updating its contents and layout while
          being displayed."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
@@ -631,7 +621,6 @@
      def test_append_hint(self):
          """Notification has to accumulate body-text using append-hint."""
          unity_proxy = self.launch_unity()
--        unlock_unity(unity_proxy)
          notify_list = self._get_notifications_list()
 === modified file 'tests/mocks/AccountsService/AccountsService.cpp'
 --- tests/mocks/AccountsService/AccountsService.cpp	2014-02-20 20:14:40 +0000
 +++ tests/mocks/AccountsService/AccountsService.cpp	2014-03-27 20:58:22 +0000
@@ -45,6 +45,15 @@
      Q_UNUSED(demoEdges)
+ }
++bool AccountsService::demoEdgesForCurrentUser() const
++{
++    return false;
++}
++
++void AccountsService::setDemoEdgesForCurrentUser(bool)
++{
++}
++
  QString AccountsService::backgroundFile() const
+ {
      return m_backgroundFile;
 === modified file 'tests/mocks/AccountsService/AccountsService.h'
 --- tests/mocks/AccountsService/AccountsService.h	2013-09-24 18:50:56 +0000
 +++ tests/mocks/AccountsService/AccountsService.h	2014-03-27 20:58:22 +0000
@@ -35,6 +35,10 @@
                  READ demoEdges
                  WRITE setDemoEdges
                  NOTIFY demoEdgesChanged)
++    Q_PROPERTY (bool demoEdgesForCurrentUser
++                READ demoEdgesForCurrentUser
++                WRITE setDemoEdgesForCurrentUser
++                NOTIFY demoEdgesForCurrentUserChanged)
      Q_PROPERTY (QString backgroundFile
                  READ backgroundFile
                  WRITE setBackgroundFile // only available in mock
@@ -51,6 +55,8 @@
      void setUser(const QString &user);
      bool demoEdges() const;
      void setDemoEdges(bool demoEdges);
++    bool demoEdgesForCurrentUser() const;
++    void setDemoEdgesForCurrentUser(bool demoEdgesForCurrentUser);
      QString backgroundFile() const;
      void setBackgroundFile(const QString &backgroundFile);
      bool statsWelcomeScreen() const;
@@ -59,6 +65,7 @@
  Q_SIGNALS:
      void userChanged();
      void demoEdgesChanged();
++    void demoEdgesForCurrentUserChanged();
      void backgroundFileChanged();
      void statsWelcomeScreenChanged();
 === modified file 'tests/mocks/CMakeLists.txt'
 --- tests/mocks/CMakeLists.txt	2013-11-14 11:48:33 +0000
 +++ tests/mocks/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -1,10 +1,11 @@
  add_subdirectory(AccountsService)
  add_subdirectory(GSettings.1.0)
  add_subdirectory(HudClient)
++add_subdirectory(liblightdm)
  add_subdirectory(libusermetrics)
--add_subdirectory(LightDM)
  add_subdirectory(Powerd)
  add_subdirectory(QMenuModel)
++add_subdirectory(SessionManager)
  add_subdirectory(Ubuntu)
  add_subdirectory(Unity)
  add_subdirectory(QtMultimedia)
 === removed directory 'tests/mocks/LightDM/demo'
 === removed file 'tests/mocks/LightDM/demo/CMakeLists.txt'
 --- tests/mocks/LightDM/demo/CMakeLists.txt	2013-12-13 01:02:53 +0000
 +++ tests/mocks/LightDM/demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
--pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)
--
--set(LibLightDM_SOURCES
--    ../Greeter.cpp
--    ../UsersModel.cpp
--    GreeterPrivate.cpp
--    UsersModelPrivate.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
--    )
--
--add_library(MockLightDM-demo STATIC ${LibLightDM_SOURCES})
--
--include_directories(
--    ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
--)
--
--target_link_libraries(MockLightDM-demo
--    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
--    )
--
--qt5_use_modules(MockLightDM-demo Gui)
 === removed file 'tests/mocks/LightDM/demo/GreeterPrivate.cpp'
 --- tests/mocks/LightDM/demo/GreeterPrivate.cpp	2014-01-29 19:04:20 +0000
 +++ tests/mocks/LightDM/demo/GreeterPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
--/*
-- * Copyright (C) 2013 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../Greeter.h"
--#include "../GreeterPrivate.h"
--#include <QtCore/QDir>
--#include <QtCore/QSettings>
--
--namespace QLightDM
--{
--
--GreeterPrivate::GreeterPrivate(Greeter* parent)
--  : authenticated(false),
--    authenticationUser(),
--    q_ptr(parent)
--{
--}
--
--void GreeterPrivate::handleAuthenticate()
--{
--    Q_Q(Greeter);
--
--    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
--    settings.beginGroup(authenticationUser);
--    QVariant password = settings.value("password", "none");
--
--    if (password == "pin") {
--        Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);
--    } else if (password == "keyboard") {
--        Q_EMIT q->showPrompt("Password", Greeter::PromptTypeSecret);
--    } else {
--        authenticated = true;
--        Q_EMIT q->authenticationComplete();
--    }
--}
--
--void GreeterPrivate::handleRespond(const QString &response)
--{
--    Q_Q(Greeter);
--
--    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
--    settings.beginGroup(authenticationUser);
--    QVariant password = settings.value("password", "none");
--
--    QString passwordValue;
--    if (password == "pin") {
--        passwordValue = settings.value("passwordValue", "1234").toString();
--    } else {
--        passwordValue = settings.value("passwordValue", "password").toString();
--    }
--    authenticated = (response == passwordValue);
--    Q_EMIT q->authenticationComplete();
--}
--
--}
 === removed file 'tests/mocks/LightDM/demo/UsersModelPrivate.cpp'
 --- tests/mocks/LightDM/demo/UsersModelPrivate.cpp	2014-02-04 14:38:00 +0000
 +++ tests/mocks/LightDM/demo/UsersModelPrivate.cpp	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
--/*
-- * Copyright (C) 2013 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
-- */
--
--#include "../UsersModelPrivate.h"
--
--#include <QDir>
--#include <QSettings>
--#include <QStringList>
--
--namespace QLightDM
--{
--
--UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
--  : q_ptr(parent)
--{
--    QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);
--    QStringList users = settings.value("users", QStringList() << "phablet").toStringList();
--
--    Q_FOREACH(const QString &user, users)
--    {
--        QString name = settings.value(user + "/name", user[0].toUpper() + user.mid(1)).toString();
--        entries.append({user, name, 0, 0, false, false, 0, 0});
--    }
--}
--
--}
 === removed file 'tests/mocks/LightDM/qmldir'
 --- tests/mocks/LightDM/qmldir	2013-06-05 22:03:08 +0000
 +++ tests/mocks/LightDM/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
--module LightDM
--plugin MockLightDM-qml
 === added directory 'tests/mocks/SessionManager'
 === added file 'tests/mocks/SessionManager/CMakeLists.txt'
 --- tests/mocks/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionManager/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -0,0 +1,19 @@
++add_library(MockSessionManager-qml MODULE
++    plugin.cpp
++    SessionManager.cpp
++    )
++
++qt5_use_modules(MockSessionManager-qml Qml)
++
++# copy qmldir file into build directory for shadow builds
++file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
++    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
++    )
++
++install(TARGETS MockSessionManager-qml
++    DESTINATION ${SHELL_INSTALL_QML}/mocks/SessionManager
++    )
++
++install(FILES qmldir
++    DESTINATION ${SHELL_INSTALL_QML}/mocks/SessionManager
++    )
 === added file 'tests/mocks/SessionManager/SessionManager.cpp'
 --- tests/mocks/SessionManager/SessionManager.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionManager/SessionManager.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,43 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "SessionManager.h"
++
++SessionManager::SessionManager(QObject* parent)
++  : QObject(parent),
++    m_active(true)
++{
++}
++
++bool SessionManager::active() const
++{
++    return m_active;
++}
++
++void SessionManager::setActive(bool active)
++{
++    if (m_active != active) {
++        m_active = active;
++        activeChanged();
++    }
++}
++
++void SessionManager::lock()
++{
++    setActive(false);
++}
 === added file 'tests/mocks/SessionManager/SessionManager.h'
 --- tests/mocks/SessionManager/SessionManager.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionManager/SessionManager.h	2014-03-27 20:58:22 +0000
@@ -0,0 +1,49 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors: Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef UNITY_MOCK_SESSIONMANAGER_H
++#define UNITY_MOCK_SESSIONMANAGER_H
++
++#include <QObject>
++
++class SessionManager: public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(bool active
++               READ active
++               WRITE setActive // Only in mock
++               NOTIFY activeChanged
++               FINAL)
++
++public:
++    explicit SessionManager(QObject *parent = 0);
++
++    bool active() const;
++    void setActive(bool active);
++
++public Q_SLOTS:
++    void lock();
++
++Q_SIGNALS:
++    void activeChanged();
++
++private:
++    bool m_active;
++};
++
++#endif
 === added file 'tests/mocks/SessionManager/plugin.cpp'
 --- tests/mocks/SessionManager/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionManager/plugin.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "plugin.h"
++#include "SessionManager.h"
++#include <QtQml/qqml.h>
++
++static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(engine)
++    Q_UNUSED(scriptEngine)
++    return new SessionManager();
++}
++
++void SessionManagerPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("SessionManager"));
++    qmlRegisterSingletonType<SessionManager>(uri, 0, 1, "SessionManager", sessionmanager_provider);
++}
 === added file 'tests/mocks/SessionManager/plugin.h'
 --- tests/mocks/SessionManager/plugin.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionManager/plugin.h	2014-03-27 20:58:22 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors: Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef MOCK_SESSIONMANAGER_PLUGIN_H
++#define MOCK_SESSIONMANAGER_PLUGIN_H
++
++#include <QQmlEngine>
++#include <QQmlExtensionPlugin>
++
++class SessionManagerPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri);
++};
++
++#endif
 === added file 'tests/mocks/SessionManager/qmldir'
 --- tests/mocks/SessionManager/qmldir	1970-01-01 00:00:00 +0000
 +++ tests/mocks/SessionManager/qmldir	2014-03-27 20:58:22 +0000
@@ -0,0 +1,2 @@
++module SessionManager
++plugin MockSessionManager-qml
 === renamed directory 'tests/mocks/LightDM' => 'tests/mocks/liblightdm'
 === modified file 'tests/mocks/liblightdm/CMakeLists.txt'
 --- tests/mocks/LightDM/CMakeLists.txt	2014-01-14 21:01:28 +0000
 +++ tests/mocks/liblightdm/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -1,57 +1,4 @@
--# This is a copy of the normal LightDM plugin, but instead of statically
--# linking in the lightdm bits, this one uses shared libraries so we can swap
--# out different sets of users for different tests.  When we finally switch to
--# actually using the system liblightdm in the normal plugin, this version can
--# be deleted.
--
--add_subdirectory(demo)
  add_subdirectory(full)
  add_subdirectory(single)
  add_subdirectory(single-pin)
  add_subdirectory(single-passphrase)
--
--include_directories(
--    ${CMAKE_CURRENT_SOURCE_DIR}
--    ${CMAKE_CURRENT_BINARY_DIR}
--    ${CMAKE_SOURCE_DIR}/plugins/Utils
--    ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
--)
--
--set(QMLPLUGIN_SRC
--    ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/LightDM/plugin.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Utils/qsortfilterproxymodelqml.cpp
--    )
--
--add_library(MockLightDM-qml MODULE
--    ${QMLPLUGIN_SRC}
--    )
--
--# We want to link to liblightdm-qt5-2, but we don't want to depend on it being
--# installed on the system.  So we make sure we link to our full fake version
--# At run time, we can point to whichever version we happen to be using via
--# LD_LIBRARY_PATH.
--add_dependencies(MockLightDM-qml MockLightDM-full MockUserMetrics)
--target_link_libraries(MockLightDM-qml
--    -L${CMAKE_CURRENT_BINARY_DIR}/full
--    -llightdm-qt5-2
--    -L${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
--    -lusermetricsoutput
--    )
--
--qt5_use_modules(MockLightDM-qml DBus Gui Qml)
--
--# copy qmldir file into build directory for shadow builds
--file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
--    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
--    )
--
--install(TARGETS MockLightDM-qml
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM
--    )
--
--install(FILES qmldir
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM
--    )
 === modified file 'tests/mocks/liblightdm/full/CMakeLists.txt'
 --- tests/mocks/LightDM/full/CMakeLists.txt	2013-11-25 17:26:15 +0000
 +++ tests/mocks/liblightdm/full/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -11,8 +11,9 @@
  qt5_use_modules(MockLightDM-full Gui)
  set_target_properties(MockLightDM-full PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
++                      OUTPUT_NAME lightdm-qt5-3
++                      SOVERSION 0)
  install(TARGETS MockLightDM-full
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/full
++    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/full
+     )
 === modified file 'tests/mocks/liblightdm/single-passphrase/CMakeLists.txt'
 --- tests/mocks/LightDM/single-passphrase/CMakeLists.txt	2013-11-25 17:26:15 +0000
 +++ tests/mocks/liblightdm/single-passphrase/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -12,8 +12,9 @@
  qt5_use_modules(MockLightDM-single-passphrase Gui)
  set_target_properties(MockLightDM-single-passphrase PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
++                      OUTPUT_NAME lightdm-qt5-3
++                      SOVERSION 0)
  install(TARGETS MockLightDM-single-passphrase
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-passphrase
++    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single-passphrase
+     )
 === modified file 'tests/mocks/liblightdm/single-pin/CMakeLists.txt'
 --- tests/mocks/LightDM/single-pin/CMakeLists.txt	2013-11-25 17:26:15 +0000
 +++ tests/mocks/liblightdm/single-pin/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -12,8 +12,9 @@
  qt5_use_modules(MockLightDM-single-pin Gui)
  set_target_properties(MockLightDM-single-pin PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
++                      OUTPUT_NAME lightdm-qt5-3
++                      SOVERSION 0)
  install(TARGETS MockLightDM-single-pin
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single-pin
++    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single-pin
+     )
 === modified file 'tests/mocks/liblightdm/single/CMakeLists.txt'
 --- tests/mocks/LightDM/single/CMakeLists.txt	2013-11-25 17:26:15 +0000
 +++ tests/mocks/liblightdm/single/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -11,8 +11,9 @@
  qt5_use_modules(MockLightDM-single Gui)
  set_target_properties(MockLightDM-single PROPERTIES
--                      OUTPUT_NAME lightdm-qt5-2)
++                      OUTPUT_NAME lightdm-qt5-3
++                      SOVERSION 0)
  install(TARGETS MockLightDM-single
--    DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/single
++    DESTINATION ${SHELL_INSTALL_QML}/mocks/liblightdm/single
+     )
 === modified file 'tests/plugins/CMakeLists.txt'
 --- tests/plugins/CMakeLists.txt	2013-12-12 16:45:35 +0000
 +++ tests/plugins/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -1,6 +1,7 @@
  add_subdirectory(AccountsService)
++add_subdirectory(DashViews)
  add_subdirectory(LightDM)
--add_subdirectory(DashViews)
++add_subdirectory(SessionManager)
  add_subdirectory(Ubuntu)
  add_subdirectory(Unity)
  add_subdirectory(Utils)
 === modified file 'tests/plugins/LightDM/CMakeLists.txt'
 --- tests/plugins/LightDM/CMakeLists.txt	2014-01-14 21:01:28 +0000
 +++ tests/plugins/LightDM/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -1,3 +1,6 @@
++include(FindPkgConfig)
++pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)
++
  add_executable(test-lightdm-dbus
      dbus.cpp
      ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
@@ -7,19 +10,17 @@
  include_directories(
      ${CMAKE_CURRENT_BINARY_DIR}
      ${CMAKE_SOURCE_DIR}/plugins/LightDM
--    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
      ${LIBLIGHTDM_INCLUDE_DIRS}
+     )
  add_dependencies(test-lightdm-dbus MockLightDM-full)
  target_link_libraries(test-lightdm-dbus
--    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full
--    -llightdm-qt5-2
++    ${LIBLIGHTDM_LDFLAGS}
+     )
  add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
--add_custom_target(testLightDMDBus dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
++add_custom_target(testLightDMDBus dbus-launch env QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/plugins LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full ${CMAKE_CURRENT_BINARY_DIR}/test-lightdm-dbus)
  add_dependencies(testLightDMDBus test-lightdm-dbus)
  add_dependencies(qmluitests testLightDMDBus)
 === added directory 'tests/plugins/SessionManager'
 === added file 'tests/plugins/SessionManager/CMakeLists.txt'
 --- tests/plugins/SessionManager/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -0,0 +1,48 @@
++macro(make_dbus_class PREFIX SERVICE INTERFACE)
++    if (${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${INTERFACE}Adaptor.h)
++        execute_process(COMMAND qdbusxml2cpp -c ${PREFIX}${INTERFACE}Adaptor -a ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${INTERFACE}Adaptor ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml ${SERVICE}.${INTERFACE})
++    endif ()
++endmacro(make_dbus_class)
++
++make_dbus_class(LightDM org.freedesktop.DisplayManager Session)
++make_dbus_class(Login org.freedesktop.login1 Manager)
++make_dbus_class(Login org.freedesktop.login1 Session)
++make_dbus_class(Login org.freedesktop.DBus Properties)
++
++include_directories(
++    ${CMAKE_CURRENT_BINARY_DIR}
++    ${CMAKE_SOURCE_DIR}/plugins/SessionManager
++    )
++
++add_definitions(-DSM_BUSNAME=sessionBus)
++
++add_executable(sessionmanagermock
++    ${CMAKE_CURRENT_BINARY_DIR}/LightDMSessionAdaptor.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/LoginManagerAdaptor.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/LoginPropertiesAdaptor.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/LoginSessionAdaptor.cpp
++    server.cpp
++    LightDMSessionServer.cpp
++    LoginManagerServer.cpp
++    LoginSessionServer.cpp
++    )
++qt5_use_modules(sessionmanagermock Core DBus)
++
++add_executable(sessionmanagertest
++    ${CMAKE_SOURCE_DIR}/plugins/SessionManager/SessionManager.cpp
++    client.cpp
++    )
++qt5_use_modules(sessionmanagertest Core DBus Test)
++
++add_test(NAME sessionmanagertest
++    COMMAND env
++        XDG_SESSION_ID=sessionid
++        XDG_SESSION_PATH=/mocksession/lightdm
++        dbus-test-runner
++        --task ${CMAKE_CURRENT_BINARY_DIR}/sessionmanagermock
++        --task-name server
++        --ignore-return
++        --task ${CMAKE_CURRENT_BINARY_DIR}/sessionmanagertest
++        --task-name client
++        --wait-for org.freedesktop.login1
++    )
 === added file 'tests/plugins/SessionManager/LightDMSessionServer.cpp'
 --- tests/plugins/SessionManager/LightDMSessionServer.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/LightDMSessionServer.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,38 @@
++/*
++ * 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ *
++ * Authored by: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "LightDMSessionServer.h"
++
++LightDMSessionServer::LightDMSessionServer(LoginSessionServer *logind, QObject *parent)
++    : QObject(parent),
++      logind(logind)
++{
++}
++
++void LightDMSessionServer::Lock()
++{
++    // As a side effect of locking, change Active state of logind.
++    // Note that this will say Active is true while the Active property will be
++    // false.  This is intentional, as we don't want to keep any state in the
++    // mocks.  Having this signal side effect lets us test that lock() was
++    // actually called by the plugin as well as test the changed signal itself.
++    QVariantMap changes;
++    changes.insert("Active", QVariant(true));
++    Q_EMIT logind->PropertiesChanged("org.freedesktop.login1.Session", changes, QStringList());
++}
 === added file 'tests/plugins/SessionManager/LightDMSessionServer.h'
 --- tests/plugins/SessionManager/LightDMSessionServer.h	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/LightDMSessionServer.h	2014-03-27 20:58:22 +0000
@@ -0,0 +1,40 @@
++/*
++ * 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ *
++ * Authored by: Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef UNITY_LIGHTDMSESSIONSERVER_H
++#define UNITY_LIGHTDMSESSIONSERVER_H
++
++#include "LoginSessionServer.h"
++#include <QtCore/QObject>
++
++class LightDMSessionServer: public QObject
++{
++    Q_OBJECT
++
++public:
++    explicit LightDMSessionServer(LoginSessionServer *logind, QObject *parent = 0);
++
++public Q_SLOTS:
++    void Lock();
++
++private:
++    LoginSessionServer *logind;
++};
++
++#endif
 === added file 'tests/plugins/SessionManager/LoginManagerServer.cpp'
 --- tests/plugins/SessionManager/LoginManagerServer.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/LoginManagerServer.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,34 @@
++/*
++ * 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ *
++ * Authored by: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "LoginManagerServer.h"
++
++LoginManagerServer::LoginManagerServer(QObject *parent)
++    : QObject(parent)
++{
++}
++
++QDBusObjectPath LoginManagerServer::GetSession(const QString &id)
++{
++    if (id == "sessionid") {
++        return QDBusObjectPath("/mocksession/login1");
++    } else {
++        return QDBusObjectPath();
++    }
++}
 === added file 'tests/plugins/SessionManager/LoginManagerServer.h'
 --- tests/plugins/SessionManager/LoginManagerServer.h	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/LoginManagerServer.h	2014-03-27 20:58:22 +0000
@@ -0,0 +1,37 @@
++/*
++ * 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ *
++ * Authored by: Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef UNITY_LOGINMANAGERSERVER_H
++#define UNITY_LOGINMANAGERSERVER_H
++
++#include <QtCore/QObject>
++#include <QtDBus/QDBusObjectPath>
++
++class LoginManagerServer: public QObject
++{
++    Q_OBJECT
++
++public:
++    explicit LoginManagerServer(QObject *parent = 0);
++
++public Q_SLOTS:
++    QDBusObjectPath GetSession(const QString &id);
++};
++
++#endif
 === added file 'tests/plugins/SessionManager/LoginSessionServer.cpp'
 --- tests/plugins/SessionManager/LoginSessionServer.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/LoginSessionServer.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,25 @@
++/*
++ * 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ *
++ * Authored by: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "LoginSessionServer.h"
++
++LoginSessionServer::LoginSessionServer(QObject *parent)
++    : QObject(parent)
++{
++}
 === added file 'tests/plugins/SessionManager/LoginSessionServer.h'
 --- tests/plugins/SessionManager/LoginSessionServer.h	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/LoginSessionServer.h	2014-03-27 20:58:22 +0000
@@ -0,0 +1,39 @@
++/*
++ * 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ *
++ * Authored by: Michael Terry <michael.terry@canonical.com>
++ */
++
++#ifndef UNITY_LOGINSESSIONSERVER_H
++#define UNITY_LOGINSESSIONSERVER_H
++
++#include <QtCore/QObject>
++#include <QtCore/QStringList>
++#include <QtCore/QVariant>
++#include <QtCore/QVariantMap>
++
++class LoginSessionServer: public QObject
++{
++    Q_OBJECT
++
++public:
++    explicit LoginSessionServer(QObject *parent = 0);
++
++Q_SIGNALS:
++    void PropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
++};
++
++#endif
 === added file 'tests/plugins/SessionManager/client.cpp'
 --- tests/plugins/SessionManager/client.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/client.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,88 @@
++/*
++ * 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ *
++ * Authored by: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "SessionManager.h"
++#include <QtTest/QSignalSpy>
++#include <QtTest/QTest>
++
++
++// These tests assume the following behavior from our mock logind server:
++// * IsActive will return false
++// * Lock() will emit an ActiveChanged(true) signal
++//
++// This should lead to the following behavior from our SessionManager plugin:
++// * Starts active
++// * Becomes inactive once it connects to logind and sees IsActive result
++// * Becomes active once Lock() is called (which isn't really sensible, but
++//   it's just a mock)
++
++class SessionManagerTest : public QObject
++{
++    Q_OBJECT
++
++private Q_SLOTS:
++
++    void waitForChange(SessionManager *session)
++    {
++        // Wait 5 seconds for initial activeChanged signal
++        QSignalSpy spy(session, SIGNAL(activeChanged()));
++        int i = 0;
++        while (spy.count() == 0 && i++ < 50)
++            QTest::qWait(100);
++        QCOMPARE(spy.count(), 1);
++    }
++
++    void testAssumeActive()
++    {
++        // Test that active() starts as true before we connect to service
++        SessionManager session;
++        QCOMPARE(session.active(), true);
++    }
++
++    void testSafeLock()
++    {
++        // Test that lock() doesn't crash if used before we connect to service
++        // (i.e. just test that we're not being stupid about pointers)
++        SessionManager session;
++        session.lock();
++    }
++
++    void testInitialSignal()
++    {
++        // Test that we get notified of change once we connect to service
++        SessionManager session;
++        waitForChange(&session);
++        QCOMPARE(session.active(), false);
++    }
++
++    void testLock()
++    {
++        // Test that lock() gets called correctly and that we listen for
++        // the activeChanged signal too.
++        SessionManager session;
++        waitForChange(&session);
++        session.lock();
++        waitForChange(&session);
++        QCOMPARE(session.active(), true);
++    }
++};
++
++QTEST_MAIN(SessionManagerTest)
++
++#include "client.moc"
 === added file 'tests/plugins/SessionManager/interfaces.xml'
 --- tests/plugins/SessionManager/interfaces.xml	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/interfaces.xml	2014-03-27 20:58:22 +0000
@@ -0,0 +1,22 @@
++<node>
++  <interface name="org.freedesktop.login1.Manager">
++    <method name="GetSession">
++      <arg name="id" type="s" direction="in" />
++      <arg name="path" type="o" direction="out" />
++    </method>
++  </interface>
++  <interface name="org.freedesktop.login1.Session">
++    <property name="Active" type="b" access="read"/>
++  </interface>
++  <interface name="org.freedesktop.DBus.Properties">
++    <signal name="PropertiesChanged">
++      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
++      <arg name="interface" type="s" direction="out"/>
++      <arg name="changed" type="a{sv}" direction="out"/>
++      <arg name="invalid" type="as" direction="out"/>
++    </signal>
++  </interface>
++  <interface name="org.freedesktop.DisplayManager.Session">
++    <method name="Lock"/>
++  </interface>
++</node>
 === added file 'tests/plugins/SessionManager/server.cpp'
 --- tests/plugins/SessionManager/server.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/SessionManager/server.cpp	2014-03-27 20:58:22 +0000
@@ -0,0 +1,57 @@
++/*
++ * 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 version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ *
++ * Authored by: Michael Terry <michael.terry@canonical.com>
++ */
++
++#include "LightDMSessionAdaptor.h"
++#include "LightDMSessionServer.h"
++#include "LoginManagerAdaptor.h"
++#include "LoginManagerServer.h"
++#include "LoginPropertiesAdaptor.h"
++#include "LoginSessionAdaptor.h"
++#include "LoginSessionServer.h"
++#include <QtCore/QCoreApplication>
++
++int main(int argc, char *argv[])
++{
++    QCoreApplication a(argc, argv);
++
++    LoginManagerServer *manager = new LoginManagerServer();
++    new LoginManagerAdaptor(manager);
++
++    LoginSessionServer *l1_session = new LoginSessionServer();
++    new LoginSessionAdaptor(l1_session);
++    new LoginPropertiesAdaptor(l1_session);
++
++    LightDMSessionServer *ldm_session = new LightDMSessionServer(l1_session);
++    new LightDMSessionAdaptor(ldm_session);
++
++    // We use the session bus for testing.  The real plugin uses the system bus
++    QDBusConnection connection = QDBusConnection::sessionBus();
++    if (!connection.registerObject("/org/freedesktop/login1", manager))
++        return 1;
++    if (!connection.registerObject("/mocksession/login1", l1_session))
++        return 1;
++    if (!connection.registerObject("/mocksession/lightdm", ldm_session))
++        return 1;
++    if (!connection.registerService("org.freedesktop.DisplayManager"))
++        return 1;
++    if (!connection.registerService("org.freedesktop.login1"))
++        return 1;
++
++    return a.exec();
++}
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2014-03-17 11:44:05 +0000
 +++ tests/qmltests/CMakeLists.txt	2014-03-27 20:58:22 +0000
@@ -4,6 +4,7 @@
  add_subdirectory(Components)
  set(qmltest_DEFAULT_IMPORT_PATHS
++  ${CMAKE_BINARY_DIR}/plugins
    ${CMAKE_BINARY_DIR}/tests/utils/modules
    ${CMAKE_BINARY_DIR}/tests/mocks
+ )
@@ -20,12 +21,12 @@
  set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
  set(qmltest_DEFAULT_PROPERTIES "")
--add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
--                     ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
++add_qml_test(. Shell)
++add_qml_test(. GreeterShell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/single")
  add_manual_qml_test(Components DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
  add_qml_test(Components DraggingArea)
  add_qml_test(Components EdgeDemoOverlay)
--add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
++add_qml_test(Components FilterGrid)
  add_qml_test(Components LazyImage)
  add_qml_test(Components Rating)
  add_qml_test(Components ResponsiveFlowView)
@@ -33,56 +34,43 @@
  add_qml_test(Components Revealer)
  add_qml_test(Components SeeMore)
  add_qml_test(Components Showable)
--add_qml_test(Components Stage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
--                                           ${CMAKE_BINARY_DIR}/tests/mocks
--                                           ${CMAKE_BINARY_DIR}/plugins)
++add_qml_test(Components Stage)
  add_qml_test(Components PageHeaderLabel)
--add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
--add_qml_test(Dash DashContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
++add_qml_test(Dash Dash)
++add_qml_test(Dash DashContent)
  add_qml_test(Dash Card)
  add_qml_test(Dash CardHeader)
  add_qml_test(Dash CardTool)
--add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
--add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
--                                                            ${CMAKE_BINARY_DIR}/tests/mocks
--                                                            ${CMAKE_BINARY_DIR}/plugins)
--add_qml_test(Dash/Previews Preview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewActions IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewProgress IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewRatingDisplay IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewRatingInput IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewVideoPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewWidgetFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
--add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
--                             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
--add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
--                            ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
--add_qml_test(Greeter Phone IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
--                           ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
--add_qml_test(Greeter Infographics IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
--                                  ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
--add_qml_test(Greeter Clock IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
--                           ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
++add_qml_test(Dash GenericScopeView)
++add_qml_test(Dash/Apps RunningApplicationsGrid)
++add_qml_test(Dash/Previews Preview)
++add_qml_test(Dash/Previews PreviewActions)
++add_qml_test(Dash/Previews PreviewAudioPlayback)
++add_qml_test(Dash/Previews PreviewHeader)
++add_qml_test(Dash/Previews PreviewImageGallery)
++add_qml_test(Dash/Previews PreviewProgress)
++add_qml_test(Dash/Previews PreviewRatingDisplay)
++add_qml_test(Dash/Previews PreviewRatingInput)
++add_qml_test(Dash/Previews PreviewTextSummary)
++add_qml_test(Dash/Previews PreviewVideoPlayback)
++add_qml_test(Dash/Previews PreviewWidgetFactory)
++add_qml_test(Dash/Previews PreviewZoomableImage)
++add_qml_test(Greeter Lockscreen ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
++add_qml_test(Greeter Tablet ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
++add_qml_test(Greeter Phone ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/single")
++add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/liblightdm/full")
++add_qml_test(Greeter Clock ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
  add_qml_test(Hud Hud)
  add_qml_test(Hud Result)
--add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
--add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
++add_qml_test(Launcher Launcher)
++add_qml_test(Notifications Notifications)
  add_qml_test(Panel IndicatorRow)
--add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
--add_qml_test(Panel MenuContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
--add_qml_test(Panel Panel IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
++add_qml_test(Panel Indicators)
++add_qml_test(Panel MenuContent)
++add_qml_test(Panel Panel)
  add_qml_test(Panel SearchIndicator)
--add_qml_test(Panel/Indicators DefaultIndicatorWidget IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
--                                                  ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(Panel/Indicators DefaultIndicatorPage IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
--                                                  ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
--add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
--add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
--add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
--                                              ${CMAKE_BINARY_DIR}/tests/mocks
--                                              ${CMAKE_BINARY_DIR}/plugins)
++add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
++add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
++add_qml_test(Panel/Indicators MenuItemFactory)
++add_qml_test(Panel/Indicators MessageMenuItemFactory)
++add_qml_test(SideStage SideStage)
 === modified file 'tests/qmltests/Greeter/tst_Phone.qml'
 --- tests/qmltests/Greeter/tst_Phone.qml	2014-02-20 20:14:40 +0000
 +++ tests/qmltests/Greeter/tst_Phone.qml	2014-03-27 20:58:22 +0000
@@ -33,7 +33,7 @@
          height: parent.height
          x: 0; y: 0
--        defaultBackground: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
++        background: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
          property int minX: 0
@@ -61,6 +61,12 @@
          signalName: "unlocked"
+     }
++    SignalSpy {
++        id: teaseSpy
++        target: greeter
++        signalName: "tease"
++    }
++
      UT.UnityTestCase {
          name: "Greeter"
          when: windowShown
@@ -82,56 +88,10 @@
+         }
          function test_teasingArea(data) {
--            tryCompare(greeter, "leftTeaserPressed", false)
--            tryCompare(greeter, "rightTeaserPressed", false)
--            mousePress(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(greeter, "leftTeaserPressed", data.leftPressed)
--            tryCompare(greeter, "rightTeaserPressed", data.rightPressed)
--            mouseRelease(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(greeter, "leftTeaserPressed", false)
--            tryCompare(greeter, "rightTeaserPressed", false)
--        }
--
--        function test_teaseLockedUnlocked_data() {
--            return [
--                {tag: "unlocked", locked: false, moved: false},
--                {tag: "locked", locked: true, moved: false},
--                {tag: "moved", locked: false, moved: true}
--            ];
--        }
--
--        function test_teaseLockedUnlocked(data) {
--            tryCompare(greeter, "rightTeaserPressed", false);
--            tryCompare(greeter, "x", 0);
--            greeter.locked = data.locked;
--
--            // simulate greeter being in the middle of a swipe
--            if (data.moved) {
--                greeter.x = -units.gu(4);
--                tryCompare(greeter, "x", -units.gu(4));
--            }
--
--            mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
--            greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating
--
--            if (!data.moved) {
--                // Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area
--                // because animation duration and teaseTimer are the same duration and
--                // might cause slight offsets
--                tryCompareFunction(function() { return greeter.minX <= -units.gu(2) + 2}, true);
--            } else {
--                // waiting 100ms to make sure nothing moves
--                wait(100);
--                compare(greeter.minX, 0, "Greeter teasing not disabled even though it's locked or moving.");
--            }
--
--            // Restore position in case we moved it for the test
--            if (data.moved) {
--                greeter.x = 0;
--            }
--
--            // Wait until we're back to 0
--            tryCompareFunction(function() { return greeter.x;}, 0);
++            teaseSpy.clear()
++            mouseClick(greeter, data.posX, greeter.height - units.gu(1))
++            teaseSpy.wait()
++            tryCompare(teaseSpy, "count", 1)
+         }
          function test_statsWelcomeScreen() {
@@ -144,22 +104,6 @@
              tryCompare(LightDM.Infographic, "username", "single")
+         }
--        function test_background_data() {
--            return [
--                {tag: "set", accounts: Qt.resolvedUrl("../../data/unity/backgrounds/blue.png"), expected: "blue.png"},
--                {tag: "unset", accounts: "", expected: "background.jpg"},
--                {tag: "invalid", accounts: "invalid", expected: "background.jpg"},
--            ]
--        }
--
--        function test_background(data) {
--            var loader = findChild(greeter, "greeterContentLoader")
--            var background = findChild(loader.item, "greeterBackground")
--            AccountsService.backgroundFile = data.accounts
--            tryCompareFunction(function() { return background.source.toString().indexOf(data.expected) !== -1; }, true)
--            tryCompare(background, "status", Image.Ready)
--        }
--
          function test_initial_selected_signal() {
              var greeterObj = greeterComponent.createObject(this)
              var spy = findChild(greeterObj, "selectedSpy")
 === modified file 'tests/qmltests/Greeter/tst_Tablet.qml'
 --- tests/qmltests/Greeter/tst_Tablet.qml	2014-02-20 20:14:40 +0000
 +++ tests/qmltests/Greeter/tst_Tablet.qml	2014-03-27 20:58:22 +0000
@@ -54,6 +54,12 @@
          signalName: "selected"
+     }
++    SignalSpy {
++        id: teaseSpy
++        target: greeter
++        signalName: "tease"
++    }
++
      UT.UnityTestCase {
          name: "Greeter"
          when: windowShown
@@ -325,14 +331,36 @@
+         }
          function test_teasingArea(data) {
--            tryCompare(greeter, "leftTeaserPressed", false)
--            tryCompare(greeter, "rightTeaserPressed", false)
--            mousePress(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(greeter, "leftTeaserPressed", data.leftPressed)
--            tryCompare(greeter, "rightTeaserPressed", data.rightPressed)
--            mouseRelease(greeter, data.posX, greeter.height - units.gu(1))
--            tryCompare(greeter, "leftTeaserPressed", false)
--            tryCompare(greeter, "rightTeaserPressed", false)
++            teaseSpy.clear()
++            mouseClick(greeter, data.posX, greeter.height - units.gu(1))
++            teaseSpy.wait()
++            tryCompare(teaseSpy, "count", 1)
++        }
++
++        function test_teaseLockedUnlocked_data() {
++            return [
++                {tag: "unlocked", locked: false, narrow: false},
++                {tag: "locked", locked: true, narrow: false},
++            ];
++        }
++
++        function test_teaseLockedUnlocked(data) {
++            teaseSpy.clear()
++            greeter.locked = data.locked;
++
++            mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
++
++            if (!data.locked || data.narrow) {
++                teaseSpy.wait()
++                tryCompare(teaseSpy, "count", 1);
++            } else {
++                // waiting 100ms to make sure nothing happens
++                wait(100);
++                compare(teaseSpy.count, 0, "Greeter teasing not disabled even though it's locked.");
++            }
++
++            // Reset value
++            greeter.locked = false;
+         }
          function test_dbus_set_active_entry() {
 === added file 'tests/qmltests/tst_GreeterShell.qml'
 --- tests/qmltests/tst_GreeterShell.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/tst_GreeterShell.qml	2014-03-27 20:58:22 +0000
@@ -0,0 +1,79 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * Authors:
++ *   Michael Terry <michael.terry@canonical.com>
++ *
++ * 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 AccountsService 0.1
++import GSettings 1.0
++import Unity.Application 0.1
++import Unity.Test 0.1 as UT
++import Powerd 0.1
++
++import "../../qml"
++
++Item {
++    width: shell.width
++    height: shell.height
++
++    QtObject {
++        id: applicationArguments
++
++        function hasGeometry() {
++            return false;
++        }
++
++        function width() {
++            return 0;
++        }
++
++        function height() {
++            return 0;
++        }
++    }
++
++    GreeterShell {
++        id: shell
++        defaultBackground: Qt.resolvedUrl("../../qml/graphics/phone_background.jpg")
++    }
++
++    UT.UnityTestCase {
++        name: "GreeterShell"
++        when: windowShown
++
++        function test_wallpaper_data() {
++            return [
++                {tag: "both", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "../tests/data/unity/backgrounds/red.png", expected: "blue.png"},
++                {tag: "accounts", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "", expected: "blue.png"},
++                {tag: "gsettings", accounts: "", gsettings: "../tests/data/unity/backgrounds/red.png", expected: "red.png"},
++                {tag: "none", accounts: "", gsettings: "", expected: shell.defaultBackground},
++                {tag: "invalid-both", accounts: "invalid", gsettings: "invalid", expected: shell.defaultBackground},
++                {tag: "invalid-accounts", accounts: "invalid", gsettings: "../tests/data/unity/backgrounds/red.png", expected: shell.defaultBackground},
++                {tag: "invalid-gsettings", accounts: "../tests/data/unity/backgrounds/blue.png", gsettings: "invalid", expected: "blue.png"},
++            ]
++        }
++
++        function test_wallpaper(data) {
++            var greeterBackground = findChild(shell, "greeterBackground")
++            GSettingsController.setPictureUri(data.gsettings)
++            AccountsService.backgroundFile = data.accounts
++            verify(greeterBackground.source.toString().indexOf(data.expected) !== -1)
++            tryCompare(greeterBackground, "status", Image.Ready)
++        }
++    }
++}
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2014-03-19 10:48:06 +0000
 +++ tests/qmltests/tst_Shell.qml	2014-03-27 20:58:22 +0000
@@ -23,6 +23,7 @@
  import Unity.Application 0.1
  import Unity.Test 0.1 as UT
  import Powerd 0.1
++import SessionManager 0.1
  import "../../qml"
@@ -48,6 +49,7 @@
      Shell {
          id: shell
++        defaultBackground: Qt.resolvedUrl("../../qml/graphics/phone_background.jpg")
+     }
      UT.UnityTestCase {
@@ -72,9 +74,6 @@
                  ok = homeLoader !== null
                      && homeLoader.item !== undefined;
--                var greeter = findChild(shell, "greeter");
--                ok &= greeter !== null;
--
                  var launcherPanel = findChild(shell, "launcherPanel");
                  ok &= launcherPanel !== null;
@@ -89,17 +88,9 @@
              } while (!ok && attempts <= maxAttempts);
              verify(ok);
--
--            swipeAwayGreeter();
+         }
          function cleanup() {
--            // If a test invoked the greeter, make sure we swipe it away again
--            var greeter = findChild(shell, "greeter");
--            if (greeter.shown) {
--                swipeAwayGreeter();
--            }
--
              // kill all (fake) running apps
              killApps(ApplicationManager);
@@ -180,8 +171,6 @@
+         }
          function test_suspend() {
--            var greeter = findChild(shell, "greeter");
--
              // Launch an app from the launcher
              dragLauncherIntoView();
              tapOnAppIconInLauncher();
@@ -192,35 +181,21 @@
              // Try to suspend while proximity is engaged...
              Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);
--            tryCompare(greeter, "showProgress", 0);
++            tryCompare(ApplicationManager, "focusedApplicationId", mainApp);
              // Now really suspend
              Powerd.displayPowerStateChange(Powerd.Off, 0);
--            tryCompare(greeter, "showProgress", 1);
              tryCompare(ApplicationManager, "focusedApplicationId", "");
              // And wake up
              Powerd.displayPowerStateChange(Powerd.On, 0);
              tryCompare(ApplicationManager, "focusedApplicationId", "");
--            tryCompare(greeter, "showProgress", 1);
--            // Swipe away greeter to focus app
--            swipeAwayGreeter();
++            // Activate session to focus app
++            SessionManager.active = true;
              tryCompare(ApplicationManager, "focusedApplicationId", mainApp);
+         }
--        function swipeAwayGreeter() {
--            var greeter = findChild(shell, "greeter");
--            tryCompare(greeter, "showProgress", 1);
--
--            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);
--        }
--
          /*
              Perform a right-edge drag when the Dash is being show and there are
              no running/minimized apps to be restored.
@@ -477,23 +452,15 @@
          function test_DashShown_data() {
              return [
--                {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},
--                {tag: "under greeter", greeter: true, app: false, launcher: false, indicators: false, expectedShown: false},
--                {tag: "under app", greeter: false, app: true, launcher: false, indicators: false, expectedShown: false},
--                {tag: "under launcher", greeter: false, app: false, launcher: true, indicators: false, expectedShown: true},
--                {tag: "under indicators", greeter: false, app: false, launcher: false, indicators: true, expectedShown: true},
++                {tag: "in focus", app: false, launcher: false, indicators: false, expectedShown: true},
++                {tag: "under app", app: true, launcher: false, indicators: false, expectedShown: false},
++                {tag: "under launcher", app: false, launcher: true, indicators: false, expectedShown: true},
++                {tag: "under indicators", app: false, launcher: false, indicators: true, expectedShown: true},
+             ]
+         }
          function test_DashShown(data) {
--            if (data.greeter) {
--                // Swipe the greeter in
--                var greeter = findChild(shell, "greeter");
--                Powerd.displayPowerStateChange(Powerd.Off, 0);
--                tryCompare(greeter, "showProgress", 1);
--            }
--
              if (data.app) {
                  dragLauncherIntoView();
                  tapOnAppIconInLauncher();
@@ -523,17 +490,6 @@
              tryCompare(searchIndicator, "opacity", 0);
+         }
--        function test_searchIndicatorHidesOnGreeterShown() {
--            var searchIndicator = findChild(shell, "container")
--            var greeter = findChild(shell, "greeter");
--
--            tryCompare(searchIndicator, "opacity", 1)
--
--            greeter.show()
--            tryCompare(greeter, "shown", true)
--            tryCompare(searchIndicator, "opacity", 0)
--        }
--
          function test_searchIndicatorHideOnPreviewShown() {
              var searchIndicator = findChild(shell, "container");
              var dashContent = findChild(shell, "dashContent");