Unity 8

Merge lp:~mterry/unity8/tutorial-redesign into lp:unity8

tutorial-redesign
Merge into trunk

Proposed by Michael Terry on 2015-09-16

Status:

Superseded

Proposed branch:

lp:~mterry/unity8/tutorial-redesign

Merge into:

lp:unity8

Diff against target:

4565 lines (+1545/-1541)

62 files modified

plugins/AccountsService/AccountsService.cpp (+49/-0)
plugins/AccountsService/AccountsService.h (+9/-0)
plugins/AccountsService/AccountsService.qmltypes (+5/-0)
plugins/AccountsService/com.canonical.unity.AccountsService.xml (+5/-0)
plugins/ScreenGrabber/screengrabber.cpp (+0/-2)
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp (+40/-5)
plugins/Ubuntu/Gestures/DirectionalDragArea.h (+8/-0)
plugins/Ubuntu/Gestures/DirectionalDragArea_p.h (+2/-0)
plugins/Utils/CMakeLists.txt (+1/-1)
plugins/Utils/Utils.qmltypes (+2/-2)
plugins/Utils/plugin.cpp (+2/-2)
plugins/Utils/windowinputfilter.cpp (+14/-16)
plugins/Utils/windowinputfilter.h (+11/-11)
qml/Components/InputMethod.qml (+1/-9)
qml/Greeter/Greeter.qml (+10/-6)
qml/Launcher/Launcher.qml (+2/-3)
qml/Panel/IndicatorsMenu.qml (+0/-2)
qml/Shell.qml (+27/-45)
qml/Stages/AbstractStage.qml (+1/-0)
qml/Stages/ApplicationWindow.qml (+0/-2)
qml/Stages/PhoneStage.qml (+3/-6)
qml/Stages/TabletStage.qml (+15/-11)
qml/Tutorial/Arrow.qml (+0/-56)
qml/Tutorial/InactivityTimer.qml (+62/-0)
qml/Tutorial/Slider.qml (+0/-123)
qml/Tutorial/Tick.qml (+0/-29)
qml/Tutorial/Tutorial.qml (+43/-18)
qml/Tutorial/TutorialBottom.qml (+0/-104)
qml/Tutorial/TutorialBottomFinish.qml (+0/-41)
qml/Tutorial/TutorialContent.qml (+250/-80)
qml/Tutorial/TutorialLeft.qml (+28/-75)
qml/Tutorial/TutorialLeftFinish.qml (+0/-41)
qml/Tutorial/TutorialLeftLong.qml (+54/-0)
qml/Tutorial/TutorialPage.qml (+66/-190)
qml/Tutorial/TutorialRight.qml (+0/-223)
qml/Tutorial/TutorialTop.qml (+61/-0)
qml/Tutorial/graphics/arrow.svg (+19/-0)
tests/autopilot/unity8/shell/emulators.py (+0/-2)
tests/autopilot/unity8/shell/tests/test_tutorial.py (+0/-57)
tests/autopilot/unity8/tutorial.py (+0/-73)
tests/mocks/AccountsService/AccountsService.cpp (+20/-0)
tests/mocks/AccountsService/AccountsService.h (+10/-0)
tests/mocks/AccountsService/AccountsService.qmltypes (+5/-0)
tests/mocks/Unity/Application/ApplicationInfo.h (+1/-1)
tests/mocks/Unity/Application/MirSurface.cpp (+3/-2)
tests/mocks/Unity/Application/MirSurface.h (+2/-1)
tests/mocks/Unity/Application/SurfaceManager.cpp (+8/-9)
tests/mocks/Unity/Application/SurfaceManager.h (+3/-3)
tests/mocks/Unity/Application/VirtualKeyboard.cpp (+3/-2)
tests/mocks/Unity/Application/VirtualKeyboard.h (+1/-1)
tests/mocks/Unity/Application/plugin.cpp (+2/-1)
tests/mocks/Utils/CMakeLists.txt (+1/-1)
tests/mocks/Utils/Utils.qmltypes (+2/-2)
tests/mocks/Utils/plugin.cpp (+2/-2)
tests/plugins/AccountsService/PropertiesServer.cpp (+1/-0)
tests/plugins/AccountsService/client.cpp (+37/-0)
tests/qmltests/Components/tst_PhysicalKeysMapper.qml (+3/-3)
tests/qmltests/Greeter/tst_Greeter.qml (+7/-1)
tests/qmltests/Tutorial/tst_Tutorial.qml (+639/-245)
tests/qmltests/tst_OrientedShell.qml (+1/-1)
tests/qmltests/tst_Shell.qml (+4/-9)
tests/qmltests/tst_ShellWithPin.qml (+0/-22)

To merge this branch:

bzr merge lp:~mterry/unity8/tutorial-redesign

Related bugs:

Bug #1443869: [Edge Education] New wizard in Vivid doesn't excercise indicator gesture	Undecided	Fix Released
Bug #1484383: [Edge education] Tutorial doesn't teach you about the long swipe from left	Medium	Fix Released
Bug #1519779: A PhoneStage gets loaded and unloaded during desktop start up	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-03-10
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-19
Michael Zanetti (community)		2015-09-16	Needs Fixing on 2015-12-01
Albert Astals Cid (community)	merges fine		Abstain on 2015-11-20
Review via email: mp+271342@code.launchpad.net

This proposal has been superseded by a proposal from 2016-03-10.

Commit Message

Redesign the first-boot edge tutorial

Description of the Change

Based on new design specs [1], this is whole new tutorial code.

Some of the interesting things going on here:

- New DDA feature "monitorOnly" which lets input events "fall through" (i.e. it doesn't own them) but continues to monitor them. This is how we implement the bottom edge tutorial fading out without having to communicate with the app.

- New AccountsService key to keep track of which particular edges are done, now that they are presented separately. We still use the old key for overall "done" status.

- Renamed WindowKeysFilter to WindowInputFilter. I needed a way to keep track of input inactivity. And since WindowKeysFilter was already injecting itself into the event stream and already kept track of timestamps for us (which usually isn't exposed to Qml), I just modified it a bit. I felt like the new scope should be indicated in the name, so I renamed it.

- I took out some old hacks only needed for the old tutorial.

[1] https://docs.google.com/document/d/1pZ-Ro--2eaRzjZKNRoYAeDvQHMkCuyvVuPFWFQfPW4s/edit

== Checklist ==

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

Yes. A new phablet-tools branch for your desktop [2] and a new upload of dbus-property-service (not in a VCS). Both are in silo 33.

[2] https://code.launchpad.net/~mterry/phablet-tools/tutorial-redesign/+merge/277764

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

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

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

* If you changed the UI, has there been a design review?
Yes. Patricia is on board with this MP. She has another screen coming (long swipe on left), but I'll do that as a separate MP.

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

<dandrader> mterry, DDA changes in lp:~mterry/unity8/tutorial-redesign look fine
<mterry> dandrader, awesome, thanks
will quote you in the MP :)
<dandrader> mterry, only unsure about the property name. Because it will work all the same, only difference is that it won't claim ownership over the touch point once it recognizes it's performing a gesture
<mterry> dandrader, yeah. I'm happy to rename it. Got something you like better?
<dandrader> mterry, no :)

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

OK, I'm opening this up to review, although the final design review isn't done yet and I need to add a couple more qmltests. But I'd like to get the review train started on its way.

lp:~mterry/unity8/tutorial-redesign updated on 2015-11-18

1978. By Michael Terry on 2015-11-18: Make tryTutorial more useful; add bottom edge tests

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

OK, added more tests and cleaned up existing ones. Hopefully this is "done-ish" from a technical POV and only design-related changes will happen now (like changes to strings or alignment).

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2015-11-19:

Hmm... I've just flashed a device and enabled the edges-intro with phablet-config. I could see the intro for left, top and bottom edges, however, still waiting for the right edge one to appear.

====

As you renamed WindowKeyFilter, please update this comment too

qml/Shell.qml: // dummy shortcut to force creation of GlobalShortcutRegistry before WindowKeyFilter

===

- readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
+ dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0

Given that it's not obvious what the dragProgress is used for, please add a comment in the stages code to indicate it. otherwise it's likely to be removed at some point because noone knows what it does.

===

+ ////

Is there a purpose to this? :)

===
+ sourceSize.height: 1080
+ sourceSize.width: 1916

erm... can you explain the values? Looks wrong to me

review: Needs Fixing

Michael Zanetti (mzanetti) wrote on 2015-11-19:

Notes for myself:

* test if CPU usage drops if screen locks during animation
* test what happens if plugging external screen while in tutorial

lp:~mterry/unity8/tutorial-redesign updated on 2015-11-19

1979. By Michael Terry on 2015-11-19: Add a little more spacing between tutorial lines (design request)
1980. By Michael Terry on 2015-11-19: Add support for custom bottom-edge messages for the five apps we support; put each tutorial object under a loader, since they'll be around much longer now
1981. By Michael Terry on 2015-11-19: Fix design notes

Michael Terry (mterry) wrote on 2015-11-19:

Download full text (3.2 KiB)

OK, I've made some changes. One, I added some more space between tutorial text lines, per design request.

Second, also per design request, I've added unique helper text on the bottom edge tutorial for each supported app. This also means that we show the tutorial for each app rather than once for any of them. Since this meant that the tutorial might not formally "finish" for quite some time, I've optimized the rest of the tutorial to use Loaders. So that we're not loading three unused background images a week after the user unboxes their phone.

As for your comments:

> Hmm... I've just flashed a device and enabled the edges-intro
> with phablet-config. I could see the intro for left, top and
> bottom edges, however, still waiting for the right edge one to appear.

As discussed on IRC, we're guessing this was user error. Unless you've seen it again?

====

> As you renamed WindowKeyFilter, please update this comment too
>
> qml/Shell.qml: // dummy shortcut to force creation of GlobalShortcutRegistry before WindowKeyFilter

Done.

===

> - readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
> + dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0

> Given that it's not obvious what the dragProgress is used for,
> please add a comment in the stages code to indicate it. otherwise
> it's likely to be removed at some point because noone knows what it does.

Done.

===

> + ////
>
> Is there a purpose to this? :)

Ah, that's just a little visual separator I use between the public interface part of the object and the implementation parts. Qml doesn't use headers, and while we seem to use the placement of the QtObject component to separate the portions of code, sometimes an object doesn't warrant a QtObject, so it isn't a universal distinguisher. Plus, I like the extra visual space.

I can take it out if it will be as confusing to you as others. I know Cimi doesn't like that I do that.

===

> + sourceSize.height: 1080
> + sourceSize.width: 1916
>
> erm... can you explain the values? Looks wrong to me

Duh, I swapped height and width. Fixed.

===

> * test if CPU usage drops if screen locks during animation

Please do, but note that there isn't any animation anymore. So I expect no CPU difference.

===

> * test what happens if plugging external screen while in tutorial

Ah yes. Here's what I expect the code to do:

- Any visible tutorials that aren't marked for desktop use will fade out.
- The right edge tutorial will appear (or update itself) with desktop-specific text when you have enough apps open.
- If you finish the right edge tutorial while in desktop mode, the tutorial will be marked complete and you won't see any more coach marks. However, if you don't finish the right edge tutorial before undocking, you will continue to see all the tutorials you haven't seen yet, as normal.

How do you feel about that last behavior? It might be tricky to do something much smarter unless either (A) we know the "native" usageScenario of the device or (B) we stop marking the "whole-tutorial-is-complete" flag and accept that if we add new pages or redesign th...

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-11-20:

Text conflict in tests/plugins/AccountsService/PropertiesServer.cpp
1 conflicts encountered.

review: Needs Fixing

lp:~mterry/unity8/tutorial-redesign updated on 2015-11-20

1982. By Michael Terry on 2015-11-20: Merge from trunk

Michael Terry (mterry) wrote on 2015-11-20:

Fixed conflicts.

Albert Astals Cid (aacid) on 2015-11-20:

review: Abstain (merges fine)

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2015-11-23

1983. By Michael Terry on 2015-11-23: Fix compile error

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2015-11-24

1984. By Michael Terry on 2015-11-24: Fix qmltests

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2015-11-27

1985. By Michael Terry on 2015-11-27: Make bottom edge arrow & text closer to bottom edge, per design

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2015-11-30

1986. By Michael Terry on 2015-11-30: Merge from trunk

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

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2015-12-01:

+ i18n.tr("Hover your mouse on the right edge to view your open apps") :
+ i18n.tr("Short or long swipe from the right edge to view your open apps")

I know those have been given by design, but gotta point out some errors:
- In windowed mode, you need to push the mouse against the right edge and even overcome some resistance. Hovering is not enough.
- While at it, we might want to ask back on short swipe one too, but I guess that would be ok to oversimplify it in this case.

========

+ text: d.landscape ? i18n.tr("Swipe from the top right edge to open the notification bar")
+ : i18n.tr("Swipe from the top edge to open the notification bar")

this might needs a windowed mode special case too. We don't want to encourage clicking with a mouse so the indicators can also be revealed by clicking the icons. Although this is not wrong. If you have a touch screen too, you can also swipe then on a desktop.

========

+ text: i18n.tr("Swipe from the left edge to open the launcher")

same as for the right edge. With a mouse, it requires pushing towards the edge. Why not special cased here?

review: Needs Information

Michael Zanetti (mzanetti) wrote on 2015-12-01:

Another question:

I figure it will take ages until completed goes to true. Some people might never open the calculator app which would leave us with the tutorial being enabled forever. What are the implications of that?

review: Needs Information

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

You mention the wording on the left edge drag needing to be changed for desktop mode -- but we don't show that tutorial on desktop. So I'm guessing we can leave it as is.

And you asked about the tutorial never "completing". This is a small issue. And it's why I revised TutorialContent to use loaders for each tutorial page. I don't think it's a problem, per se. But it does mean that we'll likely have the TutorialBottom page loaded most of the time. Until they load all the bottom-supported apps anyway...

Michael Zanetti (mzanetti) wrote on 2015-12-01:

On the right edge in windowed mode, it's not only the text, but the hoverMouseArea disappered and it's not possible to get past that step any more.

review: Needs Fixing

lp:~mterry/unity8/tutorial-redesign updated on 2015-12-14

1987. By Michael Terry on 2015-12-14: Merge from trunkA

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-01-13:

Text conflict in qml/Launcher/Launcher.qml
1 conflicts encountered.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-13:

FAILED: Continuous integration, rev:1987
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/35/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2016-01-18

1988. By Michael Terry on 2016-01-18: Merge trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-18:

FAILED: Continuous integration, rev:1988
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/124/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-18:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2016-01-21

1989. By Michael Terry on 2016-01-21: Flip tutorial arrows

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

FAILED: Continuous integration, rev:1989
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/168/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-01-22:

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1989
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/168/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-02:

Text conflict in qml/Stages/PhoneStage.qml
Text conflict in qml/Stages/TabletStage.qml
2 conflicts encountered.

lp:~mterry/unity8/tutorial-redesign updated on 2016-02-10

1990. By Michael Terry on 2016-02-10: Merge from trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2016-02-16

1991. By Michael Terry on 2016-02-16: Don't show bottom tutorial for clock app, it shows permission screen on first launch
1992. By Michael Terry on 2016-02-16: Merge from trunk
1993. By Michael Terry on 2016-02-16: remove bit of cleanup that is in another branch; we conflict if I include it

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

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-16:

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2016-02-19

1994. By Michael Terry on 2016-02-19: Merge from trunk
1995. By Michael Terry on 2016-02-19: Add long-swipe-from-left-edge screen

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

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-19:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2016-03-08

1996. By Michael Terry on 2016-03-08: Merge from trunk

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

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

review: Needs Fixing (continuous-integration)

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

Tests need fixin ↑?

lp:~mterry/unity8/tutorial-redesign updated on 2016-03-09

1997. By Michael Terry on 2016-03-09: Merge from trunk
1998. By Michael Terry on 2016-03-09: Fix failing test
1999. By Michael Terry on 2016-03-09: Remove tutorial autopilot test; it's much harder to test via autopilot now that each page fires separately, and we cover it well in qmluitests; there's nothing autopilot-integraty about it

Michael Terry (mterry) wrote on 2016-03-09:

Fixed the qmluitest, and removed the autopilot test. The tutorial is harder to test via one autopilot test now that the pages have been split up and separately triggered. Plus, we cover them well in qmluitests. And there's nothing autopilot-centric to test there.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2016-03-10

2000. By Michael Terry on 2016-03-10: Fix Tutorial qmluitest too, whoops!
2001. By Michael Terry on 2016-03-10: Merge from trunk
2002. By Michael Terry on 2016-03-10: Merge in catch-osk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2016-03-11

2003. By Michael Terry on 2016-03-11: Merge silo 64
2004. By Michael Terry on 2016-03-11: Merge oobe

Unmerged revisions

2004. By Michael Terry on 2016-03-11: Merge oobe
2003. By Michael Terry on 2016-03-11: Merge silo 64
2002. By Michael Terry on 2016-03-10: Merge in catch-osk

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 'plugins/AccountsService/AccountsService.cpp'
 --- plugins/AccountsService/AccountsService.cpp	2016-01-21 21:04:00 +0000
 +++ plugins/AccountsService/AccountsService.cpp	2016-03-10 17:24:40 +0000
@@ -28,6 +28,7 @@
      : QObject(parent),
      m_service(new AccountsServiceDBusAdaptor(this)),
      m_demoEdges(false),
++    m_demoEdgesCompleted(),
      m_enableLauncherWhileLocked(false),
      m_enableIndicatorsWhileLocked(false),
      m_statsWelcomeScreen(false),
@@ -60,6 +61,7 @@
      m_user = user;
      Q_EMIT userChanged();
++    updateDemoEdgesCompleted(false);
      updateDemoEdges(false);
      updateEnableLauncherWhileLocked(false);
      updateEnableIndicatorsWhileLocked(false);
@@ -88,6 +90,21 @@
+     }
+ }
++QStringList AccountsService::demoEdgesCompleted() const
++{
++    return m_demoEdgesCompleted;
++}
++
++void AccountsService::markDemoEdgeCompleted(const QString &edge)
++{
++    if (!m_demoEdgesCompleted.contains(edge)) {
++        m_demoEdgesCompleted << edge;
++        m_service->setUserPropertyAsync(m_user, "com.canonical.unity.AccountsService", "DemoEdgesCompleted", m_demoEdgesCompleted);
++
++        Q_EMIT demoEdgesCompletedChanged();
++    }
++}
++
  bool AccountsService::enableLauncherWhileLocked() const
+ {
      return m_enableLauncherWhileLocked;
@@ -167,6 +184,35 @@
+     }
+ }
++void AccountsService::updateDemoEdgesCompleted(bool async)
++{
++    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
++                                                                    "com.canonical.unity.AccountsService",
++                                                                    "DemoEdgesCompleted");
++    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
++
++    connect(watcher, &QDBusPendingCallWatcher::finished,
++            this, [this](QDBusPendingCallWatcher* watcher) {
++
++        QDBusPendingReply<QDBusVariant> reply = *watcher;
++        watcher->deleteLater();
++        if (reply.isError()) {
++            qWarning() << "Failed to get 'DemoEdgesCompleted' property - " << reply.error().message();
++            return;
++        }
++
++        auto demoEdgesCompleted = reply.value().variant().toStringList();
++        if (m_demoEdgesCompleted != demoEdgesCompleted) {
++            m_demoEdgesCompleted = demoEdgesCompleted;
++            Q_EMIT demoEdgesCompletedChanged();
++        }
++    });
++    if (!async) {
++        watcher->waitForFinished();
++        delete watcher;
++    }
++}
++
  void AccountsService::updateEnableLauncherWhileLocked(bool async)
+ {
      QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
@@ -473,6 +519,9 @@
          if (changed.contains(QStringLiteral("demo-edges"))) {
              updateDemoEdges();
+         }
++        if (changed.contains(QStringLiteral("DemoEdgesCompleted"))) {
++            updateDemoEdgesCompleted();
++        }
      } else if (interface == QLatin1String("com.canonical.unity.AccountsService.Private")) {
          if (changed.contains(QStringLiteral("FailedLogins"))) {
              updateFailedLogins();
 === modified file 'plugins/AccountsService/AccountsService.h'
 --- plugins/AccountsService/AccountsService.h	2016-01-21 21:04:00 +0000
 +++ plugins/AccountsService/AccountsService.h	2016-03-10 17:24:40 +0000
@@ -21,6 +21,7 @@
  #include <QObject>
  #include <QString>
++#include <QStringList>
  class AccountsServiceDBusAdaptor;
  class QDBusInterface;
@@ -37,6 +38,9 @@
                  READ demoEdges
                  WRITE setDemoEdges
                  NOTIFY demoEdgesChanged)
++    Q_PROPERTY (QStringList demoEdgesCompleted
++                READ demoEdgesCompleted
++                NOTIFY demoEdgesCompletedChanged)
      Q_PROPERTY (bool enableLauncherWhileLocked
                  READ enableLauncherWhileLocked
                  NOTIFY enableLauncherWhileLockedChanged)
@@ -80,6 +84,8 @@
      void setUser(const QString &user);
      bool demoEdges() const;
      void setDemoEdges(bool demoEdges);
++    QStringList demoEdgesCompleted() const;
++    Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
      bool enableLauncherWhileLocked() const;
      bool enableIndicatorsWhileLocked() const;
      QString backgroundFile() const;
@@ -95,6 +101,7 @@
  Q_SIGNALS:
      void userChanged();
      void demoEdgesChanged();
++    void demoEdgesCompletedChanged();
      void enableLauncherWhileLockedChanged();
      void enableIndicatorsWhileLockedChanged();
      void backgroundFileChanged();
@@ -110,6 +117,7 @@
  private:
      void updateDemoEdges(bool async = true);
++    void updateDemoEdgesCompleted(bool async = true);
      void updateEnableLauncherWhileLocked(bool async = true);
      void updateEnableIndicatorsWhileLocked(bool async = true);
      void updateBackgroundFile(bool async = true);
@@ -125,6 +133,7 @@
      QDBusInterface *m_unityInput;
      QString m_user;
      bool m_demoEdges;
++    QStringList m_demoEdgesCompleted;
      bool m_enableLauncherWhileLocked;
      bool m_enableIndicatorsWhileLocked;
      QString m_backgroundFile;
 === modified file 'plugins/AccountsService/AccountsService.qmltypes'
 --- plugins/AccountsService/AccountsService.qmltypes	2015-02-13 09:01:16 +0000
 +++ plugins/AccountsService/AccountsService.qmltypes	2016-03-10 17:24:40 +0000
@@ -23,6 +23,7 @@
+         }
          Property { name: "user"; type: "string" }
          Property { name: "demoEdges"; type: "bool" }
++        Property { name: "demoEdgesCompleted"; type: "QStringList"; isReadonly: true }
          Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
          Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
          Property { name: "backgroundFile"; type: "string"; isReadonly: true }
@@ -32,5 +33,9 @@
          Property { name: "hereEnabled"; type: "bool" }
          Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
          Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
++        Method {
++            name: "markDemoEdgeCompleted"
++            Parameter { name: "edge"; type: "string" }
++        }
+     }
+ }
 === modified file 'plugins/AccountsService/com.canonical.unity.AccountsService.xml'
 --- plugins/AccountsService/com.canonical.unity.AccountsService.xml	2015-02-04 15:12:36 +0000
 +++ plugins/AccountsService/com.canonical.unity.AccountsService.xml	2016-03-10 17:24:40 +0000
@@ -14,6 +14,11 @@
        <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
      </property>
++    <!-- List of tutorial pages that have been completed by the user -->
++    <property name="DemoEdgesCompleted" type="as" access="readwrite">
++      <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>
++    </property>
++
      <property name="LauncherItems" type="aa{sv}" access="readwrite">
        <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
      </property>
 === modified file 'plugins/ScreenGrabber/screengrabber.cpp'
 --- plugins/ScreenGrabber/screengrabber.cpp	2015-11-18 18:38:36 +0000
 +++ plugins/ScreenGrabber/screengrabber.cpp	2016-03-10 17:24:40 +0000
@@ -46,12 +46,10 @@
      QDir screenshotsDir;
      if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
--        qDebug() << "Using test environment";
          QTemporaryDir tDir;
          tDir.setAutoRemove(false);
          screenshotsDir = tDir.path();
      } else {
--        qDebug() << "Using real environment";
          screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+     }
      screenshotsDir.mkpath(QStringLiteral("Screenshots"));
 === modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
 --- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2015-12-16 18:28:21 +0000
 +++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2016-03-10 17:24:40 +0000
@@ -194,6 +194,26 @@
+     }
+ }
++bool DirectionalDragArea::monitorOnly() const
++{
++    return d->monitorOnly;
++}
++
++void DirectionalDragArea::setMonitorOnly(bool monitorOnly)
++{
++    if (d->monitorOnly != monitorOnly) {
++        d->monitorOnly = monitorOnly;
++
++        if (monitorOnly && d->status == DirectionalDragAreaPrivate::Undecided) {
++            TouchRegistry::instance()->removeCandidateOwnerForTouch(d->touchId, this);
++            // We still wanna know when it ends for keeping the composition time window up-to-date
++            TouchRegistry::instance()->addTouchWatcher(d->touchId, this);
++        }
++
++        Q_EMIT monitorOnlyChanged(monitorOnly);
++    }
++}
++
  void DirectionalDragArea::removeTimeConstraints()
+ {
      d->setMaxTime(60 * 60 * 1000);
@@ -260,7 +280,10 @@
              unownedTouchEvent_undecided(unownedTouchEvent);
              break;
          default: // Recognized:
--            // do nothing
++            if (monitorOnly) {
++                // Treat unowned event as if we owned it, but we are really just watching it
++                touchEvent_recognized(event);
++            }
              break;
+     }
@@ -311,7 +334,9 @@
+     }
      if (movedFarEnoughAlongGestureAxis()) {
--        TouchRegistry::instance()->requestTouchOwnership(touchId, q);
++        if (!monitorOnly) {
++            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
++        }
          setStatus(Recognized);
          setPublicPos(touchPoint->pos());
          setPublicScenePos(touchScenePos);
@@ -411,12 +436,21 @@
          if (recognitionIsDisabled()) {
              // Behave like a dumb TouchArea
              ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
--            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
              setStatus(Recognized);
--            event->accept();
++            if (monitorOnly) {
++                watchPressedTouchPoints(touchPoints);
++                event->ignore();
++            } else {
++                TouchRegistry::instance()->requestTouchOwnership(touchId, q);
++                event->accept();
++            }
          } else {
              // just monitor the touch points for now.
--            TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
++            if (monitorOnly) {
++                watchPressedTouchPoints(touchPoints);
++            } else {
++                TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
++            }
              setStatus(Undecided);
              // Let the item below have it. We will monitor it and grab it later if a gesture
@@ -890,5 +924,6 @@
      , recognitionTimer(nullptr)
      , timeSource(new RealTimeSource)
      , activeTouches(timeSource)
++    , monitorOnly(false)
+ {
+ }
 === modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.h'
 --- plugins/Ubuntu/Gestures/DirectionalDragArea.h	2015-05-11 07:49:36 +0000
 +++ plugins/Ubuntu/Gestures/DirectionalDragArea.h	2016-03-10 17:24:40 +0000
@@ -77,6 +77,10 @@
              WRITE setImmediateRecognition
              NOTIFY immediateRecognitionChanged)
++    // Whether we are merely monitoring touch events (in which case, we don't
++    // claim ownership of the touch).
++    Q_PROPERTY(bool monitorOnly READ monitorOnly WRITE setMonitorOnly NOTIFY monitorOnlyChanged)
++
      Q_ENUMS(Direction)
  public:
      DirectionalDragArea(QQuickItem *parent = 0);
@@ -100,6 +104,9 @@
      bool immediateRecognition() const;
      void setImmediateRecognition(bool enabled);
++    bool monitorOnly() const;
++    void setMonitorOnly(bool monitorOnly);
++
      bool event(QEvent *e) override;
      /*
@@ -123,6 +130,7 @@
      void touchSceneXChanged(qreal value);
      void touchSceneYChanged(qreal value);
      void immediateRecognitionChanged(bool value);
++    void monitorOnlyChanged(bool value);
  protected:
      void touchEvent(QTouchEvent *event) override;
 === modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea_p.h'
 --- plugins/Ubuntu/Gestures/DirectionalDragArea_p.h	2015-11-20 15:01:39 +0000
 +++ plugins/Ubuntu/Gestures/DirectionalDragArea_p.h	2016-03-10 17:24:40 +0000
@@ -160,6 +160,8 @@
      ActiveTouchesInfo activeTouches;
++    bool monitorOnly;
++
  Q_SIGNALS:
      void statusChanged(Status value);
  };
 === modified file 'plugins/Utils/CMakeLists.txt'
 --- plugins/Utils/CMakeLists.txt	2016-02-08 09:37:48 +0000
 +++ plugins/Utils/CMakeLists.txt	2016-03-10 17:24:40 +0000
@@ -17,7 +17,7 @@
      unitysortfilterproxymodelqml.cpp
      Timer.cpp
      unitymenumodelpaths.cpp
--    windowkeysfilter.cpp
++    windowinputfilter.cpp
      windowscreenshotprovider.cpp
      easingcurve.cpp
      windowstatestorage.cpp
 === modified file 'plugins/Utils/Utils.qmltypes'
 --- plugins/Utils/Utils.qmltypes	2015-09-03 11:08:46 +0000
 +++ plugins/Utils/Utils.qmltypes	2016-03-10 17:24:40 +0000
@@ -147,10 +147,10 @@
+         }
+     }
      Component {
--        name: "WindowKeysFilter"
++        name: "WindowInputFilter"
          defaultProperty: "data"
          prototype: "QQuickItem"
--        exports: ["Utils/WindowKeysFilter 0.1"]
++        exports: ["Utils/WindowInputFilter 0.1"]
          exportMetaObjectRevisions: [0]
+     }
      Component {
 === modified file 'plugins/Utils/plugin.cpp'
 --- plugins/Utils/plugin.cpp	2016-01-29 11:52:14 +0000
 +++ plugins/Utils/plugin.cpp	2016-03-10 17:24:40 +0000
@@ -30,7 +30,7 @@
  #include "qlimitproxymodelqml.h"
  #include "unitysortfilterproxymodelqml.h"
  #include "unitymenumodelpaths.h"
--#include "windowkeysfilter.h"
++#include "windowinputfilter.h"
  #include "windowscreenshotprovider.h"
  #include "windowstatestorage.h"
  #include "constants.h"
@@ -60,7 +60,7 @@
      qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
      qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
      qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
--    qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
++    qmlRegisterType<WindowInputFilter>(uri, 0, 1, "WindowInputFilter");
      qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
      qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
      qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
 === renamed file 'plugins/Utils/windowkeysfilter.cpp' => 'plugins/Utils/windowinputfilter.cpp'
 --- plugins/Utils/windowkeysfilter.cpp	2015-10-22 17:37:26 +0000
 +++ plugins/Utils/windowinputfilter.cpp	2016-03-10 17:24:40 +0000
@@ -16,36 +16,34 @@
   * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
   */
--#include "windowkeysfilter.h"
++#include "windowinputfilter.h"
  #include <QQuickWindow>
--WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
++WindowInputFilter::WindowInputFilter(QQuickItem *parent)
      : QQuickItem(parent),
--      m_currentEventTimestamp(0)
++      m_lastInputTimestamp(0)
+ {
      connect(this, &QQuickItem::windowChanged,
--            this, &WindowKeysFilter::setupFilterOnWindow);
++            this, &WindowInputFilter::setupFilterOnWindow);
+ }
--bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
++bool WindowInputFilter::eventFilter(QObject *watched, QEvent *event)
+ {
      Q_ASSERT(!m_filteredWindow.isNull());
      Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
      Q_UNUSED(watched);
++    QInputEvent *inputEvent = dynamic_cast<QInputEvent*>(event);
++    if (inputEvent) {
++        m_lastInputTimestamp = inputEvent->timestamp();
++        Q_EMIT lastInputTimestampChanged();
++    }
++
      if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
          // Let QML see this event and decide if it does not want it
          event->accept();
--
--        m_currentEventTimestamp = static_cast<QInputEvent*>(event)->timestamp();
--        Q_EMIT currentEventTimestampChanged();
--
          QCoreApplication::sendEvent(this, event);
--
--        m_currentEventTimestamp = 0;
--        Q_EMIT currentEventTimestampChanged();
--
          return event->isAccepted();
      } else {
          // Not interested
@@ -53,7 +51,7 @@
+     }
+ }
--void WindowKeysFilter::setupFilterOnWindow(QQuickWindow *window)
++void WindowInputFilter::setupFilterOnWindow(QQuickWindow *window)
+ {
      if (!m_filteredWindow.isNull()) {
          m_filteredWindow->removeEventFilter(this);
@@ -66,7 +64,7 @@
+     }
+ }
--ulong WindowKeysFilter::currentEventTimestamp() const
++ulong WindowInputFilter::lastInputTimestamp() const
+ {
--    return m_currentEventTimestamp;
++    return m_lastInputTimestamp;
+ }
 === renamed file 'plugins/Utils/windowkeysfilter.h' => 'plugins/Utils/windowinputfilter.h'
 --- plugins/Utils/windowkeysfilter.h	2015-10-22 17:37:26 +0000
 +++ plugins/Utils/windowinputfilter.h	2016-03-10 17:24:40 +0000
@@ -16,8 +16,8 @@
   * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
   */
--#ifndef UNITY_WINDOWKEYSFILTER_H
--#define UNITY_WINDOWKEYSFILTER_H
++#ifndef UNITY_WINDOWINPUTFILTER_H
++#define UNITY_WINDOWINPUTFILTER_H
  #include <QQuickItem>
  #include <QPointer>
@@ -29,30 +29,30 @@
     accepted ones will be filtered out. Events are accepted by default, so make sure you reject
     the keys you're not interested in.
--   If more than one WindowKeysFilter exist in the same QML scene (and thus in the same QQuickWindow)
++   If more than one WindowInputFilter exist in the same QML scene (and thus in the same QQuickWindow)
     they will be called in the order of creation, which can be tricky to assess. So the best practice
--   is to have at most one WindowKeysFilter per QML scene.
++   is to have at most one WindowInputFilter per QML scene.
   */
--class WindowKeysFilter : public QQuickItem
++class WindowInputFilter : public QQuickItem
+ {
      Q_OBJECT
--    Q_PROPERTY(ulong currentEventTimestamp READ currentEventTimestamp NOTIFY currentEventTimestampChanged)
++    Q_PROPERTY(ulong lastInputTimestamp READ lastInputTimestamp NOTIFY lastInputTimestampChanged)
  public:
--    WindowKeysFilter(QQuickItem *parent = 0);
++    WindowInputFilter(QQuickItem *parent = 0);
      bool eventFilter(QObject *watched, QEvent *event) override;
--    ulong currentEventTimestamp() const;
++    ulong lastInputTimestamp() const;
  Q_SIGNALS:
--    void currentEventTimestampChanged();
++    void lastInputTimestampChanged();
  private Q_SLOTS:
      void setupFilterOnWindow(QQuickWindow *window);
  private:
      QPointer<QQuickWindow> m_filteredWindow;
--    ulong m_currentEventTimestamp;
++    ulong m_lastInputTimestamp;
  };
--#endif // UNITY_WINDOWKEYSFILTER_H
++#endif // UNITY_WINDOWINPUTFILTER_H
 === modified file 'qml/Components/InputMethod.qml'
 --- qml/Components/InputMethod.qml	2015-12-02 10:34:31 +0000
 +++ qml/Components/InputMethod.qml	2016-03-10 17:24:40 +0000
@@ -22,15 +22,6 @@
  Item {
      id: root
--    Connections {
--        target: SurfaceManager
--        onSurfaceCreated: {
--            if (surface.type == Mir.InputMethodType) {
--                surfaceItem.surface = surface;
--            }
--        }
--    }
--
      property int transitionDuration: UbuntuAnimation.FastDuration
      MirSurfaceItem {
@@ -41,6 +32,7 @@
          surfaceWidth: width
          surfaceHeight: height
++        surface: SurfaceManager.inputMethodSurface
          onLiveChanged: {
              if (surface !== null && !live) {
 === modified file 'qml/Greeter/Greeter.qml'
 --- qml/Greeter/Greeter.qml	2016-01-11 17:37:02 +0000
 +++ qml/Greeter/Greeter.qml	2016-03-10 17:24:40 +0000
@@ -160,6 +160,14 @@
                  return false;
+             }
+         }
++
++        function checkForcedUnlock() {
++            if (forcedUnlock && shown && loader.item) {
++                // pretend we were just authenticated
++                loader.item.notifyAuthenticationSucceeded();
++                loader.item.hide();
++            }
++        }
+     }
      onLauncherOffsetChanged: {
@@ -168,12 +176,8 @@
+         }
+     }
--    onForcedUnlockChanged: {
--        if (forcedUnlock && shown) {
--            // pretend we were just authenticated
--            loader.item.notifyAuthenticationSucceeded();
--        }
--    }
++    onForcedUnlockChanged: d.checkForcedUnlock()
++    Component.onCompleted: d.checkForcedUnlock()
      onRequiredChanged: {
          if (required) {
 === modified file 'qml/Launcher/Launcher.qml'
 --- qml/Launcher/Launcher.qml	2016-01-19 15:26:15 +0000
 +++ qml/Launcher/Launcher.qml	2016-03-10 17:24:40 +0000
@@ -26,7 +26,6 @@
      property bool autohideEnabled: false
      property bool available: true // can be used to disable all interactions
      property alias inverted: panel.inverted
--    property bool shadeBackground: true // can be used to disable background shade when launcher is visible
      property int panelWidth: units.gu(8)
      property int dragAreaWidth: units.gu(1)
@@ -172,7 +171,7 @@
      InverseMouseArea {
          id: closeMouseArea
          anchors.fill: panel
--        enabled: root.shadeBackground && root.state == "visible"
++        enabled: root.state == "visible"
          visible: enabled
          onPressed: {
              root.hide();
@@ -183,7 +182,7 @@
          id: backgroundShade
          anchors.fill: parent
          color: "black"
--        opacity: root.shadeBackground && root.state == "visible" ? 0.6 : 0
++        opacity: root.state == "visible" ? 0.6 : 0
          Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.BriskDuration } }
+     }
 === modified file 'qml/Panel/IndicatorsMenu.qml'
 --- qml/Panel/IndicatorsMenu.qml	2016-03-08 20:59:14 +0000
 +++ qml/Panel/IndicatorsMenu.qml	2016-03-10 17:24:40 +0000
@@ -36,7 +36,6 @@
      readonly property bool partiallyOpened: unitProgress > 0 && unitProgress < 1.0
      readonly property bool fullyClosed: unitProgress == 0
      property bool enableHint: true
--    property bool contentEnabled: true
      property bool showOnClick: true
      property color panelColor: theme.palette.normal.background
@@ -86,7 +85,6 @@
          height: openedHeight - bar.height - handle.height
          indicatorsModel: root.indicatorsModel
          visible: root.unitProgress > 0
--        enabled: contentEnabled
          currentMenuIndex: bar.currentItemIndex
+     }
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-03-08 20:59:08 +0000
 +++ qml/Shell.qml	2016-03-10 17:24:40 +0000
@@ -24,7 +24,7 @@
  import Ubuntu.Telephony 0.1 as Telephony
  import Unity.Connectivity 0.1
  import Unity.Launcher 0.1
--import GlobalShortcut 1.0 // has to be before Utils, because of WindowKeysFilter
++import GlobalShortcut 1.0 // has to be before Utils, because of WindowInputFilter
  import Utils 0.1
  import Powerd 0.1
  import SessionBroadcast 0.1
@@ -168,12 +168,13 @@
+     }
      GlobalShortcut {
--        // dummy shortcut to force creation of GlobalShortcutRegistry before WindowKeyFilter
++        // dummy shortcut to force creation of GlobalShortcutRegistry before WindowInputFilter
+     }
--    WindowKeysFilter {
--        Keys.onPressed: physicalKeysMapper.onKeyPressed(event, currentEventTimestamp);
--        Keys.onReleased: physicalKeysMapper.onKeyReleased(event, currentEventTimestamp);
++    WindowInputFilter {
++        id: inputFilter
++        Keys.onPressed: physicalKeysMapper.onKeyPressed(event, lastInputTimestamp);
++        Keys.onReleased: physicalKeysMapper.onKeyReleased(event, lastInputTimestamp);
+     }
      WindowInputMonitor {
@@ -201,7 +202,7 @@
              onFocusedApplicationIdChanged: {
                  var appId = ApplicationManager.focusedApplicationId;
--                if (tutorial.running && appId != "" && appId != "unity8-dash") {
++                if (wizard.active && appId != "" && appId != "unity8-dash") {
                      // If this happens on first boot, we may be in edge
                      // tutorial or wizard while receiving a call.  But a call
                      // is more important than wizard so just bail out of those.
@@ -254,8 +255,7 @@
+                 }
+             }
--            property bool interactive: tutorial.spreadEnabled
--                    && (!greeter || !greeter.shown)
++            property bool interactive: (!greeter || !greeter.shown)
                      && panel.indicators.fullyClosed
                      && launcher.progress == 0
                      && !notifications.useModal
@@ -344,37 +344,13 @@
                  value: physicalKeysMapper.altTabPressed
+             }
+         }
--
--        Tutorial {
--            id: tutorial
--            objectName: "tutorial"
--            anchors.fill: parent
--
--            // EdgeDragAreas don't work with mice.  So to avoid trapping the user,
--            // we skip the tutorial on the Desktop to avoid using them.  The
--            // Desktop doesn't use the same spread design anyway.  The tutorial is
--            // all a bit of a placeholder on non-phone form factors right now.
--            // When the design team gives us more guidance, we can do something
--            // more clever here.
--            active: usageScenario != "desktop" && AccountsService.demoEdges
--
--            paused: lightDM.greeter.active
--            launcher: launcher
--            panel: panel
--            edgeSize: shell.edgeSize
--
--            onFinished: {
--                AccountsService.demoEdges = false;
--                active = false; // for immediate response / if AS is having problems
--            }
--        }
+     }
      InputMethod {
          id: inputMethod
          objectName: "inputMethod"
          anchors { fill: parent; topMargin: panel.panelHeight }
--        z: notifications.useModal || panel.indicators.shown || wizard.active ? overlay.z + 1 : overlay.z - 1
++        z: notifications.useModal || panel.indicators.shown || wizard.active || tutorial.running ? overlay.z + 1 : overlay.z - 1
+     }
      Connections {
@@ -405,7 +381,7 @@
              hides: [launcher, panel.indicators]
              tabletMode: shell.usageScenario != "phone"
              launcherOffset: launcher.progress
--            forcedUnlock: tutorial.running
++            forcedUnlock: wizard.active
              background: wallpaperResolver.background
              // avoid overlapping with Launcher's edge drag area
@@ -462,7 +438,7 @@
          onStatusChanged: {
              if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
--                    !callManager.hasCalls && !tutorial.running) {
++                    !callManager.hasCalls && !wizard.active) {
                  // We don't want to simply call greeter.showNow() here, because
                  // that will take too long.  Qt will delay button event
                  // handling until the greeter is done loading and may think the
@@ -478,10 +454,6 @@
+     }
      function showHome() {
--        if (tutorial.running) {
--            return
--        }
--
          greeter.notifyAboutToFocusApp("unity8-dash");
          var animate = !lightDM.greeter.active && !stages.shown
@@ -515,7 +487,6 @@
                  available: tutorial.panelEnabled
                          && ((!greeter || !greeter.locked) || AccountsService.enableIndicatorsWhileLocked)
                          && (!greeter || !greeter.hasLockedApp)
--                contentEnabled: tutorial.panelContentEnabled
                  width: parent.width > units.gu(60) ? units.gu(40) : parent.width
                  minimizedPanelHeight: units.gu(3)
@@ -556,7 +527,6 @@
                      && (!greeter.locked || AccountsService.enableLauncherWhileLocked)
                      && !greeter.hasLockedApp
              inverted: shell.usageScenario !== "desktop"
--            shadeBackground: !tutorial.running
              onShowDashHome: showHome()
              onDash: showDash()
@@ -566,10 +536,8 @@
+                 }
+             }
              onLauncherApplicationSelected: {
--                if (!tutorial.running) {
--                    greeter.notifyAboutToFocusApp(appId);
--                    shell.activateApplication(appId)
--                }
++                greeter.notifyAboutToFocusApp(appId);
++                shell.activateApplication(appId);
+             }
              onShownChanged: {
                  if (shown) {
@@ -578,6 +546,20 @@
+             }
+         }
++        Tutorial {
++            id: tutorial
++            objectName: "tutorial"
++            anchors.fill: parent
++
++            paused: callManager.hasCalls || greeter.shown
++            keyboardVisible: inputMethod.state === "shown"
++            usageScenario: shell.usageScenario
++            lastInputTimestamp: inputFilter.lastInputTimestamp
++            launcher: launcher
++            panel: panel
++            stage: applicationsDisplayLoader.item
++        }
++
          Wizard {
              id: wizard
              objectName: "wizard"
 === modified file 'qml/Stages/AbstractStage.qml'
 --- qml/Stages/AbstractStage.qml	2016-01-14 13:03:20 +0000
 +++ qml/Stages/AbstractStage.qml	2016-03-10 17:24:40 +0000
@@ -28,6 +28,7 @@
      property url background
      property bool beingResized
      property int dragAreaWidth
++    property real dragProgress // How far left the stage has been dragged, used externally by tutorial code
      property bool interactive
      property real inverseProgress // This is the progress for left edge drags, in pixels.
      property bool keepDashRunning: true
 === modified file 'qml/Stages/ApplicationWindow.qml'
 --- qml/Stages/ApplicationWindow.qml	2016-02-12 00:10:54 +0000
 +++ qml/Stages/ApplicationWindow.qml	2016-03-10 17:24:40 +0000
@@ -58,7 +58,6 @@
          readonly property color splashColor: root.application ? root.application.splashColor : "#00000000"
          readonly property color splashColorHeader: root.application ? root.application.splashColorHeader : "#00000000"
          readonly property color splashColorFooter: root.application ? root.application.splashColorFooter : "#00000000"
--        readonly property url defaultScreenshot: (root.application && root.application.defaultScreenshot !== undefined) ? root.application.defaultScreenshot : ""
          // Whether the Application had a surface before but lost it.
          property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
@@ -110,7 +109,6 @@
      Image {
          id: screenshotImage
          objectName: "screenshotImage"
--        source: d.defaultScreenshot
          anchors.fill: parent
          antialiasing: !root.interactive
 === modified file 'qml/Stages/PhoneStage.qml'
 --- qml/Stages/PhoneStage.qml	2016-01-14 13:03:20 +0000
 +++ qml/Stages/PhoneStage.qml	2016-03-10 17:24:40 +0000
@@ -87,14 +87,11 @@
                                     : (Qt.PortraitOrientation | Qt.LandscapeOrientation
                                        | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation)
--    // How far left the stage has been dragged
--    readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
++    // How far left the stage has been dragged, used externally by tutorial code
++    dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0
      readonly property alias dragging: spreadDragArea.dragging
--    // Only used by the tutorial right now, when it is teasing the right edge
--    property real dragAreaOverlap
--
      signal opened()
      function select(appId) {
@@ -598,7 +595,7 @@
          direction: Direction.Leftwards
          enabled: (spreadView.phase != 2 && root.spreadEnabled) || dragging
--        anchors { top: parent.top; right: parent.right; bottom: parent.bottom; rightMargin: -root.dragAreaOverlap }
++        anchors { top: parent.top; right: parent.right; bottom: parent.bottom; }
          width: root.dragAreaWidth
          property var gesturePoints: new Array()
 === modified file 'qml/Stages/TabletStage.qml'
 --- qml/Stages/TabletStage.qml	2016-01-14 13:03:20 +0000
 +++ qml/Stages/TabletStage.qml	2016-03-10 17:24:40 +0000
@@ -27,6 +27,9 @@
      objectName: "stages"
      anchors.fill: parent
++    property bool sideStageVisible: priv.sideStageAppId
++    property real sideStageWidth: units.gu(40)
++
      // Functions to be called from outside
      function updateFocusedAppOrientation() {
          var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
@@ -76,6 +79,9 @@
                                     : (Qt.PortraitOrientation | Qt.LandscapeOrientation
                                        | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation)
++    // How far left the stage has been dragged, used externally by tutorial code
++    dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0
++
      onWidthChanged: {
          spreadView.selectedIndex = -1;
          spreadView.phase = 0;
@@ -237,8 +243,6 @@
          contentX: -shift
          property int tileDistance: units.gu(20)
--        property int sideStageWidth: units.gu(40)
--        property bool sideStageVisible: priv.sideStageAppId
          // This indicates when the spreadView is active. That means, all the animations
          // are activated and tiles need to line up for the spread.
@@ -258,14 +262,14 @@
          // 2: The list is dragged further and snaps into the spread view when entering phase 2
          property int phase
--        readonly property int phase0Width: sideStageWidth
--        readonly property int phase1Width: sideStageWidth
++        readonly property int phase0Width: root.sideStageWidth
++        readonly property int phase1Width: root.sideStageWidth
          // Those markers mark the various positions in the spread (ratio to screen width from right to left):
          // 0 - 1: following finger, snap back to the beginning on release
          readonly property real positionMarker1: 0.2
          // 1 - 2: curved snapping movement, snap to nextInStack on release
--        readonly property real positionMarker2: sideStageWidth / spreadView.width
++        readonly property real positionMarker2: root.sideStageWidth / spreadView.width
          // 2 - 3: movement follows finger, snaps to phase 2 (full spread) on release
          readonly property real positionMarker3: 0.6
          // passing 3, we detach movement from the finger and snap to phase 2 (full spread)
@@ -494,7 +498,7 @@
              Rectangle {
                  id: sideStageBackground
                  color: "black"
--                width: spreadView.sideStageWidth * (1 - sideStageDragHandle.progress)
++                width: root.sideStageWidth * (1 - sideStageDragHandle.progress)
                  height: priv.landscapeHeight
                  x: spreadView.width - width
                  z: spreadView.indexToZIndex(priv.indexOf(priv.sideStageAppId))
@@ -509,16 +513,16 @@
                  width: units.gu(2)
                  height: priv.landscapeHeight
                  z: sideStageBackground.z
--                opacity: spreadView.phase <= 0 && spreadView.sideStageVisible ? 1 : 0
++                opacity: spreadView.phase <= 0 && root.sideStageVisible ? 1 : 0
                  property real progress: 0
                  property bool dragging: false
                  Behavior on opacity { UbuntuNumberAnimation {} }
                  Connections {
--                    target: spreadView
++                    target: root
                      onSideStageVisibleChanged: {
--                        if (spreadView.sideStageVisible) {
++                        if (root.sideStageVisible) {
                              sideStageDragHandle.progress = 0;
+                         }
+                     }
@@ -550,7 +554,7 @@
                      onMouseXChanged: {
                          totalDiff += mouseX - startX;
                          if (priv.mainStageAppId) {
--                            sideStageDragHandle.progress = Math.max(0, totalDiff / spreadView.sideStageWidth);
++                            sideStageDragHandle.progress = Math.max(0, totalDiff / root.sideStageWidth);
+                         }
                          gesturePoints.push(mouseX);
+                     }
@@ -590,7 +594,7 @@
                          if (wantsMainStage) {
                              return spreadView.width;
                          } else {
--                            return spreadView.sideStageWidth;
++                            return root.sideStageWidth;
+                         }
+                     }
                      height: {
 === removed file 'qml/Tutorial/Arrow.qml'
 --- qml/Tutorial/Arrow.qml	2015-07-15 15:07:19 +0000
 +++ qml/Tutorial/Arrow.qml	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--import Ubuntu.Components 1.3
--
--Item {
--    id: root
--
--    property alias color: circle.color
--
--    // Will make whole arrow darker
--    property real darkenBy: 0
--
--    property alias chevronOpacity: chevron.opacity
--
--    ////
--
--    Rectangle {
--        id: circle
--        anchors.fill: parent
--        radius: width / 2
--    }
--
--    Image {
--        id: chevron
--        anchors.centerIn: parent
--        source: Qt.resolvedUrl("graphics/chevron.png")
--        fillMode: Image.PreserveAspectFit
--        sourceSize.width: 152
--        sourceSize.height: 152
--        width: parent.width / 2
--        height: parent.height / 2
--    }
--
--    Rectangle {
--        id: darkCircle
--        anchors.fill: parent
--        radius: width / 2
--        color: "black"
--        opacity: root.darkenBy
--    }
--}
 === added file 'qml/Tutorial/InactivityTimer.qml'
 --- qml/Tutorial/InactivityTimer.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/InactivityTimer.qml	2016-03-10 17:24:40 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++
++Item {
++    readonly property alias running: internalTimer.running
++    property alias interval: internalTimer.interval
++    property var page
++    property int lastInputTimestamp
++
++    function start() {
++        internalTimer.start();
++    }
++
++    ////
++
++    onLastInputTimestampChanged: {
++        if (internalTimer.running) {
++            internalTimer.restart();
++        }
++    }
++
++    Connections {
++        target: page
++        onIsReadyChanged: {
++            if (page.isReady && internalTimer.running) {
++                internalTimer.restart();
++            }
++        }
++    }
++
++    Timer {
++        id: internalTimer
++
++        interval: 3000
++
++        onTriggered: {
++            if (page.isReady) {
++                if (!page.shown) {
++                    page.show();
++                }
++            } else if (!page.skipped) {
++                restart();
++            }
++        }
++    }
++}
 === removed file 'qml/Tutorial/Slider.qml'
 --- qml/Tutorial/Slider.qml	2015-07-15 15:07:19 +0000
 +++ qml/Tutorial/Slider.qml	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--import Ubuntu.Components 1.3
--
--Item {
--    id: root
--
--    // Whether this slider is short or long
--    property bool shortSwipe
--
--    // How far the user has slid
--    property real offset
--
--    // Set to true when slider is being used
--    property bool active
--
--    // How far in percentage terms
--    readonly property real percent: d.slideOffset / target.x
--
--    QtObject {
--        id: d
--        readonly property color trayColor: "#424141"
--        readonly property real margin: units.gu(0.5)
--        readonly property real arrowSize: root.height - margin * 2
--        readonly property real dotSize: units.dp(1)
--        readonly property real slideOffset: MathUtils.clamp(root.offset - offscreenOffset, -offscreenOffset, target.x)
--        readonly property real offscreenOffset: units.gu(2)
--    }
--
--    implicitWidth: shortSwipe ? units.gu(15) : units.gu(27.5)
--    implicitHeight: units.gu(6.5)
--
--    Rectangle {
--        color: d.trayColor
--        anchors.fill: parent
--        anchors.rightMargin: clipBox.width - 1
--    }
--
--    // We want to have a circular border around the target.  But we can't just
--    // do a radius on two of a rectangle's corners.  So we clip a full circle.
--    Item {
--        id: clipBox
--
--        clip: true
--        anchors.top: parent.top
--        anchors.bottom: parent.bottom
--        anchors.right: parent.right
--        width: parent.height / 2
--
--        Rectangle {
--            color: d.trayColor
--            anchors.top: parent.top
--            anchors.bottom: parent.bottom
--            anchors.right: parent.right
--            width: parent.width * 2
--            radius: parent.width
--        }
--    }
--
--    Arrow {
--        id: target
--        width: d.arrowSize
--        height: d.arrowSize
--        color: "#73000000"
--        chevronOpacity: 0.52
--        anchors.right: parent.right
--        anchors.rightMargin: d.margin
--        anchors.verticalCenter: parent.verticalCenter
--    }
--
--    Row {
--        anchors.left: handle.horizontalCenter
--        anchors.right: target.horizontalCenter
--        anchors.verticalCenter: parent.verticalCenter
--
--        layoutDirection: Qt.RightToLeft
--        spacing: d.dotSize * 2
--
--        Repeater {
--            model: parent.width / (parent.spacing + d.dotSize)
--            Rectangle {
--                anchors.verticalCenter: parent ? parent.verticalCenter : undefined
--                height: d.dotSize
--                width: height
--                radius: width
--                color: "white"
--                opacity: 0.2
--            }
--        }
--    }
--
--    Arrow {
--        id: handle
--        width: d.arrowSize
--        height: d.arrowSize
--        color: UbuntuColors.orange
--        darkenBy: root.active ? 0.5 : 0
--        anchors.left: parent.left
--        // We use a Translate transform rather than anchors.leftMargin because
--        // the latter has weird performance problems on the TutorialRight page.
--        transform: [
--            Translate {
--                x: d.slideOffset
--            }
--        ]
--        anchors.verticalCenter: parent.verticalCenter
--    }
--}
 === removed file 'qml/Tutorial/Tick.qml'
 --- qml/Tutorial/Tick.qml	2015-07-15 15:07:19 +0000
 +++ qml/Tutorial/Tick.qml	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
--/*
-- * Copyright (C) 2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--import Ubuntu.Components 1.3
--
--MouseArea {
--    implicitHeight: tick.height
--    implicitWidth: tick.width
--    Image {
--        id: tick
--        source: Qt.resolvedUrl("graphics/tick.png")
--        height: units.gu(6.5)
--        width: units.gu(6.5)
--    }
--}
 === modified file 'qml/Tutorial/Tutorial.qml'
 --- qml/Tutorial/Tutorial.qml	2015-08-25 07:25:26 +0000
 +++ qml/Tutorial/Tutorial.qml	2016-03-10 17:24:40 +0000
@@ -16,21 +16,29 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
++import AccountsService 0.1
++
++/**
++ * This object is always present, so it should be lean and mean.  It will
++ * use a Loader to create the heavier tutorial pages if needed.
++ */
  Item {
      id: root
      property alias active: loader.active
--    property bool paused
--    property real edgeSize
      property Item launcher
      property Item panel
++    property Item stage
++    property string usageScenario
++    property bool paused
++    property bool keyboardVisible
++    property int lastInputTimestamp
      readonly property bool launcherEnabled: loader.item ? loader.item.launcherEnabled : true
      readonly property bool spreadEnabled: loader.item ? loader.item.spreadEnabled : true
      readonly property bool panelEnabled: loader.item ? loader.item.panelEnabled : true
--    readonly property bool panelContentEnabled: loader.item ? loader.item.panelContentEnabled : true
      readonly property bool running: loader.item ? loader.item.running : false
      function finish() {
@@ -39,24 +47,11 @@
+         }
+     }
--    signal finished()
--
      Loader {
          id: loader
          anchors.fill: parent
          source: "TutorialContent.qml"
--
--        Binding {
--            target: loader.item
--            property: "paused"
--            value: root.paused
--        }
--
--        Binding {
--            target: loader.item
--            property: "edgeSize"
--            value: root.edgeSize
--        }
++        active: AccountsService.demoEdges
          Binding {
              target: loader.item
@@ -70,9 +65,39 @@
              value: root.panel
+         }
++        Binding {
++            target: loader.item
++            property: "stage"
++            value: root.stage
++        }
++
++        Binding {
++            target: loader.item
++            property: "usageScenario"
++            value: root.usageScenario
++        }
++
++        Binding {
++            target: loader.item
++            property: "paused"
++            value: root.paused
++        }
++
++        Binding {
++            target: loader.item
++            property: "keyboardVisible"
++            value: root.keyboardVisible
++        }
++
++        Binding {
++            target: loader.item
++            property: "lastInputTimestamp"
++            value: root.lastInputTimestamp
++        }
++
          Connections {
              target: loader.item
--            onFinished: root.finished()
++            onFinished: AccountsService.demoEdges = false
+         }
+     }
+ }
 === added file 'qml/Tutorial/TutorialBottom.qml'
 --- qml/Tutorial/TutorialBottom.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/TutorialBottom.qml	2016-03-10 17:24:40 +0000
@@ -0,0 +1,126 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++import Ubuntu.Gestures 0.1
++import Unity.Application 0.1
++
++TutorialPage {
++    id: root
++
++    property string usageScenario
++    property var stage
++    property var application: null
++
++    // This page is a bit fragile.  It relies on knowing how the app beneath
++    // the shell will react to a drag.  What we do is put a monitor-only DDA
++    // at the bottom of the page (so that we know when the drag is finished)
++    // and pass the events on through to the app.  Thus, it sees the drag and
++    // brings its bottom edge up.
++    //
++    // Unfortunately, each app is on its own when implementing the bottom edge
++    // drag.  Most share copied-and-pasted code right now, but they will
++    // eventually consolidate on a version of DirectionalDragArea that will
++    // land in the SDK (making our guessing job easier).  Though, also in the
++    // future, this whole bottom tutorial component will also land in the SDK,
++    // rendering our version here obsolete.
++    //
++    // Anyway, for the moment, we base our guesses on the copied-and-pasted
++    // code used in several of the core apps and only bring this component
++    // up if we are in those core apps.
++
++    readonly property real mainStageWidth: stage.width - sideStageWidth
++    readonly property real sideStageWidth: root.usageScenario === "tablet" && stage.sideStageVisible ?
++                                           stage.sideStageWidth : 0
++    readonly property bool isMainStageApp: usageScenario !== "tablet" ||
++                                           application.stage === ApplicationInfoInterface.MainStage
++    readonly property real dragAreaHeight: units.gu(3) // based on PageWithBottomEdge.qml
++    readonly property real targetDistance: height * 0.2 + dragAreaHeight // based on PageWithBottomEdge.qml
++
++    opacityOverride: dragArea.dragging ? 1 - (-dragArea.distance / targetDistance) : 1
++
++    mouseArea {
++        anchors.bottomMargin: root.dragAreaHeight
++    }
++
++    background {
++        sourceSize.height: 1916
++        sourceSize.width: 1080
++        source: Qt.resolvedUrl("graphics/background2.png")
++        rotation: 180
++    }
++
++    arrow {
++        anchors.bottom: root.bottom
++        anchors.bottomMargin: units.gu(3)
++        anchors.horizontalCenter: label.horizontalCenter
++        anchors.horizontalCenterOffset: -(label.width - label.contentWidth) / 2
++        rotation: 90
++    }
++
++    label {
++        text: !application ? "" :
++              application.appId === "address-book-app" ?
++                                    i18n.tr("Swipe up to add a contact") :
++              application.appId === "com.ubuntu.calculator_calculator" ?
++                                    i18n.tr("Swipe up for favorite calculations") :
++              application.appId === "com.ubuntu.clock_clock" ?
++                                    i18n.tr("Swipe up to manage alarms") :
++              application.appId === "dialer-app" ?
++                                    i18n.tr("Swipe up for recent calls") :
++              application.appId === "messaging-app" ?
++                                    i18n.tr("Swipe up to create a message") :
++              i18n.tr("Swipe up to manage the app") // shouldn't be used
++        anchors.bottom: arrow.top
++        anchors.bottomMargin: units.gu(3)
++        anchors.left: root.left
++        anchors.leftMargin: (label.width - label.contentWidth) / 2 + sideMargin +
++                            (isMainStageApp ? 0 : mainStageWidth)
++        width: (isMainStageApp ? mainStageWidth : sideStageWidth) - sideMargin * 2
++
++        readonly property real sideMargin: units.gu(4)
++    }
++
++    // Watches drag events but does not intercept them, so that the app beneath
++    // will still drag the bottom edge up.
++    DirectionalDragArea {
++        id: dragArea
++        monitorOnly: true
++        direction: Direction.Upwards
++        anchors.left: parent.left
++        anchors.right: parent.right
++        anchors.bottom: parent.bottom
++        height: root.dragAreaHeight
++
++        // Apps currently don't use DDA.  DDA will stop a gesture if
++        // horizontal motion is detected.  But our apps won't.  So turn off
++        // that gesture cleverness on our part, it will only get us out of sync.
++        immediateRecognition: true
++    }
++
++    MouseArea {
++        // A second mouse area because in tablet mode, we only want to let the
++        // user drag up on one of the stages, not both.  So we want to cover
++        // the second bottom edge with an event eater.
++        enabled: root.usageScenario === "tablet"
++        height: root.dragAreaHeight
++        width: isMainStageApp ? sideStageWidth : mainStageWidth
++        anchors.bottom: parent.bottom
++        anchors.left: isMainStageApp ? undefined : parent.left
++        anchors.right: isMainStageApp ? parent.right : undefined
++    }
++}
 === removed file 'qml/Tutorial/TutorialBottom.qml'
 --- qml/Tutorial/TutorialBottom.qml	2015-07-15 15:07:19 +0000
 +++ qml/Tutorial/TutorialBottom.qml	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--import Ubuntu.Components 1.3
--import Ubuntu.Gestures 0.1
--import "../Components"
--import "." as LocalComponents
--
--TutorialPage {
--    id: root
--
--    property alias edgeSize: dragArea.height
--
--    title: i18n.tr("Open special menus")
--    text: i18n.tr("Swipe up from the bottom edge.")
--    fullTextWidth: true
--
--    SequentialAnimation {
--        id: teaseAnimation
--        paused: running && root.paused
--        running: !dragArea.useTouchY && slider.dragOffset === 0
--        loops: Animation.Infinite
--
--        UbuntuNumberAnimation {
--            target: slider
--            property: "teaseOffset"
--            to: units.gu(1)
--            duration: UbuntuAnimation.SleepyDuration
--        }
--        UbuntuNumberAnimation {
--            target: slider
--            property: "teaseOffset"
--            to: 0
--            duration: UbuntuAnimation.SleepyDuration
--        }
--    }
--
--    foreground {
--        children: [
--            LocalComponents.Slider {
--                id: slider
--                anchors {
--                    bottom: parent.bottom
--                    bottomMargin: width / 2 - height / 2
--                    horizontalCenter: parent.horizontalCenter
--                }
--                rotation: -90
--                offset: teaseOffset + dragOffset
--                active: dragArea.dragging
--
--                property real teaseOffset
--                property real dragOffset: dragArea.useTouchY ? -dragArea.touchY : 0
--
--                Behavior on dragOffset {
--                    id: offsetAnimation
--                    UbuntuNumberAnimation {}
--                }
--            }
--        ]
--    }
--
--    DirectionalDragArea {
--        id: dragArea
--        direction: Direction.Upwards
--        anchors {
--            bottom: parent.bottom
--            left: parent.left
--            right: parent.right
--        }
--
--        property bool useTouchY
--
--        onDraggingChanged: {
--            if (!dragging) {
--                if (slider.percent >= 0.85) {
--                    root.hide();
--                } else if (slider.percent >= 0.15) {
--                    root.showError();
--                }
--            }
--
--            // We use a separate vars here rather than just directly looking at
--            // 'dragging' because we want to preserve our 'slider.offset'
--            // value during the above percent check.  Now that we made it,
--            // we can have 'slider.offset' go back to zero.
--            offsetAnimation.enabled = !dragging;
--            useTouchY = dragging;
--        }
--    }
--}
 === removed file 'qml/Tutorial/TutorialBottomFinish.qml'
 --- qml/Tutorial/TutorialBottomFinish.qml	2015-07-15 15:07:19 +0000
 +++ qml/Tutorial/TutorialBottomFinish.qml	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--import Ubuntu.Components 1.3
--import "." as LocalComponents
--
--TutorialPage {
--    id: root
--
--    title: i18n.tr("This action does different things for different apps")
--    text: i18n.tr("Tap here to finish.")
--    fullTextWidth: true
--
--    foreground {
--        children: [
--            LocalComponents.Tick {
--                objectName: "tick"
--                anchors {
--                    horizontalCenter: parent.horizontalCenter
--                    top: parent.top
--                    topMargin: root.textBottom + units.gu(3)
--                }
--                onClicked: root.hide()
--            }
--        ]
--    }
--}
 === modified file 'qml/Tutorial/TutorialContent.qml'
 --- qml/Tutorial/TutorialContent.qml	2015-08-25 07:25:26 +0000
 +++ qml/Tutorial/TutorialContent.qml	2016-03-10 17:24:40 +0000
@@ -16,103 +16,273 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
++import AccountsService 0.1
++import Unity.Application 0.1
  Item {
      id: root
      property Item launcher
      property Item panel
--
--    readonly property bool launcherEnabled: !running ||
--                                            (!paused && tutorialLeft.shown)
--    readonly property bool spreadEnabled: !running
--    readonly property bool panelEnabled: !running
--    readonly property bool panelContentEnabled: !running
--    readonly property alias running: d.running
--
--    property bool paused: false
--    property real edgeSize
++    property Item stage
++    property string usageScenario
++    property bool paused
++    property bool keyboardVisible
++    property var lastInputTimestamp
++
++    readonly property bool launcherEnabled: !running
++                                            || tutorialLeftLoader.shown
++                                            || tutorialLeftLongLoader.shown
++    readonly property bool spreadEnabled: !running || tutorialRightLoader.shown
++    readonly property bool panelEnabled: !running || tutorialTopLoader.shown
++    readonly property bool running: tutorialLeftLoader.shown
++                                    || tutorialTopLoader.shown
++                                    || tutorialRightLoader.shown
++                                    || tutorialBottomLoader.shown
      signal finished()
      function finish() {
--        d.stop();
          finished();
+     }
      ////
--    Component.onCompleted: {
--        d.start();
--    }
--
      QtObject {
          id: d
--        property bool running
--
--        function stop() {
--            running = false;
--        }
--
--        function start() {
--            running = true;
--            tutorialLeft.show();
--        }
--    }
--
--    TutorialLeft {
--        id: tutorialLeft
--        objectName: "tutorialLeft"
--        anchors.fill: parent
--        launcher: root.launcher
--        paused: !shown || root.paused
--
--        onFinished: tutorialLeftFinish.show()
--    }
--
--    TutorialLeftFinish {
--        id: tutorialLeftFinish
--        objectName: "tutorialLeftFinish"
--        anchors.fill: parent
--        textXOffset: root.launcher.panelWidth
--        paused: !shown || root.paused
--        text: i18n.tr("Tap here to continue.")
--
--        onFinished: {
--            root.launcher.hide();
--            tutorialRight.show();
--        }
--    }
--
--    TutorialRight {
--        id: tutorialRight
--        objectName: "tutorialRight"
--        anchors.fill: parent
--        edgeSize: root.edgeSize
--        panel: root.panel
--        paused: !shown || root.paused
--
--        onFinished: tutorialBottom.show()
--    }
--
--    TutorialBottom {
--        id: tutorialBottom
--        objectName: "tutorialBottom"
--        anchors.fill: parent
--        edgeSize: root.edgeSize
--        paused: !shown || root.paused
--
--        onFinished: tutorialBottomFinish.show()
--    }
--
--    TutorialBottomFinish {
--        id: tutorialBottomFinish
--        objectName: "tutorialBottomFinish"
--        anchors.fill: parent
--        backgroundFadesOut: true
--        paused: !shown || root.paused
--
--        onFinished: root.finish()
++        // We allow "" because it is briefly empty on startup, and we don't
++        // want to improperly skip any mobile tutorials.
++        property bool mobileScenario: root.usageScenario === "" ||
++                                      root.usageScenario === "phone" ||
++                                      root.usageScenario === "tablet"
++
++        property var focusedApp: ApplicationManager.focusedApplicationId
++                                 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
++                                 : null
++
++        function haveShown(tutorialId) {
++            return AccountsService.demoEdgesCompleted.indexOf(tutorialId) != -1;
++        }
++
++        property bool endPointsFinished: tutorialRightLoader.skipped &&
++                                         tutorialBottomLoader.skipped
++        onEndPointsFinishedChanged: if (endPointsFinished) root.finish()
++    }
++
++    Loader {
++        id: tutorialLeftLoader
++        objectName: "tutorialLeftLoader"
++        anchors.fill: parent
++
++        readonly property bool skipped: !d.mobileScenario || d.haveShown("left")
++        readonly property bool shown: item && item.shown
++        active: !skipped || (item && item.visible)
++        onSkippedChanged: if (skipped && shown) item.hide()
++
++        sourceComponent: TutorialLeft {
++            id: tutorialLeft
++            objectName: "tutorialLeft"
++            anchors.fill: parent
++            launcher: root.launcher
++            hides: [launcher, panel.indicators]
++            paused: root.paused
++
++            isReady: !tutorialLeftLoader.skipped && !paused && !keyboardVisible
++
++            // Use an idle timer here, because when constructed, all our isReady variables will be false.
++            // Qml needs a moment to copy their values from Tutorial.qml.  So we idle it and recheck.
++            Timer {
++                id: tutorialLeftTimer
++                interval: 0
++                onTriggered: if (tutorialLeft.isReady && !tutorialLeft.shown) tutorialLeft.show()
++            }
++
++            onIsReadyChanged: if (isReady && !shown) tutorialLeftTimer.start()
++            onFinished: AccountsService.markDemoEdgeCompleted("left")
++        }
++    }
++
++    Loader {
++        id: tutorialLeftLongLoader
++        objectName: "tutorialLeftLongLoader"
++        anchors.fill: parent
++
++        readonly property bool skipped: !d.mobileScenario || d.haveShown("left-long")
++        readonly property bool shown: item && item.shown
++        active: !skipped || (item && item.visible)
++        onSkippedChanged: if (skipped && shown) item.hide()
++
++        sourceComponent: TutorialLeftLong {
++            id: tutorialLeftLong
++            objectName: "tutorialLeftLong"
++            anchors.fill: parent
++            launcher: root.launcher
++            hides: [launcher, panel.indicators]
++            paused: root.paused
++
++            skipped: tutorialLeftLongLoader.skipped
++            isReady: tutorialLeftLoader.skipped && !skipped && !paused && !keyboardVisible &&
++                     !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow
++
++            Timer {
++                id: tutorialLeftLongTimer
++                objectName: "tutorialLeftLongTimer"
++                interval: 5000
++                onTriggered: {
++                    if (parent.isReady) {
++                        if (!parent.shown) {
++                            parent.show();
++                        }
++                    } else if (!parent.skipped) {
++                        restart();
++                    }
++                }
++            }
++
++            onIsReadyChanged: if (isReady && !shown) tutorialLeftLongTimer.start()
++            onFinished: AccountsService.markDemoEdgeCompleted("left-long")
++        }
++    }
++
++    Loader {
++        id: tutorialTopLoader
++        objectName: "tutorialTopLoader"
++        anchors.fill: parent
++
++        readonly property bool skipped: !d.mobileScenario || d.haveShown("top")
++        readonly property bool shown: item && item.shown
++        active: !skipped || (item && item.visible)
++        onSkippedChanged: if (skipped && shown) item.hide()
++
++        sourceComponent: TutorialTop {
++            id: tutorialTop
++            objectName: "tutorialTop"
++            anchors.fill: parent
++            panel: root.panel
++            hides: [launcher, panel.indicators]
++            paused: root.paused
++
++            skipped: tutorialTopLoader.skipped
++            isReady: tutorialLeftLongLoader.skipped && !skipped && !paused && !keyboardVisible &&
++                     !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow
++
++            // We fire 30s after left edge tutorial, with at least 3s of inactivity
++
++            InactivityTimer {
++                id: tutorialTopInactivityTimer
++                lastInputTimestamp: root.lastInputTimestamp
++                page: parent
++            }
++
++            Timer {
++                id: tutorialTopTimer
++                objectName: "tutorialTopTimer"
++                interval: 27000
++                onTriggered: tutorialTopInactivityTimer.start()
++            }
++
++            onIsReadyChanged: if (isReady && !shown) tutorialTopTimer.start()
++            onFinished: AccountsService.markDemoEdgeCompleted("top")
++        }
++    }
++
++    Loader {
++        id: tutorialRightLoader
++        objectName: "tutorialRightLoader"
++        anchors.fill: parent
++
++        readonly property bool skipped: d.haveShown("right")
++        readonly property bool shown: item && item.shown
++        active: !skipped || (item && item.visible)
++        onSkippedChanged: if (skipped && shown) item.hide()
++
++        sourceComponent: TutorialRight {
++            id: tutorialRight
++            objectName: "tutorialRight"
++            anchors.fill: parent
++            stage: root.stage
++            usageScenario: root.usageScenario
++            hides: [launcher, panel.indicators]
++            paused: root.paused
++
++            skipped: tutorialRightLoader.skipped
++            isReady: tutorialTopLoader.skipped && !skipped && !paused && !keyboardVisible &&
++                     !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow &&
++                     ApplicationManager.count >= 3
++
++            InactivityTimer {
++                id: tutorialRightInactivityTimer
++                objectName: "tutorialRightInactivityTimer"
++                lastInputTimestamp: root.lastInputTimestamp
++                page: parent
++            }
++
++            Connections {
++                target: d
++                onFocusedAppChanged: {
++                    if (tutorialRight.isReady && !tutorialRight.shown && d.focusedApp
++                            && d.focusedApp.state === ApplicationInfoInterface.Starting) {
++                        tutorialRight.show();
++                    }
++                }
++            }
++
++            onIsReadyChanged: if (isReady && !shown) tutorialRightInactivityTimer.start()
++            onFinished: AccountsService.markDemoEdgeCompleted("right")
++        }
++    }
++
++    Loader {
++        id: tutorialBottomLoader
++        objectName: "tutorialBottomLoader"
++        anchors.fill: parent
++
++        // See TutorialBottom.qml for an explanation of why we only support
++        // certain apps.
++        readonly property var supportedApps: ["address-book-app",
++                                              "com.ubuntu.calculator_calculator",
++                                              "dialer-app",
++                                              "messaging-app"]
++        readonly property bool skipped: {
++            if (!d.mobileScenario) {
++                return true;
++            }
++            for (var i = 0; i < supportedApps.length; i++) {
++                if (!d.haveShown("bottom-" + supportedApps[i])) {
++                    return false;
++                }
++            }
++            return true;
++        }
++        readonly property bool shown: item && item.shown
++        readonly property bool haveShownFocusedApp: d.focusedApp &&
++                                                    d.haveShown("bottom-" + d.focusedApp.appId)
++        readonly property bool mightShow: !skipped && d.focusedApp &&
++                                          supportedApps.indexOf(d.focusedApp.appId) !== -1 &&
++                                          !haveShownFocusedApp
++        active: !skipped || (item && item.visible)
++        onHaveShownFocusedAppChanged: if (haveShownFocusedApp && shown) hide()
++        onSkippedChanged: if (skipped && shown) item.hide()
++
++        sourceComponent: TutorialBottom {
++            id: tutorialBottom
++            objectName: "tutorialBottom"
++            anchors.fill: parent
++            hides: [launcher, panel.indicators]
++            paused: root.paused
++            usageScenario: root.usageScenario
++            stage: root.stage
++            application: d.focusedApp
++
++            skipped: tutorialBottomLoader.skipped
++            isReady: !tutorialBottomLoader.skipped && !paused && !keyboardVisible &&
++                     !tutorialTopLoader.shown && !tutorialRightLoader.shown &&
++                     tutorialBottomLoader.mightShow &&
++                     d.focusedApp.state === ApplicationInfoInterface.Running
++
++            onIsReadyChanged: if (isReady && !shown) show()
++            onFinished: AccountsService.markDemoEdgeCompleted("bottom-" + d.focusedApp.appId)
++        }
+     }
+ }
 === modified file 'qml/Tutorial/TutorialLeft.qml'
 --- qml/Tutorial/TutorialLeft.qml	2015-07-21 14:38:35 +0000
 +++ qml/Tutorial/TutorialLeft.qml	2016-03-10 17:24:40 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014,2015 Canonical, Ltd.
++ * Copyright (C) 2015 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -23,79 +23,32 @@
      property var launcher
--    title: i18n.tr("Open the launcher")
--    text: i18n.tr("Short swipe from the left edge.")
--
--    textXOffset: root.launcher.x + root.launcher.visibleWidth
--
--    Connections {
--        target: root.launcher
--
--        onStateChanged: {
--            if (root.launcher.state === "visible") {
--                finishTimer.start();
--            }
--        }
--
--        onDash: {
--            finishTimer.stop();
--            root.showError();
--            root.launcher.hide();
--        }
--    }
--
--    SequentialAnimation {
--        id: teaseAnimation
--        objectName: "teaseAnimation"
--        paused: running && root.paused
--        running: !slider.active && root.launcher.visibleWidth === 0 && root.shown
--        loops: Animation.Infinite
--        property real bounce: 0
--        readonly property real maxBounce: units.gu(2)
--
--        UbuntuNumberAnimation {
--            target: teaseAnimation
--            property: "bounce"
--            to: teaseAnimation.maxBounce
--            duration: UbuntuAnimation.SleepyDuration
--        }
--        UbuntuNumberAnimation {
--            target: teaseAnimation
--            property: "bounce"
--            to: 0
--            duration: UbuntuAnimation.SleepyDuration
--        }
--    }
--
--    Binding {
--        target: root.launcher
--        when: root.shown
--        property: "x"
--        value: Math.min(root.launcher.panelWidth - root.launcher.visibleWidth, teaseAnimation.bounce)
--    }
--
--    Timer {
--        id: finishTimer
--        interval: 1
--        onTriggered: {
--            root.hide();
--            root.launcher.x = 0; // make sure to reset launcher before we go
--        }
--    }
--
--    foreground {
--        children: [
--            LocalComponents.Slider {
--                id: slider
--                anchors {
--                    left: parent.left
--                    top: parent.top
--                    topMargin: root.textBottom + units.gu(3)
--                }
--                offset: root.launcher.x + root.launcher.visibleWidth + root.launcher.progress
--                active: root.launcher.dragging
--                shortSwipe: true
--            }
--        ]
++    opacityOverride: 1 - launcher.visibleWidth / launcher.panelWidth
++
++    mouseArea {
++        anchors.leftMargin: launcher.dragAreaWidth
++    }
++
++    background {
++        sourceSize.height: 1916
++        sourceSize.width: 1080
++        source: Qt.resolvedUrl("graphics/background1.png")
++        mirror: true
++    }
++
++    arrow {
++        anchors.left: root.left
++        anchors.leftMargin: units.gu(2)
++        anchors.verticalCenter: root.verticalCenter
++        rotation: 180
++    }
++
++    label {
++        text: i18n.tr("Swipe from the left edge to open the launcher")
++        anchors.left: arrow.right
++        anchors.leftMargin: units.gu(3)
++        anchors.right: root.right
++        anchors.rightMargin: units.gu(4)
++        anchors.verticalCenter: arrow.verticalCenter
+     }
+ }
 === removed file 'qml/Tutorial/TutorialLeftFinish.qml'
 --- qml/Tutorial/TutorialLeftFinish.qml	2015-07-15 15:07:19 +0000
 +++ qml/Tutorial/TutorialLeftFinish.qml	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--import Ubuntu.Components 1.3
--import "." as LocalComponents
--
--TutorialPage {
--    id: root
--
--    title: i18n.tr("These are the shortcuts to favorite apps")
--    text: i18n.tr("Tap here to continue.")
--    fullTextWidth: true
--
--    foreground {
--        children: [
--            LocalComponents.Tick {
--                objectName: "tick"
--                anchors {
--                    horizontalCenter: parent.horizontalCenter
--                    top: parent.top
--                    topMargin: root.textBottom + units.gu(3)
--                }
--                onClicked: root.hide()
--            }
--        ]
--    }
--}
 === added file 'qml/Tutorial/TutorialLeftLong.qml'
 --- qml/Tutorial/TutorialLeftLong.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/TutorialLeftLong.qml	2016-03-10 17:24:40 +0000
@@ -0,0 +1,54 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++import "." as LocalComponents
++
++TutorialPage {
++    id: root
++
++    property var launcher
++
++    opacityOverride: 1 - launcher.dragDistance / launcher.minimizeDistance
++
++    mouseArea {
++        anchors.leftMargin: launcher.dragAreaWidth
++    }
++
++    background {
++        sourceSize.height: 1916
++        sourceSize.width: 1080
++        source: Qt.resolvedUrl("graphics/background1.png")
++        mirror: true
++    }
++
++    arrow {
++        anchors.left: root.left
++        anchors.leftMargin: units.gu(2)
++        anchors.verticalCenter: root.verticalCenter
++        rotation: 180
++    }
++
++    label {
++        text: i18n.tr("Long swipe from the left edge to open the Today scope")
++        anchors.left: arrow.right
++        anchors.leftMargin: units.gu(3)
++        anchors.right: root.right
++        anchors.rightMargin: units.gu(4)
++        anchors.verticalCenter: arrow.verticalCenter
++    }
++}
 === modified file 'qml/Tutorial/TutorialPage.qml'
 --- qml/Tutorial/TutorialPage.qml	2015-07-15 15:07:19 +0000
 +++ qml/Tutorial/TutorialPage.qml	2016-03-10 17:24:40 +0000
@@ -21,225 +21,101 @@
  Showable {
      id: root
--    // This is the header displayed, like "Right edge"
--    property alias title: titleLabel.text
--
--    // This is the block of text displayed below the header
--    property alias text: textLabel.text
--
--    // Whether animations are paused
++    property alias arrow: arrow
++    property alias label: label
++    property alias background: background
++    property alias mouseArea: mouseArea
++    property real opacityOverride: 1
      property bool paused
--
--    // Whether to give the text the full width that the title has
--    property bool fullTextWidth
--
--    // Whether whole page (background + foreground) or just the foreground fades in
--    property bool backgroundFadesIn: false
--
--    // Whether whole page (background + foreground) or just the foreground fades out
--    property bool backgroundFadesOut: false
--
--    // The foreground Item, add children to it that you want to fade in
--    property alias foreground: foregroundExtra
--
--    // The text label bottom, so you can position elements relative to it
--    readonly property real textBottom: Math.max(textLabel.y + textLabel.height, errorTextLabel.y + errorTextLabel.height)
--
--    // The MouseArea that eats events (so you can adjust size as you will)
--    property alias mouseArea: mouseArea
--
--    // X/Y offsets for text
--    property real textXOffset: 0
--    property real textYOffset: 0
--
--    // Foreground text opacity
--    property real textOpacity: 1
++    property bool skipped
++    property bool isReady
      signal finished()
--    function showError() {
--        errorTimer.start();
--    }
--
      ////
++    QtObject {
++        id: d
++        property bool showOnUnpause
++    }
++
      visible: false
      shown: false
--    property real _foregroundHideOpacity
++    opacity: Math.max(Math.min(_showOpacity, opacityOverride), 0)
++    onOpacityOverrideChanged: {
++        if (opacityOverride <= 0) {
++            d.showOnUnpause = false;
++            hide();
++        }
++    }
++    property real _showOpacity: 0
++
++    onPausedChanged: {
++        if (paused && shown) {
++            d.showOnUnpause = true;
++            hide();
++        } else if (!paused && d.showOnUnpause) {
++            if (isReady) {
++                show();
++            } else if (hideAnimation.running) {
++                hideAnimation.stop();
++            }
++            d.showOnUnpause = false;
++        }
++    }
      showAnimation: StandardAnimation {
--        property: root.backgroundFadesIn ? "opacity" : "_foregroundHideOpacity"
++        property: "_showOpacity"
          from: 0
          to: 1
--        duration: root.backgroundFadesIn ? UbuntuAnimation.SleepyDuration : UbuntuAnimation.BriskDuration
++        duration: UbuntuAnimation.SleepyDuration
          onStarted: root.visible = true
+     }
      hideAnimation: StandardAnimation {
--        property: root.backgroundFadesOut ? "opacity" : "_foregroundHideOpacity"
++        property: "_showOpacity"
          to: 0
          duration: UbuntuAnimation.BriskDuration
          onStopped: {
              root.visible = false;
--            root.finished();
--        }
--    }
--
--    QtObject {
--        id: d
--
--        readonly property real sideMargin: units.gu(5.5)
--        readonly property real verticalOffset: -units.gu(9)
--        readonly property real textXOffset: Math.max(0, root.textXOffset - sideMargin + units.gu(2))
--
--        property real fadeInOffset: {
--            if (showAnimation.running) {
--                var opacity = root[root.showAnimation.property]
--                return (1 - opacity) * units.gu(3);
--            } else {
--                return 0;
++            if (!d.showOnUnpause) {
++                root.finished();
+             }
+         }
+     }
--    Timer {
--        id: errorTimer
--        interval: 3500
--    }
--
      MouseArea { // eat any errant presses
          id: mouseArea
          anchors.fill: parent
+     }
--    Rectangle {
--        anchors.fill: parent
--        color: "black"
--        opacity: 0.82
--    }
--
--    Item {
--        id: foreground
--        anchors.fill: parent
--        opacity: root._foregroundHideOpacity
--
--        Item {
--            anchors.fill: parent
--            opacity: root.textOpacity
--
--            Label {
--                id: titleLabel
--                anchors {
--                    top: parent.verticalCenter
--                    topMargin: d.verticalOffset + root.textYOffset
--                    left: parent.left
--                    leftMargin: d.sideMargin + d.textXOffset
--                }
--                width: parent.width - d.sideMargin * 2
--                horizontalAlignment: Text.AlignLeft
--                wrapMode: Text.Wrap
--                font.weight: Font.Light
--                font.pixelSize: units.gu(3.5)
--            }
--
--            Label {
--                id: textLabel
--                anchors {
--                    top: titleLabel.bottom
--                    topMargin: units.gu(2)
--                    left: parent.left
--                    leftMargin: d.sideMargin + d.textXOffset
--                }
--                width: (parent.width - d.sideMargin * 2) * (fullTextWidth ? 1 : 0.66)
--                horizontalAlignment: Text.AlignLeft
--                wrapMode: Text.Wrap
--                font.weight: Font.Light
--                font.pixelSize: units.gu(2.5)
--            }
--
--            // We use two separate labels like this rather than just changing
--            // the text of the above labels because we want to know where to place
--            // sliders (via root.textBottom) without having that place change
--            // as the text changes length.
--            Label {
--                id: errorTitleLabel
--                objectName: "errorTitleLabel"
--                anchors {
--                    top: titleLabel.top
--                    left: titleLabel.left
--                }
--                width: titleLabel.width
--                horizontalAlignment: titleLabel.horizontalAlignment
--                wrapMode: titleLabel.wrapMode
--                font.weight: titleLabel.font.weight
--                font.pixelSize: titleLabel.font.pixelSize
--                opacity: 0
--                text: i18n.tr("You almost got it!")
--            }
--
--            Label {
--                id: errorTextLabel
--                objectName: "errorTextLabel"
--                anchors {
--                    top: errorTitleLabel.bottom
--                    topMargin: textLabel.anchors.topMargin
--                    left: textLabel.left
--                }
--                width: textLabel.width
--                horizontalAlignment: textLabel.horizontalAlignment
--                wrapMode: textLabel.wrapMode
--                font.weight: textLabel.font.weight
--                font.pixelSize: textLabel.font.pixelSize
--                opacity: 0
--                text: i18n.tr("Try again.")
--            }
--        }
--
--        // A place for subclasses to add extra widgets
--        Item {
--            id: foregroundExtra
--            anchors.fill: parent
--        }
--    }
--
--    states: State {
--        name: "errorState"
--        when: errorTimer.running
--        PropertyChanges { target: titleLabel; opacity: 0 }
--        PropertyChanges { target: textLabel; opacity: 0 }
--        PropertyChanges { target: errorTitleLabel; opacity: 1 }
--        PropertyChanges { target: errorTextLabel; opacity: 1 }
--    }
--
--    transitions: Transition {
--        to: "errorState"
--        reversible: true
--        SequentialAnimation {
--            ParallelAnimation {
--                StandardAnimation {
--                    target: titleLabel
--                    property: "opacity"
--                    duration: UbuntuAnimation.BriskDuration
--                }
--                StandardAnimation {
--                    target: textLabel
--                    property: "opacity"
--                    duration: UbuntuAnimation.BriskDuration
--                }
--            }
--            ParallelAnimation {
--                StandardAnimation {
--                    target: errorTitleLabel
--                    property: "opacity"
--                    duration: UbuntuAnimation.BriskDuration
--                }
--                StandardAnimation {
--                    target: errorTextLabel
--                    property: "opacity"
--                    duration: UbuntuAnimation.BriskDuration
--                }
--            }
--        }
++    Image {
++        id: background
++        // Use x/y/height/width instead of anchors so that we don't adjust
++        // the image if the OSK appears.
++        x: 0
++        y: 0
++        height: root.height
++        width: root.width
++        fillMode: Image.PreserveAspectCrop
++    }
++
++    Image {
++        id: arrow
++        width: units.gu(1.5)
++        source: Qt.resolvedUrl("graphics/arrow.svg")
++        fillMode: Image.PreserveAspectFit
++        mipmap: true
++    }
++
++    Label {
++        id: label
++        objectName: "tutorialLabel"
++        fontSize: "large"
++        font.weight: Font.Light
++        color: "#333333"
++        wrapMode: Text.Wrap
++        lineHeight: 1.2
+     }
+ }
 === added file 'qml/Tutorial/TutorialRight.qml'
 --- qml/Tutorial/TutorialRight.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/TutorialRight.qml	2016-03-10 17:24:40 +0000
@@ -0,0 +1,61 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++
++TutorialPage {
++    id: root
++
++    property var stage
++    property string usageScenario
++
++    // When on phone or tablet, fade out as the drag progresses
++    opacityOverride: usageScenario === "desktop" ? 1 : 1 - stage.dragProgress * 2
++
++    // Else on desktop, fade out when the spread is shown
++    Connections {
++        target: usageScenario === "desktop" ? stage : null
++        ignoreUnknownSignals: true
++        onSpreadShownChanged: if (stage.spreadShown && root.shown) root.hide()
++    }
++
++    mouseArea {
++        anchors.rightMargin: stage.dragAreaWidth
++    }
++
++    background {
++        sourceSize.height: 1916
++        sourceSize.width: 1080
++        source: Qt.resolvedUrl("graphics/background1.png")
++    }
++
++    arrow {
++        anchors.right: root.right
++        anchors.rightMargin: units.gu(2)
++        anchors.verticalCenter: root.verticalCenter
++    }
++
++    label {
++        text: root.usageScenario === "desktop" ?
++                    i18n.tr("Hover your mouse on the right edge to view your open apps") :
++                    i18n.tr("Short or long swipe from the right edge to view your open apps")
++        anchors.right: arrow.left
++        anchors.rightMargin: units.gu(2) - (label.width - label.contentWidth)
++        anchors.verticalCenter: arrow.verticalCenter
++        width: Math.min(units.gu(40), arrow.x - units.gu(4))
++    }
++}
 === removed file 'qml/Tutorial/TutorialRight.qml'
 --- qml/Tutorial/TutorialRight.qml	2015-07-15 15:07:19 +0000
 +++ qml/Tutorial/TutorialRight.qml	1970-01-01 00:00:00 +0000
@@ -1,223 +0,0 @@
--/*
-- * Copyright (C) 2014 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--import Ubuntu.Components 1.3
--import Ubuntu.Gestures 0.1
--import Unity.Application 0.1
--import "../Components"
--import "../Stages"
--import "." as LocalComponents
--
--TutorialPage {
--    id: root
--
--    property var panel
--    property alias edgeSize: stage.dragAreaWidth
--
--    title: i18n.tr("To view open apps")
--    text: i18n.tr("Long swipe from the right edge.")
--
--    textOpacity: 1 - slider.percent
--
--    SequentialAnimation {
--        id: teaseAnimation
--        paused: running && root.paused
--        running: !stage.dragging && stage.dragProgress === 0
--        loops: Animation.Infinite
--
--        UbuntuNumberAnimation {
--            target: stage
--            property: "x"
--            to: -units.gu(2)
--            duration: UbuntuAnimation.SleepyDuration
--        }
--        UbuntuNumberAnimation {
--            target: stage
--            property: "x"
--            to: 0
--            duration: UbuntuAnimation.SleepyDuration
--        }
--    }
--
--    foreground {
--        children: [
--            LocalComponents.Slider {
--                id: slider
--                anchors {
--                    right: parent.right
--                    top: parent.top
--                    topMargin: root.textBottom + units.gu(3)
--                }
--                rotation: 180
--                offset: stage.dragProgress - stage.x
--                active: stage.dragging
--            },
--
--            // Just assume PhoneStage for now.  The tablet version of the right-edge
--            // tutorial is still being spec'd by the design team.
--            PhoneStage {
--                id: stage
--                objectName: "stage"
--                anchors.top: parent.top
--                width: parent.width
--                height: parent.height
--                applicationManager: fakeAppManager
--                color: "transparent"
--                interactive: false
--                altTabEnabled: false
--                focusFirstApp: false
--                startScale: 0.8
--                endScale: 0.6
--                dragAreaOverlap: -x
--
--                onOpened: {
--                    overlay.show();
--                    root.textOpacity = 0;
--                    slider.visible = false;
--                }
--
--                onDraggingChanged: {
--                    if (!dragging) {
--                        if (!overlay.shown) {
--                            root.showError();
--                        }
--                        teaseAnimation.complete();
--                    }
--                }
--            },
--
--            Showable {
--                id: overlay
--                objectName: "overlay"
--                anchors.fill: parent
--
--                opacity: 0
--                shown: false
--                showAnimation: UbuntuNumberAnimation { property: "opacity"; to: 1 }
--
--                Label {
--                    anchors.top: parent.top
--                    anchors.topMargin: root.panel.panelHeight + units.gu(2)
--                    anchors.left: parent.left
--                    anchors.leftMargin: units.gu(2)
--                    anchors.right: parent.right
--                    anchors.rightMargin: units.gu(2)
--                    wrapMode: Text.Wrap
--                    horizontalAlignment: Text.AlignHCenter
--                    fontSize: "large"
--                    text: i18n.tr("View all your running tasks.")
--                }
--
--                LocalComponents.Tick {
--                    objectName: "tick"
--                    anchors.bottom: bottomOverlayText.top
--                    anchors.bottomMargin: units.gu(1)
--                    anchors.horizontalCenter: bottomOverlayText.horizontalCenter
--                    onClicked: root.hide()
--                }
--
--                Label {
--                    id: bottomOverlayText
--                    anchors.bottom: parent.bottom
--                    anchors.bottomMargin: units.gu(2)
--                    anchors.left: parent.left
--                    anchors.leftMargin: units.gu(2)
--                    anchors.right: parent.right
--                    anchors.rightMargin: units.gu(2)
--                    wrapMode: Text.Wrap
--                    horizontalAlignment: Text.AlignHCenter
--                    fontSize: "small"
--                    text: i18n.tr("Tap here to continue.")
--                }
--            }
--        ]
--    }
--
--    ListModel {
--        id: fakeAppManager
--
--        readonly property string focusedApplicationId: "facebook"
--
--        function focusApplication(appId) {}
--        function requestFocusApplication(appId) {}
--        function findApplication(appId) {return null;}
--
--        signal applicationAdded(string appId)
--        signal applicationRemoved(string appId)
--        signal focusRequested(string appId)
--
--        ListElement {
--            appId: "facebook"
--            fullscreen: false
--            name: ""
--            icon: ""
--            state: ApplicationInfoInterface.Stopped
--            splashTitle: ""
--            splashImage: ""
--            splashShowHeader: false
--            splashColor: "transparent"
--            splashColorHeader: "transparent"
--            splashColorFooter: "transparent"
--            defaultScreenshot: "../Tutorial/graphics/facebook.png"
--        }
--
--        ListElement {
--            appId: "camera"
--            fullscreen: false
--            name: ""
--            icon: ""
--            state: ApplicationInfoInterface.Stopped
--            splashTitle: ""
--            splashImage: ""
--            splashShowHeader: false
--            splashColor: "transparent"
--            splashColorHeader: "transparent"
--            splashColorFooter: "transparent"
--            defaultScreenshot: "../Tutorial/graphics/camera.png"
--        }
--
--        ListElement {
--            appId: "gallery"
--            fullscreen: false
--            name: ""
--            icon: ""
--            state: ApplicationInfoInterface.Stopped
--            splashTitle: ""
--            splashImage: ""
--            splashShowHeader: false
--            splashColor: "transparent"
--            splashColorHeader: "transparent"
--            splashColorFooter: "transparent"
--            defaultScreenshot: "../Tutorial/graphics/gallery.png"
--        }
--
--        ListElement {
--            appId: "dialer"
--            fullscreen: false
--            name: ""
--            icon: ""
--            state: ApplicationInfoInterface.Stopped
--            splashTitle: ""
--            splashImage: ""
--            splashShowHeader: false
--            splashColor: "transparent"
--            splashColorHeader: "transparent"
--            splashColorFooter: "transparent"
--            defaultScreenshot: "../Tutorial/graphics/dialer.png"
--        }
--    }
--}
 === added file 'qml/Tutorial/TutorialTop.qml'
 --- qml/Tutorial/TutorialTop.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/TutorialTop.qml	2016-03-10 17:24:40 +0000
@@ -0,0 +1,61 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++import "." as LocalComponents
++
++TutorialPage {
++    id: root
++
++    property var panel
++
++    opacityOverride: 1 - panel.indicators.unitProgress
++
++    QtObject {
++        id: d
++        readonly property bool landscape: root.width > units.gu(50)
++        readonly property real columnWidth: landscape ? panel.indicators.width : root.width
++    }
++
++    mouseArea {
++        anchors.topMargin: panel.indicators.minimizedPanelHeight
++    }
++
++    background {
++        sourceSize.height: 1916
++        sourceSize.width: 1080
++        source: Qt.resolvedUrl("graphics/background2.png")
++    }
++
++    arrow {
++        anchors.top: root.top
++        anchors.topMargin: units.gu(4)
++        anchors.horizontalCenter: root.right
++        anchors.horizontalCenterOffset: - d.columnWidth / 2
++        rotation: -90
++    }
++
++    label {
++        text: d.landscape ? i18n.tr("Swipe from the top right edge to open the notification bar")
++                          : i18n.tr("Swipe from the top edge to open the notification bar")
++        anchors.top: arrow.bottom
++        anchors.topMargin: units.gu(3)
++        anchors.horizontalCenter: arrow.horizontalCenter
++        anchors.horizontalCenterOffset: (label.width - label.contentWidth) / 2
++        width: d.columnWidth - units.gu(8)
++    }
++}
 === added file 'qml/Tutorial/graphics/arrow.svg'
 --- qml/Tutorial/graphics/arrow.svg	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/graphics/arrow.svg	2016-03-10 17:24:40 +0000
@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<svg width="35px" height="106px" viewBox="0 0 35 106" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
++    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
++    <title>left swipe arrow</title>
++    <desc>Created with Sketch.</desc>
++    <defs></defs>
++    <g id="Final-design" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
++        <g id="1.Left-swipe" sketch:type="MSArtboardGroup" transform="translate(-54.000000, -906.000000)">
++            <g id="left-swipe-arrow" sketch:type="MSLayerGroup" transform="translate(15.000000, 903.000000)">
++                <g id="layer1" transform="translate(0.857146, 0.494959)" sketch:type="MSShapeGroup">
++                    <g id="g4216" transform="translate(0.952384, 0.831650)">
++                        <path d="M38.0127338,5.94292186 C40.8696258,9.70328846 43.6961579,13.5492607 46.4521869,17.5776877 C50.0756129,22.8738077 53.4767719,28.2917937 56.6611719,33.8315937 C60.6031619,40.9214757 64.3797399,47.5658927 67.7217189,54.6714377 C64.3797399,61.7769828 60.6031619,68.4213998 56.6611719,75.5112818 C53.4767719,81.0510808 50.0756129,86.4690678 46.4521869,91.7651878 C43.6961579,95.7936138 40.8696258,99.6395938 38.0127338,103.399951 L38.0127338,107.669481 C42.0030779,102.508161 45.9748129,97.3405748 49.5537499,92.0679218 C54.5609019,84.6937758 59.0395839,77.5443828 62.9990629,70.6226098 C66.5019159,64.4983168 69.0866949,59.3452977 71.2158589,54.6733907 L69.4678129,54.6713907 L71.2158589,54.6693907 C69.0866949,49.9975777 66.5019159,44.8445587 62.9990629,38.7202657 C59.0395839,31.7984927 54.5609019,24.6490997 49.5537499,17.2749527 C45.9748129,12.0022997 42.0030779,6.83471186 38.0127338,1.67339065 L38.0127338,5.94292186 Z" id="left-swipe-arrow" fill="#6C0D52" transform="translate(54.614296, 54.671436) scale(-1, 1) translate(-54.614296, -54.671436) "></path>
++                        <rect id="rect4782-01" transform="translate(54.190469, 54.673389) rotate(90.000000) translate(-54.190469, -54.673389) " x="0.190470662" y="0.67339065" width="107.999997" height="107.999997"></rect>
++                    </g>
++                </g>
++            </g>
++        </g>
++    </g>
++</svg>
 \ No newline at end of file
 === added file 'qml/Tutorial/graphics/background1.png'
 Binary files qml/Tutorial/graphics/background1.png	1970-01-01 00:00:00 +0000 and qml/Tutorial/graphics/background1.png	2016-03-10 17:24:40 +0000 differ
 === added file 'qml/Tutorial/graphics/background2.png'
 Binary files qml/Tutorial/graphics/background2.png	1970-01-01 00:00:00 +0000 and qml/Tutorial/graphics/background2.png	2016-03-10 17:24:40 +0000 differ
 === removed file 'qml/Tutorial/graphics/camera.png'
 Binary files qml/Tutorial/graphics/camera.png	2015-01-09 21:56:17 +0000 and qml/Tutorial/graphics/camera.png	1970-01-01 00:00:00 +0000 differ
 === removed file 'qml/Tutorial/graphics/chevron.png'
 Binary files qml/Tutorial/graphics/chevron.png	2014-12-18 23:32:42 +0000 and qml/Tutorial/graphics/chevron.png	1970-01-01 00:00:00 +0000 differ
 === removed file 'qml/Tutorial/graphics/dialer.png'
 Binary files qml/Tutorial/graphics/dialer.png	2015-01-09 21:56:17 +0000 and qml/Tutorial/graphics/dialer.png	1970-01-01 00:00:00 +0000 differ
 === removed file 'qml/Tutorial/graphics/facebook.png'
 Binary files qml/Tutorial/graphics/facebook.png	2015-01-12 14:02:33 +0000 and qml/Tutorial/graphics/facebook.png	1970-01-01 00:00:00 +0000 differ
 === removed file 'qml/Tutorial/graphics/gallery.png'
 Binary files qml/Tutorial/graphics/gallery.png	2015-01-09 21:56:17 +0000 and qml/Tutorial/graphics/gallery.png	1970-01-01 00:00:00 +0000 differ
 === removed file 'qml/Tutorial/graphics/tick.png'
 Binary files qml/Tutorial/graphics/tick.png	2014-12-18 23:32:42 +0000 and qml/Tutorial/graphics/tick.png	1970-01-01 00:00:00 +0000 differ
 === modified file 'tests/autopilot/unity8/shell/emulators.py'
 --- tests/autopilot/unity8/shell/emulators.py	2015-04-29 19:21:18 +0000
 +++ tests/autopilot/unity8/shell/emulators.py	2016-03-10 17:24:40 +0000
@@ -36,7 +36,6 @@
      'greeter',
      'launcher',
      'main_window',
--    'tutorial',
      'UnityEmulatorException',
+ ]
@@ -46,7 +45,6 @@
      dash,
      launcher,
      shell as main_window,
--    tutorial,
      UnityException as UnityEmulatorException
+ )
  from unity8.shell import create_interactive_notification
 === removed file 'tests/autopilot/unity8/shell/tests/test_tutorial.py'
 --- tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-04-29 19:21:18 +0000
 +++ tests/autopilot/unity8/shell/tests/test_tutorial.py	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
--# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
--#
--# Unity Autopilot Test Suite
--# Copyright (C) 2014, 2015 Canonical
--#
--# 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, either version 3 of the License, or
--# (at your option) any later version.
--#
--# 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/>.
--#
--
--from autopilot.matchers import Eventually
--from testtools.matchers import Equals
--
--from unity8.shell import (
--    fixture_setup,
--    tests
--)
--# unused import to load the tutorial helpers custom proxy objects.
--from unity8 import tutorial as tutorial_helpers  # NOQA
--
--
--class TutorialTestCase(tests.UnityTestCase):
--
--    def setUp(self):
--        super().setUp()
--        self._qml_mock_enabled = False
--        self._data_dirs_mock_enabled = False
--
--        self.useFixture(fixture_setup.Tutorial(True))
--        self.unity = self.launch_unity()
--
--    def test_complete_tutorial(self):
--        greeter = self.main_window.get_greeter()
--        tutorial = self.unity.select_single('Tutorial')
--        self.assertThat(tutorial.running, Eventually(Equals(True)))
--        greeter.swipe()
--        page = self.unity.wait_select_single(objectName='tutorialLeft')
--        page.short_swipe_right()
--        page = self.unity.wait_select_single(objectName='tutorialLeftFinish')
--        page.tap()
--        page = self.unity.wait_select_single(objectName='tutorialRight')
--        page.swipe_left()
--        page.tap()
--        page = self.unity.wait_select_single(objectName='tutorialBottom')
--        page.swipe_up()
--        page = self.unity.wait_select_single(objectName='tutorialBottomFinish')
--        page.tap()
--        self.assertThat(tutorial.running, Eventually(Equals(False)))
 === removed file 'tests/autopilot/unity8/tutorial.py'
 --- tests/autopilot/unity8/tutorial.py	2015-04-29 19:21:18 +0000
 +++ tests/autopilot/unity8/tutorial.py	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
--# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
--#
--# Unity Autopilot Test Suite
--# Copyright (C) 2014 Canonical
--#
--# 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, either version 3 of the License, or
--# (at your option) any later version.
--#
--# 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 logging
--
--import ubuntuuitoolkit
--
--import autopilot
--from autopilot import introspection
--
--
--logger = logging.getLogger(__name__)
--
--
--class TutorialPage(
--        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
--
--    @classmethod
--    def validate_dbus_object(cls, path, state):
--        name = introspection.get_classname_from_path(path)
--        return name in (b'TutorialPage', b'TutorialLeft',
--                        b'TutorialLeftFinish', b'TutorialRight',
--                        b'TutorialBottom', b'TutorialBottomFinish')
--
--    @autopilot.logging.log_action(logger.info)
--    def short_swipe_right(self):
--        self.shown.wait_for(True)
--        x, y, width, height = self.globalRect
--        start_x = x
--        stop_x = x + width // 3
--        start_y = stop_y = y + height // 2
--        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
--
--    @autopilot.logging.log_action(logger.info)
--    def swipe_left(self):
--        self.shown.wait_for(True)
--        x, y, width, height = self.globalRect
--        start_x = width
--        stop_x = x
--        start_y = stop_y = y + height // 2
--        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
--
--    @autopilot.logging.log_action(logger.info)
--    def swipe_up(self):
--        self.shown.wait_for(True)
--        x, y, width, height = self.globalRect
--        start_y = height
--        stop_y = y
--        start_x = stop_x = x + width // 2
--        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
--
--    @autopilot.logging.log_action(logger.info)
--    def tap(self):
--        """Tap the tick button to complete this step."""
--        self.shown.wait_for(True)
--        button = self.wait_select_single(objectName="tick")
--        self.pointing_device.click_object(button)
 === modified file 'tests/mocks/AccountsService/AccountsService.cpp'
 --- tests/mocks/AccountsService/AccountsService.cpp	2015-09-22 10:44:21 +0000
 +++ tests/mocks/AccountsService/AccountsService.cpp	2016-03-10 17:24:40 +0000
@@ -28,6 +28,7 @@
      m_statsWelcomeScreen(true),
      m_failedLogins(0),
      m_demoEdges(false),
++    m_demoEdgesCompleted(),
      m_hereEnabled(false),
      m_hereLicensePath("")
+ {
@@ -56,6 +57,25 @@
      Q_EMIT demoEdgesChanged();
+ }
++QStringList AccountsService::demoEdgesCompleted() const
++{
++    return m_demoEdgesCompleted;
++}
++
++void AccountsService::markDemoEdgeCompleted(const QString &edge)
++{
++    if (!m_demoEdgesCompleted.contains(edge)) {
++        m_demoEdgesCompleted << edge;
++        Q_EMIT demoEdgesCompletedChanged();
++    }
++}
++
++void AccountsService::setDemoEdgesCompleted(const QStringList &demoEdgesCompleted)
++{
++    m_demoEdgesCompleted = demoEdgesCompleted;
++    Q_EMIT demoEdgesCompletedChanged();
++}
++
  bool AccountsService::enableLauncherWhileLocked() const
+ {
      return m_enableLauncherWhileLocked;
 === modified file 'tests/mocks/AccountsService/AccountsService.h'
 --- tests/mocks/AccountsService/AccountsService.h	2014-11-24 17:42:36 +0000
 +++ tests/mocks/AccountsService/AccountsService.h	2016-03-10 17:24:40 +0000
@@ -22,6 +22,7 @@
  #include <QObject>
  #include <QString>
++#include <QStringList>
  #include <QVariant>
  class AccountsService: public QObject
@@ -36,6 +37,10 @@
                  READ demoEdges
                  WRITE setDemoEdges
                  NOTIFY demoEdgesChanged)
++    Q_PROPERTY (QStringList demoEdgesCompleted
++                READ demoEdgesCompleted
++                WRITE setDemoEdgesCompleted // only available in mock
++                NOTIFY demoEdgesCompletedChanged)
      Q_PROPERTY (bool enableLauncherWhileLocked
                  READ enableLauncherWhileLocked
                  WRITE setEnableLauncherWhileLocked // only available in mock
@@ -83,6 +88,9 @@
      void setUser(const QString &user);
      bool demoEdges() const;
      void setDemoEdges(bool demoEdges);
++    QStringList demoEdgesCompleted() const;
++    void setDemoEdgesCompleted(const QStringList &demoEdges);
++    Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
      bool enableLauncherWhileLocked() const;
      void setEnableLauncherWhileLocked(bool enableLauncherWhileLocked);
      bool enableIndicatorsWhileLocked() const;
@@ -103,6 +111,7 @@
  Q_SIGNALS:
      void userChanged();
      void demoEdgesChanged();
++    void demoEdgesCompletedChanged();
      void enableLauncherWhileLockedChanged();
      void enableIndicatorsWhileLockedChanged();
      void backgroundFileChanged();
@@ -120,6 +129,7 @@
      bool m_statsWelcomeScreen;
      uint m_failedLogins;
      bool m_demoEdges;
++    QStringList m_demoEdgesCompleted;
      bool m_hereEnabled;
      QString m_hereLicensePath;
  };
 === modified file 'tests/mocks/AccountsService/AccountsService.qmltypes'
 --- tests/mocks/AccountsService/AccountsService.qmltypes	2015-02-13 09:01:16 +0000
 +++ tests/mocks/AccountsService/AccountsService.qmltypes	2016-03-10 17:24:40 +0000
@@ -23,6 +23,7 @@
+         }
          Property { name: "user"; type: "string" }
          Property { name: "demoEdges"; type: "bool" }
++        Property { name: "demoEdgesCompleted"; type: "QStringList" }
          Property { name: "enableLauncherWhileLocked"; type: "bool" }
          Property { name: "enableIndicatorsWhileLocked"; type: "bool" }
          Property { name: "backgroundFile"; type: "string" }
@@ -32,5 +33,9 @@
          Property { name: "hereEnabled"; type: "bool" }
          Property { name: "hereLicensePath"; type: "string" }
          Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
++        Method {
++            name: "markDemoEdgeCompleted"
++            Parameter { name: "edge"; type: "string" }
++        }
+     }
+ }
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
 --- tests/mocks/Unity/Application/ApplicationInfo.h	2016-01-19 21:41:34 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.h	2016-03-10 17:24:40 +0000
@@ -59,7 +59,7 @@
      QUrl icon() const override { return m_icon; }
--    void setStage(Stage value);
++    Q_INVOKABLE void setStage(Stage value); // invokable only for mock
      Stage stage() const override { return m_stage; }
      Q_INVOKABLE void setState(State value);
 === modified file 'tests/mocks/Unity/Application/MirSurface.cpp'
 --- tests/mocks/Unity/Application/MirSurface.cpp	2015-11-30 18:25:47 +0000
 +++ tests/mocks/Unity/Application/MirSurface.cpp	2016-03-10 17:24:40 +0000
@@ -22,8 +22,9 @@
          Mir::Type type,
          Mir::State state,
          const QUrl& screenshot,
--        const QUrl &qmlFilePath)
--    : unity::shell::application::MirSurfaceInterface(nullptr)
++        const QUrl &qmlFilePath,
++        QObject *parent)
++    : unity::shell::application::MirSurfaceInterface(parent)
      , m_name(name)
      , m_type(type)
      , m_state(state)
 === modified file 'tests/mocks/Unity/Application/MirSurface.h'
 --- tests/mocks/Unity/Application/MirSurface.h	2015-11-30 18:25:47 +0000
 +++ tests/mocks/Unity/Application/MirSurface.h	2016-03-10 17:24:40 +0000
@@ -41,7 +41,8 @@
              Mir::Type type,
              Mir::State state,
              const QUrl& screenshot,
--            const QUrl &qmlFilePath = QUrl());
++            const QUrl &qmlFilePath = QUrl(),
++            QObject *parent = nullptr);
      virtual ~MirSurface();
      ////
 === modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
 --- tests/mocks/Unity/Application/SurfaceManager.cpp	2015-11-30 18:25:47 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.cpp	2016-03-10 17:24:40 +0000
@@ -34,6 +34,13 @@
      QObject(parent)
      , m_virtualKeyboard(nullptr)
+ {
++    m_virtualKeyboard = new VirtualKeyboard(this);
++    connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
++        MirSurface* surface = qobject_cast<MirSurface*>(obj);
++        m_virtualKeyboard = nullptr;
++        Q_EMIT inputMethodSurfaceChanged();
++        Q_EMIT surfaceDestroyed(surface);
++    });
+ }
  MirSurface *SurfaceManager::createSurface(const QString& name,
@@ -58,16 +65,8 @@
      return surface;
+ }
--MirSurface *SurfaceManager::inputMethodSurface()
++MirSurface *SurfaceManager::inputMethodSurface() const
+ {
--    if (!m_virtualKeyboard) {
--        m_virtualKeyboard = new VirtualKeyboard;
--        connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
--            MirSurface* surface = qobject_cast<MirSurface*>(obj);
--            Q_EMIT surfaceDestroyed(surface);
--        });
--        Q_EMIT surfaceCreated(m_virtualKeyboard);
--    }
      return m_virtualKeyboard;
+ }
 === modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
 --- tests/mocks/Unity/Application/SurfaceManager.h	2015-11-30 18:25:47 +0000
 +++ tests/mocks/Unity/Application/SurfaceManager.h	2016-03-10 17:24:40 +0000
@@ -25,7 +25,7 @@
  class SurfaceManager : public QObject
+ {
      Q_OBJECT
--
++    Q_PROPERTY(MirSurface* inputMethodSurface READ inputMethodSurface NOTIFY inputMethodSurfaceChanged)
      Q_PROPERTY(int newSurfaceMinimumWidth READ newSurfaceMinimumWidth WRITE setNewSurfaceMinimumWidth NOTIFY newSurfaceMinimumWidthChanged)
      Q_PROPERTY(int newSurfaceMaximumWidth READ newSurfaceMaximumWidth WRITE setNewSurfaceMaximumWidth NOTIFY newSurfaceMaximumWidthChanged)
      Q_PROPERTY(int newSurfaceMinimumHeight READ newSurfaceMinimumHeight WRITE setNewSurfaceMinimumHeight NOTIFY newSurfaceMinimumHeightChanged)
@@ -43,8 +43,7 @@
                                    Mir::State state,
                                    const QUrl& screenshot);
--    // To be used in the tests
--    Q_INVOKABLE MirSurface* inputMethodSurface();
++    MirSurface* inputMethodSurface() const;
      int newSurfaceMinimumWidth() const { return m_newSurfaceMinimumWidth; }
      void setNewSurfaceMinimumWidth(int value);
@@ -65,6 +64,7 @@
      void setNewSurfaceHeightIncrement(int);
  Q_SIGNALS:
++    void inputMethodSurfaceChanged();
      void countChanged();
      void surfaceCreated(MirSurface *surface);
      void surfaceDestroyed(MirSurface*surface);
 === modified file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
 --- tests/mocks/Unity/Application/VirtualKeyboard.cpp	2015-09-02 10:35:16 +0000
 +++ tests/mocks/Unity/Application/VirtualKeyboard.cpp	2016-03-10 17:24:40 +0000
@@ -22,12 +22,13 @@
  #include <QDebug>
--VirtualKeyboard::VirtualKeyboard()
++VirtualKeyboard::VirtualKeyboard(QObject *parent)
      : MirSurface("input-method",
                       Mir::InputMethodType,
                       Mir::MinimizedState,
                       QUrl("qrc:///Unity/Application/vkb_portrait.png"),
--                     QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))
++                     QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"),
++                     parent)
+ {
+ }
 === modified file 'tests/mocks/Unity/Application/VirtualKeyboard.h'
 --- tests/mocks/Unity/Application/VirtualKeyboard.h	2015-08-19 20:30:09 +0000
 +++ tests/mocks/Unity/Application/VirtualKeyboard.h	2016-03-10 17:24:40 +0000
@@ -25,7 +25,7 @@
+ {
      Q_OBJECT
  public:
--    explicit VirtualKeyboard();
++    explicit VirtualKeyboard(QObject *parent = nullptr);
      ~VirtualKeyboard();
  };
 === modified file 'tests/mocks/Unity/Application/plugin.cpp'
 --- tests/mocks/Unity/Application/plugin.cpp	2015-08-03 15:00:47 +0000
 +++ tests/mocks/Unity/Application/plugin.cpp	2016-03-10 17:24:40 +0000
@@ -78,8 +78,9 @@
      qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
      qmlRegisterUncreatableType<Session>(uri, 0, 1, "Session", "Session can't be instantiated from QML");
      qmlRegisterUncreatableType<MirSurface>(uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
++    qmlRegisterUncreatableType<unity::shell::application::MirSurfaceInterface>(
++                    uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
      qmlRegisterType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");
--
      qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
      qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);
 === modified file 'tests/mocks/Utils/CMakeLists.txt'
 --- tests/mocks/Utils/CMakeLists.txt	2016-02-08 09:37:48 +0000
 +++ tests/mocks/Utils/CMakeLists.txt	2016-03-10 17:24:40 +0000
@@ -12,7 +12,7 @@
      ${CMAKE_SOURCE_DIR}/plugins/Utils/qlimitproxymodelqml.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/unitymenumodelpaths.cpp
--    ${CMAKE_SOURCE_DIR}/plugins/Utils/windowkeysfilter.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Utils/windowinputfilter.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/windowscreenshotprovider.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/easingcurve.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/inputwatcher.cpp
 === modified file 'tests/mocks/Utils/Utils.qmltypes'
 --- tests/mocks/Utils/Utils.qmltypes	2015-07-15 11:37:23 +0000
 +++ tests/mocks/Utils/Utils.qmltypes	2016-03-10 17:24:40 +0000
@@ -145,10 +145,10 @@
+         }
+     }
      Component {
--        name: "WindowKeysFilter"
++        name: "WindowInputFilter"
          defaultProperty: "data"
          prototype: "QQuickItem"
--        exports: ["Utils/WindowKeysFilter 0.1"]
++        exports: ["Utils/WindowInputFilter 0.1"]
          exportMetaObjectRevisions: [0]
+     }
      Component {
 === modified file 'tests/mocks/Utils/plugin.cpp'
 --- tests/mocks/Utils/plugin.cpp	2016-01-13 17:52:51 +0000
 +++ tests/mocks/Utils/plugin.cpp	2016-03-10 17:24:40 +0000
@@ -32,7 +32,7 @@
  #include <qlimitproxymodelqml.h>
  #include <unitysortfilterproxymodelqml.h>
  #include <unitymenumodelpaths.h>
--#include <windowkeysfilter.h>
++#include <windowinputfilter.h>
  #include <windowscreenshotprovider.h>
  #include <easingcurve.h>
  #include <applicationsfiltermodel.h>
@@ -59,7 +59,7 @@
      qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
      qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
      qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
--    qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
++    qmlRegisterType<WindowInputFilter>(uri, 0, 1, "WindowInputFilter");
      qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
      qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
      qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
 === modified file 'tests/plugins/AccountsService/PropertiesServer.cpp'
 --- tests/plugins/AccountsService/PropertiesServer.cpp	2015-10-26 14:05:14 +0000
 +++ tests/plugins/AccountsService/PropertiesServer.cpp	2016-03-10 17:24:40 +0000
@@ -79,6 +79,7 @@
  void PropertiesServer::Reset()
+ {
      m_properties["com.canonical.unity.AccountsService"]["demo-edges"] = false;
++    m_properties["com.canonical.unity.AccountsService"]["DemoEdgesCompleted"] = QStringList();
      m_properties["com.canonical.unity.AccountsService"]["LauncherItems"] = QVariant::fromValue(QList<QVariantMap>());
      m_properties["com.canonical.unity.AccountsService.Private"]["FailedLogins"] = 0;
      m_properties["com.ubuntu.touch.AccountsService.SecurityPrivacy"]["StatsWelcomeScreen"] = true;
 === modified file 'tests/plugins/AccountsService/client.cpp'
 --- tests/plugins/AccountsService/client.cpp	2015-10-26 14:05:14 +0000
 +++ tests/plugins/AccountsService/client.cpp	2016-03-10 17:24:40 +0000
@@ -107,6 +107,43 @@
          QCOMPARE(session.hereEnabled(), true);
+     }
++    void testMarkDemoEdgeCompleted()
++    {
++        AccountsService session(this, QTest::currentTestFunction());
++        QSignalSpy changedSpy(&session, &AccountsService::demoEdgesCompletedChanged);
++
++        QCOMPARE(changedSpy.count(), 0);
++        QCOMPARE(session.demoEdgesCompleted(), QStringList());
++
++        session.markDemoEdgeCompleted("testedge");
++        QCOMPARE(changedSpy.count(), 1);
++        QCOMPARE(session.demoEdgesCompleted(), QStringList() << "testedge");
++
++        session.markDemoEdgeCompleted("testedge");
++        QCOMPARE(changedSpy.count(), 1);
++        QCOMPARE(session.demoEdgesCompleted(), QStringList() << "testedge");
++
++        session.markDemoEdgeCompleted("testedge2");
++        QCOMPARE(changedSpy.count(), 2);
++        QCOMPARE(session.demoEdgesCompleted(), QStringList() << "testedge" << "testedge2");
++    }
++
++    void testAsynchronousChangeForDemoEdgesCompleted()
++    {
++        AccountsService session(this, QTest::currentTestFunction());
++        QSignalSpy changedSpy(&session, &AccountsService::demoEdgesCompletedChanged);
++
++        QCOMPARE(changedSpy.count(), 0);
++        QCOMPARE(session.demoEdgesCompleted(), QStringList());
++
++        ASSERT_DBUS_CALL(m_userInterface->call("Set",
++                                               "com.canonical.unity.AccountsService",
++                                               "DemoEdgesCompleted",
++                                               dbusVariant(QStringList() << "testedge")));
++        QTRY_COMPARE(changedSpy.count(), 1);
++        QCOMPARE(session.demoEdgesCompleted(), QStringList() << "testedge");
++    }
++
      void testAsynchornousChangeForDemoEdges()
+     {
          AccountsService session(this, QTest::currentTestFunction());
 === modified file 'tests/qmltests/Components/tst_PhysicalKeysMapper.qml'
 --- tests/qmltests/Components/tst_PhysicalKeysMapper.qml	2016-01-15 10:21:18 +0000
 +++ tests/qmltests/Components/tst_PhysicalKeysMapper.qml	2016-03-10 17:24:40 +0000
@@ -26,9 +26,9 @@
      property var physicalKeysMapper: loader.item
--    WindowKeysFilter {
--        Keys.onPressed: physicalKeysMapper.onKeyPressed(event, currentEventTimestamp);
--        Keys.onReleased: physicalKeysMapper.onKeyReleased(event, currentEventTimestamp);
++    WindowInputFilter {
++        Keys.onPressed: physicalKeysMapper.onKeyPressed(event, lastInputTimestamp);
++        Keys.onReleased: physicalKeysMapper.onKeyReleased(event, lastInputTimestamp);
+     }
      Loader {
 === modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
 --- tests/qmltests/Greeter/tst_Greeter.qml	2016-01-11 17:37:02 +0000
 +++ tests/qmltests/Greeter/tst_Greeter.qml	2016-03-10 17:24:40 +0000
@@ -328,9 +328,15 @@
              LightDM.Greeter.active = true;
              greeter.forcedUnlock = true;
--            compare(view.locked, false);
++            compare(greeter.required, false);
              greeter.forcedUnlock = false;
++            // Now recover from tearing down the view above
++            LightDM.Greeter.showGreeter();
++            tryCompare(greeter, "required", true);
++            tryCompare(greeter, "waiting", false);
++            view = findChild(greeter, "testView");
++
              selectUser("no-password");
              tryCompare(view, "locked", false);
              selectUser("has-password");
 === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
 --- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-09-02 07:42:27 +0000
 +++ tests/qmltests/Tutorial/tst_Tutorial.qml	2016-03-10 17:24:40 +0000
@@ -19,15 +19,19 @@
  import AccountsService 0.1
  import IntegratedLightDM 0.1 as LightDM
  import Ubuntu.Components 1.3
++import Ubuntu.Components.ListItems 1.3
++import Ubuntu.Telephony 0.1 as Telephony
  import Unity.Application 0.1
  import Unity.Test 0.1 as UT
  import "../../../qml"
++import "../../../qml/Components"
--Item {
++Rectangle {
      id: root
--    width: shellLoader.width + buttons.width
--    height: shellLoader.height
++    color: UbuntuColors.lightGrey
++    width: units.gu(100) + buttons.width
++    height: units.gu(71)
      QtObject {
          id: applicationArguments
@@ -45,6 +49,11 @@
+         }
+     }
++    Telephony.CallEntry {
++        id: phoneCall
++        phoneNumber: "+447812221111"
++    }
++
      Component.onCompleted: {
          // must set the mock mode before loading the Shell
          LightDM.Greeter.mockMode = "single-pin";
@@ -52,21 +61,63 @@
          shellLoader.active = true;
+     }
--    Row {
--        spacing: 0
--        anchors.fill: parent
++    Item {
++        id: shellContainer
++        anchors.left: root.left
++        anchors.right: buttons.left
++        anchors.top: root.top
++        anchors.bottom: root.bottom
          Loader {
              id: shellLoader
              active: false
--            width: units.gu(40)
--            height: units.gu(71)
++            anchors.horizontalCenter: parent.horizontalCenter
++            anchors.top: parent.top
++            anchors.bottom: parent.bottom
++
++            property int shellOrientation: Qt.PortraitOrientation
++            property int nativeOrientation: Qt.PortraitOrientation
++            property int primaryOrientation: Qt.PortraitOrientation
++
++            state: modeSelector.model[modeSelector.selectedIndex]
++            states: [
++                State {
++                    name: "phone"
++                    PropertyChanges {
++                        target: shellLoader
++                        width: units.gu(40)
++                    }
++                },
++                State {
++                    name: "tablet"
++                    PropertyChanges {
++                        target: shellLoader
++                        width: units.gu(100)
++                        shellOrientation: Qt.LandscapeOrientation
++                        nativeOrientation: Qt.LandscapeOrientation
++                        primaryOrientation: Qt.LandscapeOrientation
++                    }
++                },
++                State {
++                    name: "desktop"
++                    PropertyChanges {
++                        target: shellLoader
++                        width: units.gu(100)
++                    }
++                }
++            ]
              property bool itemDestroyed: false
              sourceComponent: Component {
                  Shell {
++                    usageScenario: shellLoader.state
                      property string indicatorProfile: "phone"
++                    orientation: shellLoader.shellOrientation
++                    orientations: Orientations {
++                        native_: shellLoader.nativeOrientation
++                        primary: shellLoader.primaryOrientation
++                    }
                      Component.onDestruction: {
                          shellLoader.itemDestroyed = true;
@@ -74,29 +125,92 @@
+                 }
+             }
+         }
--
--        Rectangle {
--            id: buttons
--            color: "white"
--            width: units.gu(30)
--            height: shellLoader.height
--
--            Column {
--                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
--                spacing: units.gu(1)
--                Row {
--                    anchors { left: parent.left; right: parent.right }
--                    Button {
--                        text: "Restart Tutorial"
--                        onClicked: {
--                            if (shellLoader.status !== Loader.Ready)
--                                return;
--
--                            AccountsService.demoEdges = false;
--                            AccountsService.demoEdges = true;
--                        }
--                    }
--                }
++    }
++
++    Rectangle {
++        id: buttons
++        color: UbuntuColors.darkGrey
++        width: units.gu(30)
++        anchors.top: root.top
++        anchors.bottom: root.bottom
++        anchors.right: root.right
++
++        Column {
++            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
++            spacing: units.gu(1)
++            Row {
++                anchors { left: parent.left; right: parent.right }
++                Button {
++                    text: "Hide Greeter"
++                    onClicked: {
++                        if (shellLoader.status !== Loader.Ready)
++                            return;
++
++                        var greeter = testCase.findChild(shellLoader.item, "greeter");
++                        if (greeter.shown) {
++                            greeter.hide();
++                        }
++                    }
++                }
++            }
++
++            Row {
++                anchors { left: parent.left; right: parent.right }
++                Button {
++                    text: "Restart Tutorial"
++                    onClicked: {
++                        if (shellLoader.status !== Loader.Ready)
++                            return;
++
++                        AccountsService.demoEdges = false;
++                        AccountsService.demoEdgesCompleted = [];
++                        AccountsService.demoEdges = true;
++                    }
++                }
++            }
++
++            Row {
++                anchors { left: parent.left; right: parent.right }
++                CheckBox {
++                    onCheckedChanged: {
++                        if (checked) {
++                            callManager.foregroundCall = phoneCall;
++                        } else {
++                            callManager.foregroundCall = null;
++                        }
++                    }
++                }
++                Label {
++                    text: "Active Call"
++                    anchors.verticalCenter: parent.verticalCenter
++                }
++            }
++
++            Row {
++                anchors { left: parent.left; right: parent.right }
++                CheckBox {
++                    activeFocusOnPress: false
++                    onCheckedChanged: {
++                        var surface = SurfaceManager.inputMethodSurface;
++                        if (checked) {
++                            surface.setState(Mir.RestoredState);
++                        } else {
++                            surface.setState(Mir.MinimizedState);
++                        }
++                    }
++                }
++                Label {
++                    text: "Input Method"
++                    anchors.verticalCenter: parent.verticalCenter
++                }
++            }
++
++            ItemSelector {
++                id: modeSelector
++                anchors { left: parent.left; right: parent.right }
++                activeFocusOnPress: false
++                text: "Mode"
++                model: ["phone", "tablet", "desktop"]
+             }
+         }
+     }
@@ -111,17 +225,21 @@
          property real halfHeight: shell ? shell.height / 2 : 0
          function init() {
--            tryCompare(shell, "enabled", true); // enabled by greeter when ready
++            prepareShell();
--            AccountsService.demoEdges = false;
--            AccountsService.demoEdges = true;
--            swipeAwayGreeter();
++            var tutorialLeft = findChild(shell, "tutorialLeft");
++            tryCompare(tutorialLeft, "opacity", 1);
+         }
          function cleanup() {
++            resetLoader("phone");
++        }
++
++        function resetLoader(state) {
              shellLoader.itemDestroyed = false;
              shellLoader.active = false;
++            shellLoader.state = state;
              tryCompare(shellLoader, "status", Loader.Null);
              tryCompare(shellLoader, "item", null);
@@ -133,6 +251,11 @@
              // Shell instance gets destroyed.
              tryCompare(shellLoader, "itemDestroyed", true);
++            // Reset any futzing our tests may have done with persistent objects
++            var app = ApplicationManager.findApplication("dialer-app");
++            if (app) {
++                app.setStage(ApplicationInfoInterface.SideStage);
++            }
              // kill all (fake) running apps
              killApps();
@@ -143,6 +266,25 @@
              removeTimeConstraintsFromDirectionalDragAreas(shellLoader.item);
+         }
++        function prepareShell() {
++            tryCompare(shell, "enabled", true); // enabled by greeter when ready
++
++            callManager.foregroundCall = null;
++            AccountsService.demoEdges = false;
++            AccountsService.demoEdgesCompleted = [];
++            AccountsService.demoEdges = true;
++
++            var surface = SurfaceManager.inputMethodSurface;
++            surface.setState(Mir.MinimizedState);
++
++            LightDM.Greeter.hideGreeter();
++        }
++
++        function loadShell(state) {
++            resetLoader(state);
++            prepareShell();
++        }
++
          function killApps() {
              while (ApplicationManager.count > 1) {
                  var appIndex = ApplicationManager.get(0).appId == "unity8-dash" ? 1 : 0
@@ -163,234 +305,486 @@
              waitForRendering(greeter);
+         }
--        function waitForPage(name) {
--            waitForRendering(findChild(shell, name));
--            var page = findChild(shell, name);
--            tryCompare(page, "shown", true);
--            tryCompare(page.showAnimation, "running", false);
--            return page;
--        }
--
--        function checkTopEdge() {
--            touchFlick(shell, halfWidth, 0, halfWidth, halfHeight);
--
++        function openTutorialTop() {
++            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
++            var tutorialTop = findChild(shell, "tutorialTop");
++            var tutorialTopTimer = findInvisibleChild(tutorialTop, "tutorialTopTimer");
++
++            tutorialTopTimer.interval = 1;
++            AccountsService.demoEdgesCompleted = ["left", "left-long"];
++
++            tryCompare(tutorialLeftLoader, "active", false);
++            tryCompare(tutorialTop, "shown", true);
++            tryCompare(tutorialTop, "opacity", 1);
++        }
++
++        function openTutorialRight() {
++            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
++            var tutorialRight = findChild(shell, "tutorialRight");
++
++            AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];
++            ApplicationManager.startApplication("gallery-app");
++            ApplicationManager.startApplication("facebook-webapp");
++
++            tryCompare(tutorialLeftLoader, "active", false);
++            tryCompare(tutorialRight, "shown", true);
++            tryCompare(tutorialRight, "opacity", 1);
++        }
++
++        function openTutorialBottom() {
++            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
++            var tutorialBottom = findChild(shell, "tutorialBottom");
++
++            AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right"];
++            ApplicationManager.startApplication("dialer-app");
++
++            tryCompare(tutorialLeftLoader, "active", false);
++            tryCompare(tutorialBottom, "shown", true);
++            tryCompare(tutorialBottom, "opacity", 1);
++        }
++
++        function test_tutorialLeftEdges() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialLeft = findChild(tutorial, "tutorialLeft");
++            var launcher = findChild(shell, "launcher");
++            var stage = findChild(shell, "stage");
              var panel = findChild(shell, "panel");
--            tryCompare(panel.indicators, "fullyClosed", true);
--        }
--
--        function checkLeftEdge() {
--            touchFlick(shell, 0, halfHeight, halfWidth, halfHeight);
--
--            var launcher = findChild(shell, "launcher");
--            tryCompare(launcher, "state", "");
--        }
--
--        function checkRightEdge() {
--            if (shell.usageScenario === "phone") {
--                touchFlick(shell, shell.width, halfHeight, halfWidth, halfHeight);
--
--                var stage = findChild(shell, "stage");
--                var spreadView = findChild(stage, "spreadView");
--                tryCompare(spreadView, "phase", 0);
--            }
--        }
--
--        function checkBottomEdge() {
--            // Can't actually check effect of swipe, since dash isn't really loaded
--            var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader");
--            tryCompare(applicationsDisplayLoader, "interactive", false);
--        }
--
--        function checkFinished() {
--            tryCompare(AccountsService, "demoEdges", false);
--
--            var tutorial = findChild(shell, "tutorial");
--            tryCompare(tutorial, "running", false);
--
--            var launcher = findChild(shell, "launcher");
--            tryCompare(launcher, "shown", false);
--        }
--
--        function goToPage(name) {
--            var page = waitForPage("tutorialLeft");
--            checkTopEdge();
--            checkRightEdge();
--            checkBottomEdge();
--            if (name === "tutorialLeft") return page;
--            touchFlick(shell, 0, halfHeight, halfWidth, halfHeight);
--
--            page = waitForPage("tutorialLeftFinish");
--            if (name === "tutorialLeftFinish") return page;
--            var tick = findChild(page, "tick");
--            tap(tick);
--
--            page = waitForPage("tutorialRight");
--            checkTopEdge();
--            checkLeftEdge();
--            checkBottomEdge();
--            if (name === "tutorialRight") return page;
--            touchFlick(shell,
--                shell.width, halfHeight,
--                halfWidth, halfHeight,
--                true /* beginTouch */, true /* endTouch */,
--                20 /* speed */, 50 /* iterations */);
--            var overlay = findChild(page, "overlay");
--            tryCompare(overlay, "shown", true);
--            var tick = findChild(page, "tick");
--            tap(tick);
--
--            var page = waitForPage("tutorialBottom");
--            checkTopEdge();
--            checkLeftEdge();
--            checkRightEdge();
--            if (name === "tutorialBottom") return page;
--            touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
--
--            var page = waitForPage("tutorialBottomFinish");
--            checkTopEdge();
--            checkLeftEdge();
--            checkRightEdge();
--            checkBottomEdge();
--            if (name === "tutorialBottomFinish") return page;
--            var tick = findChild(page, "tick");
--            tap(tick);
--
--            checkFinished();
--            return null;
--        }
--
--        function test_walkthrough() {
--            goToPage(null);
--        }
--
--        function test_skipOnDesktop() {
--            var tutorial = findChild(shell, "tutorial");
--            tryCompare(tutorial, "active", true);
--            tryCompare(tutorial, "running", true);
--
--            shell.usageScenario = "desktop";
--            tryCompare(tutorial, "active", false);
--            tryCompare(tutorial, "running", false);
--        }
--
--        function test_launcherShortDrag() {
--            // goToPage does a normal launcher pull.  But here we want to test
--            // just barely pulling the launcher out and letting go (i.e. not
--            // triggering the "progress" property of Launcher).
--
--            var left = goToPage("tutorialLeft");
++
++            verify(tutorial.running);
++            verify(tutorial.launcherEnabled);
++            verify(!tutorial.spreadEnabled);
++            verify(!tutorial.panelEnabled);
++            verify(tutorialLeft.shown);
++            verify(launcher.available);
++            verify(!stage.spreadEnabled);
++            verify(!panel.indicators.available);
++        }
++
++        function test_tutorialLeftFinish() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialLeft = findChild(tutorial, "tutorialLeft");
++            var launcher = findChild(shell, "launcher");
++
++            touchFlick(shell, 0, halfHeight, halfWidth, halfHeight);
++
++            tryCompare(tutorialLeft, "shown", false);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
++            tryCompare(launcher, "state", "visible");
++        }
++
++        function test_tutorialLeftShortDrag() {
++            // Here we want to test just barely pulling the launcher out and
++            // letting go (i.e. not triggering the "progress" property of
++            // Launcher).
++            var tutorialLeft = findChild(shell, "tutorialLeft");
++            var launcher = findChild(shell, "launcher");
++
++            // Confirm fade during drag
++            touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight, true, false);
++            // compare opacity with a bound rather than hard 0.6 because progress doesn't
++            // always match the drag perfectly (takes a moment for drag to kick in)
++            tryCompareFunction(function() {
++                return tutorialLeft.opacity >= 0.6 && tutorialLeft.opacity < 0.7;
++            }, true);
++            touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight, false, true);
++
              // Make sure we don't do anything if we don't pull the launcher
              // out much.
--            var launcher = findChild(shell, "launcher");
              touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight);
              tryCompare(launcher, "state", ""); // should remain hidden
--            tryCompare(left, "shown", true); // and we should still be on left
++            tryCompare(tutorialLeft, "shown", true); // and we should still be on left
++
              // Now drag out but not past launcher itself
              touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.9, halfHeight);
--            waitForPage("tutorialLeftFinish");
++            tryCompare(tutorialLeft, "shown", false);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
++            tryCompare(launcher, "state", "visible");
+         }
--        function test_launcherLongDrag() {
--            // goToPage does a normal launcher pull.  But here we want to test
--            // a full pull across the page.
++        function test_tutorialLeftLongDrag() {
++            // Just confirm that a long drag ("dash" drag) doesn't confuse us
--            var left = goToPage("tutorialLeft");
++            // So that we actually switch to dash and launcher hides
++            ApplicationManager.startApplication("gallery-app");
              var launcher = findChild(shell, "launcher");
++            var tutorialLeft = findChild(shell, "tutorialLeft");
              touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
--            var errorTextLabel = findChild(left, "errorTextLabel");
--            var errorTitleLabel = findChild(left, "errorTitleLabel");
--            tryCompare(launcher, "state", ""); // launcher goes away
--            tryCompare(left, "shown", true); // still on left page
--            tryCompare(errorTextLabel, "opacity", 1); // show error
--            tryCompare(errorTitleLabel, "opacity", 1); // show error
--        }
--
--        function test_launcherDragBack() {
--            // goToPage does a full launcher pull.  But here we test pulling
--            // all the way out, then dragging back into place.
--
--            var left = goToPage("tutorialLeft");
--            touchFlick(shell, 0, halfHeight, halfWidth, halfHeight, true, false);
--            touchFlick(shell, halfWidth, halfHeight, 0, halfHeight, false, true);
--
--            tryCompare(left, "shown", true); // and we should still be on left
--        }
--
--        function test_launcherNoDragGap() {
--            // See bug 1454882, where if you dragged the launcher while it was
--            // visible, you could pull it further than the edge of the screen.
--
--            var left = goToPage("tutorialLeft");
--            var launcher = findChild(shell, "launcher");
--            var teaseAnimation = findInvisibleChild(left, "teaseAnimation");
--
--            // Wait for launcher to be really out there
--            tryCompareFunction(function() {return launcher.x > teaseAnimation.maxBounce/2}, true);
--            verify(teaseAnimation.running);
--
--            // Start a drag, make sure animation stops
--            touchFlick(shell, 0, halfHeight, units.gu(4), halfHeight, true, false);
--            verify(!teaseAnimation.running);
--            verify(launcher.visibleWidth > 0);
--            verify(launcher.x > 0);
--            compare(launcher.x, teaseAnimation.bounce);
--
--            // Continue drag, make sure we don't create a gap on the left hand side
--            touchFlick(shell, units.gu(4), halfHeight, shell.width, halfHeight, false, false);
--            verify(!teaseAnimation.running);
--            compare(launcher.visibleWidth, launcher.panelWidth);
--            compare(launcher.x, 0);
--
--            // Finish and make sure we continue animation
--            touchFlick(shell, shell.width, halfHeight, shell.width, halfHeight, false, true);
--            tryCompare(teaseAnimation, "running", true);
--        }
--
--        function test_spread() {
--            // Unfortunately, most of what we want to test of the spread is
--            // "did it render correctly?" but that's hard to test.  So instead,
--            // just poke and prod it a little bit to see if some of the values
--            // we'd expect to be correct, are so.
--
--            var right = goToPage("tutorialRight");
--            var stage = findChild(right, "stage");
--            var delegate0 = findChild(right, "appDelegate0");
--
--            tryCompare(stage, "dragProgress", 0);
++            tryCompare(tutorialLeft, "shown", false);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long"]);
++        }
++
++        function test_tutorialLeftAutoSkipped() {
++            // Test that we skip the tutorial if user uses left edge themselves
++
++            var tutorialLeft = findChild(shell, "tutorialLeft");
++            LightDM.Greeter.showGreeter();
++            tryCompare(tutorialLeft, "visible", false);
++            compare(AccountsService.demoEdgesCompleted, []);
++
++            touchFlick(shell, 0, halfHeight, halfWidth, halfHeight);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
++        }
++
++        function test_tutorialTopEdges() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialTop = findChild(tutorial, "tutorialTop");
++            var launcher = findChild(shell, "launcher");
++            var stage = findChild(shell, "stage");
++            var panel = findChild(shell, "panel");
++
++            openTutorialTop();
++
++            tryCompare(tutorial, "running", true);
++            verify(!tutorial.launcherEnabled);
++            verify(!tutorial.spreadEnabled);
++            verify(tutorial.panelEnabled);
++            verify(tutorialTop.shown);
++            verify(!launcher.available);
++            verify(!stage.spreadEnabled);
++            verify(panel.indicators.available);
++        }
++
++        function test_tutorialTopFinish() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialTop = findChild(tutorial, "tutorialTop");
++            var panel = findChild(shell, "panel");
++
++            openTutorialTop();
++            touchFlick(shell, halfWidth, 0, halfWidth, shell.height);
++
++            tryCompare(tutorialTop, "shown", false);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top"]);
++            tryCompare(panel.indicators, "fullyOpened", true);
++        }
++
++        function test_tutorialTopShortDrag() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialTop = findChild(tutorial, "tutorialTop");
++            var panel = findChild(shell, "panel");
++
++            openTutorialTop();
++            touchFlick(shell, halfWidth, 0, halfWidth, shell.height * 0.4, true, false);
++            // compare opacity with a bound rather than hard 0.6 because progress doesn't
++            // always match the drag perfectly (takes a moment for drag to kick in)
++            tryCompareFunction(function() {
++                return tutorialTop.opacity >= 0.6 && tutorialTop.opacity < 0.7;
++            }, true);
++            touchFlick(shell, halfWidth, 0, halfWidth, shell.height * 0.4, false, true);
++
++            compare(tutorialTop.shown, true);
++        }
++
++        function test_tutorialTopAutoSkipped() {
++            // Test that we skip the tutorial if user uses top edge themselves
++
++            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
++            var tutorialTop = findChild(shell, "tutorialTop");
++            AccountsService.demoEdgesCompleted = ["left", "left-long"];
++            tryCompare(tutorialLeftLoader, "active", false);
++            verify(!tutorialTop.shown);
++
++            touchFlick(shell, halfWidth, 0, halfWidth, shell.height);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top"]);
++        }
++
++        function test_tutorialRightEdges() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialRight = findChild(tutorial, "tutorialRight");
++            var launcher = findChild(shell, "launcher");
++            var stage = findChild(shell, "stage");
++            var panel = findChild(shell, "panel");
++
++            openTutorialRight();
++
++            tryCompare(tutorial, "running", true);
++            verify(!tutorial.launcherEnabled);
++            verify(tutorial.spreadEnabled);
++            verify(!tutorial.panelEnabled);
++            verify(tutorialRight.shown);
++            verify(!launcher.available);
++            verify(stage.spreadEnabled);
++            verify(!panel.indicators.available);
++        }
++
++        function test_tutorialRightFinish() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialRight = findChild(tutorial, "tutorialRight");
++            var stage = findChild(shell, "stage");
++
++            openTutorialRight();
++            touchFlick(shell, shell.width, halfHeight, 0, halfHeight);
++
++            tryCompare(tutorialRight, "shown", false);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right"]);
++        }
++
++        function test_tutorialRightShortDrag() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialRight = findChild(tutorial, "tutorialRight");
++            var stage = findChild(shell, "stage");
++
++            openTutorialRight();
              touchFlick(shell, shell.width, halfHeight, shell.width * 0.8, halfHeight, true, false);
--            verify(stage.dragProgress > 0);
--            compare(stage.dragProgress, -delegate0.xTranslate);
--            touchFlick(shell, shell.width * 0.8, halfHeight, shell.width, halfHeight, false, true);
--            tryCompare(stage, "dragProgress", 0);
--
--            tryCompare(delegate0, "x", shell.width);
--
--            var screenshotImage = findChild(right, "screenshotImage");
--            tryCompare(screenshotImage, "source", Qt.resolvedUrl("../../../qml/Tutorial/graphics/facebook.png"));
--            tryCompare(screenshotImage, "visible", true);
--        }
--
--        function test_bottomShortDrag() {
--            var bottom = goToPage("tutorialBottom");
--
--            touchFlick(shell, halfWidth, shell.height, halfWidth, shell.height * 0.8);
--
--            var errorTextLabel = findChild(bottom, "errorTextLabel");
--            var errorTitleLabel = findChild(bottom, "errorTitleLabel");
--            tryCompare(bottom, "shown", true); // still on bottom page
--            tryCompare(errorTextLabel, "opacity", 1); // show error
--            tryCompare(errorTitleLabel, "opacity", 1); // show error
--        }
--
--        function test_interrupted() {
--            goToPage("tutorialLeft");
--            ApplicationManager.startApplication("dialer-app");
--            checkFinished();
++            // compare opacity with a bound rather than hard 0.6 because progress doesn't
++            // always match the drag perfectly (takes a moment for drag to kick in)
++            tryCompareFunction(function() {
++                return tutorialRight.opacity >= 0.6 && tutorialRight.opacity < 0.8;
++            }, true);
++            touchFlick(shell, shell.width, halfHeight, shell.width * 0.8, halfHeight, false, true);
++
++            compare(tutorialRight.shown, true);
++        }
++
++        function test_tutorialRightDelay() {
++            // Test that if we exit the top tutorial, we don't immediately
++            // jump into right tutorial.
++            var tutorialRight = findChild(shell, "tutorialRight");
++            var tutorialRightTimer = findInvisibleChild(tutorialRight, "tutorialRightInactivityTimer");
++
++            tutorialRightTimer.interval = 1;
++            openTutorialTop();
++            ApplicationManager.startApplication("gallery-app");
++            ApplicationManager.startApplication("facebook-webapp");
++            tryCompare(ApplicationManager, "count", 3);
++
++            AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];
++            verify(tutorialRightTimer.running, true);
++            verify(!tutorialRight.shown);
++            tryCompare(tutorialRight, "shown", true);
++        }
++
++        function test_tutorialRightAutoSkipped() {
++            // Test that we skip the tutorial if user uses right edge themselves
++
++            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
++            AccountsService.demoEdgesCompleted = ["left", "left-long"];
++            tryCompare(tutorialLeftLoader, "active", false);
++
++            touchFlick(shell, shell.width, halfHeight, 0, halfHeight);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "right"]);
++        }
++
++        function test_tutorialBottomEdges() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialBottom = findChild(tutorial, "tutorialBottom");
++            var tutorialLabel = findChild(tutorialBottom, "tutorialLabel");
++            var launcher = findChild(shell, "launcher");
++            var stage = findChild(shell, "stage");
++            var panel = findChild(shell, "panel");
++
++            openTutorialBottom();
++
++            tryCompare(tutorial, "running", true);
++            verify(!tutorial.launcherEnabled);
++            verify(!tutorial.spreadEnabled);
++            verify(!tutorial.panelEnabled);
++            verify(tutorialBottom.shown);
++            verify(!launcher.available);
++            verify(!stage.spreadEnabled);
++            verify(!panel.indicators.available);
++            compare(tutorialLabel.text, "Swipe up for recent calls");
++        }
++
++        function test_tutorialBottomFinish() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialBottom = findChild(tutorial, "tutorialBottom");
++
++            openTutorialBottom();
++            touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
++
++            tryCompare(tutorialBottom, "shown", false);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right", "bottom-dialer-app"]);
++
++            // OK, we did one, just confirm that when all are done, we mark whole tutorial as done.
++            verify(AccountsService.demoEdges);
++            AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right",
++                                                  "bottom-address-book-app",
++                                                  "bottom-com.ubuntu.calculator_calculator",
++                                                  "bottom-dialer-app",
++                                                  "bottom-messaging-app"];
++            verify(!AccountsService.demoEdges);
++        }
++
++        function test_tutorialBottomAppearsBeforeRight() {
++            // Confirm that if bottom edge and right edge would appear on the
++            // the same app open, bottom edge appears first. (this is a lightly
++            // edited version of openTutorialRight)
++            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
++            var tutorialRight = findChild(shell, "tutorialRight");
++            var tutorialBottom = findChild(shell, "tutorialBottom");
++
++            AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];
++            ApplicationManager.startApplication("gallery-app");
++            ApplicationManager.startApplication("dialer-app");
++
++            tryCompare(tutorialLeftLoader, "active", false);
++            tryCompare(tutorialBottom, "shown", true);
++            tryCompare(tutorialBottom, "opacity", 1);
++            tryCompare(tutorialRight, "visible", false);
++        }
++
++        function test_tutorialBottomOnlyCoversSideStageOnTablet() {
++            loadShell("tablet");
++
++            var tutorialBottom = findChild(shell, "tutorialBottom");
++            var targetHeight = shell.height - units.gu(4);
++            var mainStageX = units.gu(20);
++            var sideStageX = shell.width - units.gu(20);
++
++            openTutorialBottom();
++
++            touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);
++            compare(tutorialBottom.opacity, 1);
++            touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, false, true);
++
++            touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);
++            verify(tutorialBottom.opacity < 1);
++            touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, false, true);
++        }
++
++        function test_tutorialBottomOnlyCoversMainStageOnTablet() {
++            loadShell("tablet");
++
++            var tutorialBottom = findChild(shell, "tutorialBottom");
++            var targetHeight = shell.height - units.gu(4);
++            var mainStageX = units.gu(20);
++            var sideStageX = shell.width - units.gu(20);
++
++            openTutorialBottom();
++            var app = ApplicationManager.findApplication("dialer-app");
++            app.setStage(ApplicationInfoInterface.MainStage);
++
++            touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);
++            compare(tutorialBottom.opacity, 1);
++            touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, false, true);
++
++            touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);
++            verify(tutorialBottom.opacity < 1);
++            touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, false, true);
++        }
++
++        function test_activeCallInterruptsTutorial() {
++            var tutorialLeft = findChild(shell, "tutorialLeft");
++            verify(tutorialLeft.shown);
++            verify(!tutorialLeft.paused);
++
++            callManager.foregroundCall = phoneCall;
++            verify(!tutorialLeft.shown);
++            verify(tutorialLeft.paused);
++            tryCompare(tutorialLeft, "visible", false);
++
++            callManager.foregroundCall = null;
++            tryCompare(tutorialLeft, "shown", true);
++            verify(!tutorialLeft.paused);
++        }
++
++        function test_greeterInterruptsTutorial() {
++            var tutorialLeft = findChild(shell, "tutorialLeft");
++            verify(tutorialLeft.shown);
++            verify(!tutorialLeft.paused);
++
++            LightDM.Greeter.showGreeter();
++            verify(!tutorialLeft.shown);
++            verify(tutorialLeft.paused);
++            tryCompare(tutorialLeft, "visible", false);
++
++            LightDM.Greeter.hideGreeter();
++            tryCompare(tutorialLeft, "shown", true);
++            verify(!tutorialLeft.paused);
++        }
++
++        function test_interruptionChecksReadyStateWhenDone() {
++            // If we're done with an interruption (like active call), make sure
++            // that we don't blindly resume the tutorial -- our trigger
++            // conditions still need to be met.  For example, there need to be
++            // enough apps open for the right edge tutorial.
++
++            openTutorialRight();
++
++            var tutorialRight = findChild(shell, "tutorialRight");
++            verify(tutorialRight.isReady);
++            verify(tutorialRight.shown);
++            verify(!tutorialRight.paused);
++
++            callManager.foregroundCall = phoneCall;
++            killApps();
++            callManager.foregroundCall = null;
++
++            verify(!tutorialRight.isReady);
++            verify(!tutorialRight.shown);
++            verify(!tutorialRight.paused);
++            compare(AccountsService.demoEdgesCompleted, ["left", "left-long", "top"]);
++        }
++
++        function test_desktopOnlyShowsTutorialRight() {
++            loadShell("desktop");
++
++            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
++            var tutorialTopLoader = findChild(shell, "tutorialTopLoader");
++            var tutorialRightLoader = findChild(shell, "tutorialRightLoader");
++            var tutorialBottomLoader = findChild(shell, "tutorialBottomLoader");
++            verify(!tutorialLeftLoader.active);
++            verify(!tutorialTopLoader.active);
++            verify(tutorialRightLoader.active);
++            verify(!tutorialBottomLoader.active);
++            compare(AccountsService.demoEdgesCompleted, []);
++
++            ApplicationManager.startApplication("dialer-app");
++            ApplicationManager.startApplication("camera-app");
++            tryCompare(tutorialRightLoader.item, "isReady", true);
++            tryCompare(tutorialRightLoader, "shown", true);
++        }
++
++        function test_oskDoesNotHideTutorial() {
++            var tutorialLeft = findChild(shell, "tutorialLeft");
++            verify(tutorialLeft.shown);
++
++            var surface = SurfaceManager.inputMethodSurface;
++            surface.setState(Mir.RestoredState);
++
++            var inputMethod = findInvisibleChild(shell, "inputMethod");
++            tryCompare(inputMethod, "state", "shown");
++
++            verify(tutorialLeft.shown);
++        }
++
++        function test_oskPreventsTutorial() {
++            var surface = SurfaceManager.inputMethodSurface;
++            var inputMethod = findInvisibleChild(shell, "inputMethod");
++
++            AccountsService.demoEdges = false;
++            surface.setState(Mir.RestoredState);
++            tryCompare(inputMethod, "state", "shown");
++
++            var tutorial = findChild(shell, "tutorial");
++            tryCompare(tutorial, "keyboardVisible", true);
++
++            AccountsService.demoEdges = true;
++            var tutorialLeft = findChild(shell, "tutorialLeft");
++            verify(!tutorialLeft.shown);
++
++            surface.setState(Mir.MinimizedState);
++            tryCompare(inputMethod, "state", "hidden");
++            tryCompare(tutorialLeft, "shown", false);
++        }
++
++        function test_accountsServiceSettings() {
++            var tutorialLeft = findChild(shell, "tutorialLeft");
++            verify(tutorialLeft != null);
++            verify(tutorialLeft.shown);
++
++            AccountsService.demoEdges = false;
++            verify(findChild(shell, "tutorialLeft") == null);
++
++            AccountsService.demoEdges = true;
++            tutorialLeft = findChild(shell, "tutorialLeft");
++            verify(tutorialLeft != null);
++            tryCompare(tutorialLeft, "shown", true);
+         }
+     }
+ }
 === modified file 'tests/qmltests/tst_OrientedShell.qml'
 --- tests/qmltests/tst_OrientedShell.qml	2016-01-28 11:31:48 +0000
 +++ tests/qmltests/tst_OrientedShell.qml	2016-03-10 17:24:40 +0000
@@ -314,7 +314,7 @@
                      checked: false
                      activeFocusOnPress: false
                      onCheckedChanged: {
--                        var surface = SurfaceManager.inputMethodSurface();
++                        var surface = SurfaceManager.inputMethodSurface;
                          if (checked) {
                              surface.setState(Mir.RestoredState);
                          } else {
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-02-12 00:11:28 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-03-10 17:24:40 +0000
@@ -414,6 +414,7 @@
              setLightDMMockMode("single"); // back to the default value
              AccountsService.demoEdges = false;
++            AccountsService.demoEdgesCompleted = [];
              Wizard.System.wizardEnabled = false;
              // kill all (fake) running apps
@@ -565,9 +566,8 @@
          function test_tabletLeftEdgeDrag_data() {
              return [
--                {tag: "without password", user: "no-password", loggedIn: true, demo: false},
--                {tag: "with password", user: "has-password", loggedIn: false, demo: false},
--                {tag: "with demo", user: "has-password", loggedIn: true, demo: true},
++                {tag: "without password", user: "no-password", loggedIn: true},
++                {tag: "with password", user: "has-password", loggedIn: false},
+             ]
+         }
@@ -577,10 +577,6 @@
              selectUser(data.user)
--            AccountsService.demoEdges = data.demo
--            var tutorial = findChild(shell, "tutorial");
--            tryCompare(tutorial, "running", data.demo);
--
              swipeFromLeftEdge(shell.width * 0.75)
              wait(500) // to give time to handle dash() signal from Launcher
              confirmLoggedIn(data.loggedIn)
@@ -773,7 +769,7 @@
              loadShell("phone");
              swipeAwayGreeter();
              var item = findChild(shell, "inputMethod");
--            var surface = SurfaceManager.inputMethodSurface();
++            var surface = SurfaceManager.inputMethodSurface;
              surface.setState(Mir.MinimizedState);
              tryCompare(item, "visible", false);
@@ -1176,7 +1172,6 @@
              var tutorial = findChild(shell, "tutorial");
              AccountsService.demoEdges = true;
--            tryCompare(tutorial, "running", true);
              tryCompare(tutorial, "paused", true);
              swipeAwayGreeter();
 === modified file 'tests/qmltests/tst_ShellWithPin.qml'
 --- tests/qmltests/tst_ShellWithPin.qml	2016-01-19 19:46:01 +0000
 +++ tests/qmltests/tst_ShellWithPin.qml	2016-03-10 17:24:40 +0000
@@ -270,28 +270,6 @@
              tryCompare(sessionSpy, "count", 1)
+         }
--        function test_edgeDemoHidesLockscreen() {
--            LightDM.Greeter.showGreeter()
--            sessionSpy.clear()
--            var lockscreen = findChild(shell, "lockscreen")
--
--            tryCompare(lockscreen, "shown", true)
--            AccountsService.demoEdges = true
--            tryCompare(lockscreen, "shown", false)
--
--            var greeter = findChild(shell, "greeter");
--            swipeAwayGreeter(false);
--            tryCompare(greeter, "shown", false);
--            tryCompare(sessionSpy, "count", 1)
--
--            // Lockscreen is only hidden by the edge demo, so if we turn that
--            // off and show greeter again, lockscreen should appear
--            AccountsService.demoEdges = false
--            LightDM.Greeter.showGreeter()
--            lockscreen = findChild(shell, "lockscreen");
--            tryCompare(lockscreen, "shown", true)
--        }
--
          function test_disabledEdges() {
              var launcher = findChild(shell, "launcher")
              tryCompare(launcher, "available", true)