Unity 8

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

tutorial-refactor
Merge into trunk

Proposed by Michael Terry on 2014-10-28

Status:

Superseded

Proposed branch:

lp:~mterry/unity8/tutorial-refactor

Merge into:

lp:unity8

Diff against target:

3227 lines (+1582/-862)

41 files modified

debian/unity8.install (+1/-0)
plugins/Ubuntu/Gestures/TouchGate.cpp (+2/-0)
plugins/Ubuntu/Gestures/TouchGate.h (+2/-0)
qml/CMakeLists.txt (+3/-2)
qml/Components/EdgeDemo.qml (+0/-254)
qml/Components/EdgeDemoOverlay.qml (+0/-273)
qml/Launcher/Launcher.qml (+13/-7)
qml/Shell.qml (+42/-23)
qml/Stages/ApplicationWindow.qml (+3/-1)
qml/Stages/PhoneStage.qml (+2/-0)
qml/Stages/SessionContainer.qml (+24/-9)
qml/Stages/SpreadDelegate.qml (+2/-1)
qml/Stages/SurfaceContainer.qml (+11/-25)
qml/Stages/TabletStage.qml (+14/-0)
qml/Stages/TransformedTabletSpreadDelegate.qml (+1/-1)
qml/Tutorial/Arrow.qml (+56/-0)
qml/Tutorial/Slider.qml (+117/-0)
qml/Tutorial/Tutorial.qml (+85/-0)
qml/Tutorial/TutorialContent.qml (+130/-0)
qml/Tutorial/TutorialLeft.qml (+91/-0)
qml/Tutorial/TutorialLeftFinish.qml (+47/-0)
qml/Tutorial/TutorialPage.qml (+240/-0)
tests/autopilot/unity8/shell/emulators/tutorial.py (+16/-102)
tests/autopilot/unity8/shell/fixture_setup.py (+6/-6)
tests/autopilot/unity8/shell/tests/test_tutorial.py (+17/-18)
tests/mocks/Unity/Application/MirSurfaceItem.qml (+16/-1)
tests/qmltests/CMakeLists.txt (+2/-1)
tests/qmltests/Components/tst_EdgeDemoOverlay.qml (+0/-123)
tests/qmltests/Stages/ApplicationCheckBox.qml (+45/-0)
tests/qmltests/Stages/RecursingChildSessionControl.qml (+3/-0)
tests/qmltests/Stages/tst_ApplicationWindow.qml (+6/-1)
tests/qmltests/Stages/tst_PhoneStage.qml (+4/-0)
tests/qmltests/Stages/tst_SessionContainer.qml (+14/-7)
tests/qmltests/Stages/tst_TabletStage.qml (+154/-0)
tests/qmltests/Tutorial/tst_Tutorial.qml (+286/-0)
tests/qmltests/tst_Shell.qml (+26/-5)
tests/qmltests/tst_TabletShell.qml (+2/-2)
tests/uqmlscene/ActiveFocusLogger.cpp (+48/-0)
tests/uqmlscene/ActiveFocusLogger.h (+37/-0)
tests/uqmlscene/CMakeLists.txt (+1/-0)
tests/uqmlscene/main.cpp (+13/-0)

To merge this branch:

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

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-02-11
Andrea Cimitan (community)		2014-10-28	Approve on 2015-01-09
Review via email: mp+239874@code.launchpad.net

This proposal has been superseded by a proposal from 2015-02-11.

Commit Message

Redesign tutorial to match latest spec (just removing obsolete pages and redesigning look, no new pages yet)

Description of the Change

Redesign tutorial to match latest spec (just removing obsolete pages and redesigning look, no new pages yet)

Specifically, both the greeter and top-edge pages are dropped. Design decided they were self-explanatory enough that they didn't need to be part of the tutorial (in an effort to make it shorter).

The tutorial is still missing right-edge and bottom-edge pages. But since those are new, I am going to do them as a separate branch. This branch is just about trimming the tutorial and redesigning the look and feel.

This leaves us with a very short tutorial right now, but I'm OK with that. It will get longer in a moment with my next tutorial branch.

I did a whole refactor of the tutorial code while here. I didn't like the old way I had done it (too procedural rather than declarative).

I've also taken this opportunity to sync our technical name for the tutorial (edge demo) to what Design calls it (tutorial).

Here is the spec from Design:
https://docs.google.com/a/canonical.com/presentation/d/1M8S1wTo-5lIFaIxxgls9TCEnvR79XThGEVpRtkHJY_A

== Checklist ==

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

* 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?
I'm in that team

* If you changed the UI, has there been a design review?
Yes-ish, they saw an earlier version, will get final approval.

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

FAILED: Continuous integration, rev:1372
http://jenkins.qa.ubuntu.com/job/unity8-ci/4779/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6272/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1765/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1875/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1873/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7524/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

FAILED: Continuous integration, rev:1373
http://jenkins.qa.ubuntu.com/job/unity8-ci/4780/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6274/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1766/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1874/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7526/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2014-10-31:

Text conflict in qml/Shell.qml
Conflict adding file qml/Tutorial. Moved existing file to qml/Tutorial.moved.
Text conflict in qml/Tutorial/Tutorial.qml
3 conflicts encountered.

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

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-11-04:

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2014-11-18:

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

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

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1382
http://jenkins.qa.ubuntu.com/job/unity8-ci/5064/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/629
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/627
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/627/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16728

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1384
http://jenkins.qa.ubuntu.com/job/unity8-ci/5067/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/636
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/634
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/634/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16748

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/unity8-ci/5069/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/638
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/636
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/636/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16753

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

review: Needs Fixing (continuous-integration)

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

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

review: Approve (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-01-08:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-01-08:

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

review: Approve (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-01-08:

I've triggered a rebuild, don't think the failures are because of this branch.

Albert Astals Cid (aacid) wrote on 2015-01-08:

Ha! That was bad timing. I've cancelled the rebuild :D

PS Jenkins bot (ps-jenkins) wrote on 2015-01-08:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-01-08:

And my cancelled build appears as failed :/

PS Jenkins bot (ps-jenkins) wrote on 2015-01-08:

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-01-08:

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

review: Approve (continuous-integration)

Andrea Cimitan (cimi) wrote on 2015-01-09:

I tested this few times in a row, until I found my launcher stuck 2px on screen when hidden (like always on screen 2px).
Might be some of the changes to Launcher.qml

another small thing, more a question, you added both chevron and tick png, but while for tick you used gridUnit, you used pixels for chevron... should both scale or not?

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

I'll look at the 2px-launcher problem.

As for gridUnit vs pixels... Arrow.qml mentions the size of the "chevron.png" source image in pixels, but for its actual height/width, it scales to whatever size the Arrow object is. So they both scale fine, I believe.

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

OK, fixed the launcher sometimes being left exposed. Thanks for the catch!

Andrea Cimitan (cimi) wrote on 2015-01-09:

* Did you perform an exploratory manual test run of the code change and any related functionality?
y
* Did CI run pass? If not, please explain why.
y
* Did you make sure that the branch does not contain spurious tags?
y

thanks, no issues I noticed now!

review: Approve

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

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

review: Needs Fixing (continuous-integration)

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

I'm going to wait to top-approve this, because design is still doing some minor tweaks (color tweaks, size of text, etc)

lp:~mterry/unity8/tutorial-refactor updated on 2015-01-09

1395. By Michael Terry on 2015-01-09: Tweak colors of slider

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

FAILED: Continuous integration, rev:1395
http://jenkins.qa.ubuntu.com/job/unity8-ci/5131/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/762/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/296/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/296/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/760/console

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-refactor updated on 2015-01-09

1396. By Michael Terry on 2015-01-09: Merge from trunk

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-refactor updated on 2015-01-15

1397. By Michael Terry on 2015-01-15: Merge from trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-01-15:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-refactor updated on 2015-01-28

1398. By Michael Terry on 2015-01-28: Merge from trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-01-28:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-refactor updated on 2015-02-01

1399. By Michael Terry on 2015-02-01: Don't let user interact with launcher when not 'visible'

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-refactor updated on 2015-02-03

1400. By Michael Terry on 2015-02-03: Update autopilot

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

FAILED: Continuous integration, rev:1400
http://jenkins.qa.ubuntu.com/job/unity8-ci/5225/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1135/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/390
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1133/console

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

review: Needs Fixing (continuous-integration)

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

OK, so this got updated with a couple minor design tweaks and a fix for the autopilot tests. Design has signed off on this version. And the autopilot passes now (well, you can't see it here yet -- I just kicked a rebuild, but you can see it in https://code.launchpad.net/~mterry/unity8/tutorial-new-screens/+merge/245699).

So I'm inclined to top-approve again if there isn't an objection.

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-refactor updated on 2015-02-05

1401. By Michael Terry on 2015-02-05: Merge from trunk
1402. By Michael Terry on 2015-02-05: Fix tutorial qmluitests with the new lightdm mock

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

PASSED: Continuous integration, rev:1400
http://jenkins.qa.ubuntu.com/job/unity8-ci/5282/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1288
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1286
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17955

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

review: Approve (continuous-integration)

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

1403. By Michael Terry on 2015-02-11: Rebase on lp:~dandrader/unity8/fixSurfaceActiveFocus

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

PASSED: Continuous integration, rev:1402
http://jenkins.qa.ubuntu.com/job/unity8-ci/5291/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1298
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1296
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1296/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17966

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

review: Approve (continuous-integration)

Unmerged revisions

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/unity8.install'
 --- debian/unity8.install	2014-11-14 22:40:00 +0000
 +++ debian/unity8.install	2015-02-11 16:31:26 +0000
@@ -10,5 +10,6 @@
  usr/share/unity8/Panel
  usr/share/unity8/Shell.qml
  usr/share/unity8/Stages
++usr/share/unity8/Tutorial
  usr/share/unity8/Wizard
  usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher
 === modified file 'plugins/Ubuntu/Gestures/TouchGate.cpp'
 --- plugins/Ubuntu/Gestures/TouchGate.cpp	2014-10-17 11:01:53 +0000
 +++ plugins/Ubuntu/Gestures/TouchGate.cpp	2015-02-11 16:31:26 +0000
@@ -53,6 +53,8 @@
              m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
              m_touchInfoMap[touchPoint.id()].ended = false;
              TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);
++
++            Q_EMIT pressed();
+         }
          goodToGo &= m_touchInfoMap.contains(touchPoint.id())
 === modified file 'plugins/Ubuntu/Gestures/TouchGate.h'
 --- plugins/Ubuntu/Gestures/TouchGate.h	2014-10-17 11:01:53 +0000
 +++ plugins/Ubuntu/Gestures/TouchGate.h	2015-02-11 16:31:26 +0000
@@ -53,6 +53,8 @@
  Q_SIGNALS:
      void targetItemChanged(QQuickItem *item);
++    void pressed();
++
  protected:
      void touchEvent(QTouchEvent *event) override;
  private:
 === modified file 'qml/CMakeLists.txt'
 --- qml/CMakeLists.txt	2014-11-14 23:30:10 +0000
 +++ qml/CMakeLists.txt	2015-02-11 16:31:26 +0000
@@ -9,10 +9,11 @@
      Dash
      graphics
      Greeter
++    Launcher
++    Notifications
      Panel
--    Launcher
      Stages
--    Notifications
++    Tutorial
      Wizard
+     )
 === removed file 'qml/Components/EdgeDemo.qml'
 --- qml/Components/EdgeDemo.qml	2014-11-19 19:05:35 +0000
 +++ qml/Components/EdgeDemo.qml	1970-01-01 00:00:00 +0000
@@ -1,254 +0,0 @@
--/*
-- * Copyright (C) 2013 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import AccountsService 0.1
--import LightDM 0.1 as LightDM
--import QtQuick 2.0
--import Ubuntu.Components 1.1
--
--Item {
--    id: demo
--
--    property Item greeter
--    property Item launcher
--    property Item panel
--    property Item stages
--
--    property bool launcherEnabled: true
--    property bool stagesEnabled: true
--    property bool panelEnabled: true
--    property bool panelContentEnabled: true
--    property bool running: !launcherEnabled || !stagesEnabled || !panelEnabled || !panelContentEnabled
--
--    property bool paused: false
--
--    onPausedChanged: {
--        if (d.rightEdgeDemo)  d.rightEdgeDemo.paused = paused
--        if (d.topEdgeDemo)    d.topEdgeDemo.paused = paused
--        if (d.bottomEdgeDemo) d.bottomEdgeDemo.paused = paused
--        if (d.leftEdgeDemo)   d.leftEdgeDemo.paused = paused
--        if (d.finalEdgeDemo)  d.finalEdgeDemo.paused = paused
--    }
--
--    function hideEdgeDemoInShell() {
--        AccountsService.demoEdges = false;
--        stopDemo();
--    }
--
--    function hideEdgeDemoInGreeter() {
--        // TODO: AccountsService.demoEdges = false as lightdm user
--    }
--
--    function hideEdgeDemos() {
--        hideEdgeDemoInGreeter();
--        hideEdgeDemoInShell();
--    }
--
--    function stopDemo() {
--        launcherEnabled = true
--        stagesEnabled = true
--        panelEnabled = true
--        panelContentEnabled = true
--
--        // Use a tiny delay for these destroy() calls because if a lot is
--        // happening at once (like creating and being destroyed in same event
--        // loop, as might happen when answering a call while demo is open),
--        // the destroy() call will be ignored.
--        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy(1);
--        if (d.topEdgeDemo)    d.topEdgeDemo.destroy(1);
--        if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy(1);
--        if (d.leftEdgeDemo)   d.leftEdgeDemo.destroy(1);
--        if (d.finalEdgeDemo)  d.finalEdgeDemo.destroy(1);
--    }
--
--    function startDemo() {
--        if (!d.overlay) {
--            d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")
--        }
--
--        launcherEnabled = false;
--        stagesEnabled = false;
--        panelEnabled = false;
--        panelContentEnabled = false;
--
--        // Begin with either greeter or top, depending on which is visible
--        if (greeter && greeter.shown) {
--            startRightEdgeDemo()
--        } else {
--            startTopEdgeDemo()
--        }
--    }
--
--    QtObject {
--        id: d
--        property Component overlay
--        property QtObject rightEdgeDemo
--        property QtObject topEdgeDemo
--        property QtObject bottomEdgeDemo
--        property QtObject leftEdgeDemo
--        property QtObject finalEdgeDemo
--        property bool showEdgeDemo: AccountsService.demoEdges
--        property bool showEdgeDemoInGreeter: AccountsService.demoEdges // TODO: AccountsService.demoEdges as lightdm user
--
--        function restartDemo() {
--            stopDemo()
--            if (d.showEdgeDemo) {
--                startDemo()
--            }
--        }
--
--        onShowEdgeDemoChanged: restartDemo()
--    }
--
--    Connections {
--        target: i18n
--        onLanguageChanged: d.restartDemo()
--    }
--
--    function startRightEdgeDemo() {
--        if (demo.greeter) {
--            d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
--                "edge": "right",
--                "title": i18n.tr("Right edge"),
--                "text": i18n.tr("Try swiping from the right edge to unlock the phone"),
--                "anchors.fill": demo.greeter,
--            });
--        }
--        if (d.rightEdgeDemo) {
--            d.rightEdgeDemo.onSkip.connect(demo.hideEdgeDemos)
--        } else {
--            stopDemo();
--        }
--    }
--
--    Connections {
--        target: demo.greeter
--
--        function hide() {
--            if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
--                d.rightEdgeDemo.hide()
--                hideEdgeDemoInGreeter()
--                startTopEdgeDemo()
--            }
--        }
--
--        onUnlocked: hide()
--        onShownChanged: if (!greeter.shown) hide()
--    }
--
--    function startTopEdgeDemo() {
--        demo.panelEnabled = true;
--        if (demo.stages) {
--            d.topEdgeDemo = d.overlay.createObject(demo.panel, {
--                "edge": "top",
--                "title": i18n.tr("Top edge"),
--                "text": i18n.tr("Try swiping from the top edge to access the indicators"),
--                "anchors.fill": demo.panel,
--            });
--        }
--        if (d.topEdgeDemo) {
--            d.topEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)
--        } else {
--            stopDemo();
--        }
--    }
--
--    Connections {
--        target: demo.panel.indicators
--        onFullyOpenedChanged: {
--            if (d.topEdgeDemo && d.topEdgeDemo.available && demo.panel.indicators.fullyOpened) {
--                d.topEdgeDemo.hideNow()
--                startBottomEdgeDemo()
--            }
--        }
--    }
--
--    function startBottomEdgeDemo() {
--        if (demo.panel.indicators) {
--            d.bottomEdgeDemo = d.overlay.createObject(demo.panel.indicators, {
--                "edge": "bottom",
--                "title": i18n.tr("Close"),
--                "text": i18n.tr("Swipe up again to close the settings screen"),
--                "anchors.fill": demo.panel.indicators,
--            });
--        }
--        if (d.bottomEdgeDemo) {
--            d.bottomEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)
--        } else {
--            stopDemo();
--        }
--    }
--
--    Connections {
--        target: demo.panel.indicators
--        onPartiallyOpenedChanged: {
--            if (d.bottomEdgeDemo &&
--                    d.bottomEdgeDemo.available &&
--                    !demo.panel.indicators.partiallyOpened &&
--                    !demo.panel.indicators.fullyOpened) {
--                d.bottomEdgeDemo.hideNow()
--                startLeftEdgeDemo()
--            }
--        }
--    }
--
--    function startLeftEdgeDemo() {
--        demo.panelEnabled = false;
--        demo.launcherEnabled = true;
--        if (demo.stages) {
--            d.leftEdgeDemo = d.overlay.createObject(demo.stages, {
--                "edge": "left",
--                "title": i18n.tr("Left edge"),
--                "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
--                "anchors.fill": demo.stages,
--            });
--        }
--        if (d.leftEdgeDemo) {
--            d.leftEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)
--        } else {
--            stopDemo();
--        }
--    }
--
--    Connections {
--        target: demo.launcher
--        onStateChanged: {
--            if (d.leftEdgeDemo && d.leftEdgeDemo.available && launcher.state == "visible") {
--                d.leftEdgeDemo.hide()
--                launcher.hide()
--                startFinalEdgeDemo()
--            }
--        }
--    }
--
--    function startFinalEdgeDemo() {
--        demo.launcherEnabled = false;
--        if (demo.stages) {
--            d.finalEdgeDemo = d.overlay.createObject(demo.stages, {
--                "edge": "none",
--                "title": i18n.tr("Well done"),
--                "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),
--                "anchors.fill": demo.stages,
--                "showSkip": false,
--            });
--        }
--        if (d.finalEdgeDemo) {
--            d.finalEdgeDemo.onSkip.connect(demo.hideEdgeDemoInShell)
--        } else {
--            stopDemo();
--        }
--    }
--}
 === removed file 'qml/Components/EdgeDemoOverlay.qml'
 --- qml/Components/EdgeDemoOverlay.qml	2014-07-01 23:45:28 +0000
 +++ qml/Components/EdgeDemoOverlay.qml	1970-01-01 00:00:00 +0000
@@ -1,273 +0,0 @@
--/*
-- * Copyright (C) 2013 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import Powerd 0.1
--import QtQuick 2.0
--import QtGraphicalEffects 1.0
--import Unity.Application 0.1
--import Ubuntu.Components 0.1
--
--Showable {
--    id: overlay
--
--    /*
--     * Valid values are "left", "right", "top", "bottom", or "none".
--     */
--    property string edge: "top"
--
--    /*
--     * 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
--
--    /*
--     * This is the text for the skip button.
--     */
--    property alias skipText: skipLabel.text
--
--    /*
--     * This is the visible status of the skip button.
--     */
--    property alias showSkip: skipLabel.visible
--
--    /*
--     * Whether this demo is running currently.
--     */
--    readonly property bool active: available && visible
--
--    /*
--     * Whether animations are paused.
--     */
--    property alias paused: wholeAnimation.paused
--
--    /*
--     * Whether animations are running.
--     */
--    readonly property alias running: wholeAnimation.running
--
--    signal skip()
--
--    function doSkip() {
--        d.skipOnHide = true;
--        hide();
--    }
--
--    function hideNow() {
--        overlay.visible = false;
--        overlay.available = false;
--        if (d.skipOnHide) {
--            overlay.skip();
--        }
--    }
--
--    showAnimation: StandardAnimation {
--        property: "opacity"
--        to: 1
--        onRunningChanged: if (running) overlay.visible = true
--    }
--    hideAnimation: StandardAnimation {
--        property: "opacity"
--        to: 0
--        duration: UbuntuAnimation.BriskDuration
--        onRunningChanged: if (!running) overlay.hideNow()
--    }
--
--    QtObject {
--        id: d
--        property bool skipOnHide: false
--        property int edgeMargin: units.gu(4)
--    }
--
--    Rectangle {
--        objectName: "backgroundShade"
--
--        anchors.fill: parent
--        color: "black"
--        opacity: 0.8
--        visible: overlay.active
--
--        MouseArea {
--            objectName: "backgroundShadeMouseArea"
--
--            anchors.fill: parent
--            enabled: overlay.edge == "none" && overlay.opacity == 1.0
--            onClicked: overlay.doSkip()
--        }
--    }
--
--    Item {
--        id: hintGroup
--        x: 0
--        y: 0
--        width: parent.width
--        height: parent.height
--        visible: overlay.active
--
--        Column {
--            id: labelGroup
--            spacing: units.gu(3)
--
--            anchors {
--                margins: d.edgeMargin
--                left: parent.left
--                top: overlay.edge == "bottom" ? undefined : parent.top
--                bottom: overlay.edge == "bottom" ? parent.bottom : undefined
--            }
--
--            Label {
--                id: titleLabel
--                fontSize: "x-large"
--                width: units.gu(25)
--                wrapMode: Text.WordWrap
--            }
--
--            Label {
--                id: textLabel
--                width: units.gu(25)
--                wrapMode: Text.WordWrap
--            }
--
--            Label {
--                id: skipLabel
--                objectName: "skipLabel"
--                text: i18n.tr("Skip intro")
--                color: UbuntuColors.orange
--                fontSize: "small"
--
--                Icon {
--                    anchors.left: parent.right
--                    anchors.verticalCenter: parent.verticalCenter
--                    height: units.dp(12)
--                    width: units.dp(12)
--                    name: "chevron"
--                    color: UbuntuColors.orange
--                }
--
--                MouseArea {
--                    // Make clickable area bigger than just the link because
--                    // otherwise, the edge demo will feel hard to dismiss.
--                    anchors.fill: parent
--                    anchors.margins: -units.gu(5)
--                    onClicked: overlay.doSkip()
--                }
--            }
--        }
--
--        LinearGradient {
--            id: edgeHint
--            property int size: 1
--            cached: false
--            visible: overlay.edge != "none"
--            gradient: Gradient {
--                GradientStop {
--                    position: 0.0
--                    color: Qt.hsla(16.0/360.0, 0.83, 0.47, 0.4) // UbuntuColors.orange, but transparent
--                }
--                GradientStop {
--                    position: 1.0
--                    color: "transparent"
--                }
--            }
--            anchors.fill: parent
--            start: {
--                if (overlay.edge == "right") {
--                    return Qt.point(width, 0);
--                } else if (overlay.edge == "left") {
--                    return Qt.point(0, 0);
--                } else if (overlay.edge == "top") {
--                    return Qt.point(0, 0);
--                } else {
--                    return Qt.point(0, height);
--                }
--            }
--            end: {
--                if (overlay.edge == "right") {
--                    return Qt.point(width - size, 0);
--                } else if (overlay.edge == "left") {
--                    return Qt.point(size, 0);
--                } else if (overlay.edge == "top") {
--                    return Qt.point(0, size);
--                } else {
--                    return Qt.point(0, height - size);
--                }
--            }
--        }
--    }
--
--    SequentialAnimation {
--        id: wholeAnimation
--        objectName: "wholeAnimation"
--        running: overlay.active
--
--        ParallelAnimation {
--            id: fadeInAnimation
--
--            StandardAnimation {
--                target: labelGroup
--                property: {
--                    if (overlay.edge == "right" || overlay.edge == "left") {
--                        return "anchors.leftMargin";
--                    } else if (overlay.edge == "bottom") {
--                        return "anchors.bottomMargin";
--                    } else {
--                        return "anchors.topMargin";
--                    }
--                }
--                from: {
--                    if (overlay.edge == "right") {
--                        return d.edgeMargin + units.gu(3)
--                    } else {
--                        return d.edgeMargin - units.gu(3)
--                    }
--                }
--                to: d.edgeMargin
--                duration: overlay.edge == "none" ? 0 : UbuntuAnimation.SleepyDuration
--            }
--            StandardAnimation {
--                target: overlay
--                property: "opacity"
--                from: 0.0
--                to: 1.0
--                duration: UbuntuAnimation.SleepyDuration
--            }
--        }
--
--        SequentialAnimation {
--            id: hintAnimation
--            loops: Animation.Infinite
--            property string prop: (overlay.edge == "left" || overlay.edge == "right") ? "x" : "y"
--            property double endVal: units.dp(5) * ((overlay.edge == "left" || overlay.edge == "top") ? 1 : -1)
--            property double maxGlow: units.dp(20)
--            property int duration: overlay.edge == "none" ? 0 : UbuntuAnimation.SleepyDuration
--
--            ParallelAnimation {
--                StandardAnimation { target: hintGroup; property: hintAnimation.prop; from: 0; to: hintAnimation.endVal; duration: hintAnimation.duration }
--                StandardAnimation { target: edgeHint; property: "size"; from: 1; to: hintAnimation.maxGlow; duration: hintAnimation.duration }
--            }
--
--            // Undo the above
--            ParallelAnimation {
--                StandardAnimation { target: hintGroup; property: hintAnimation.prop; from: hintAnimation.endVal; to: 0; duration: hintAnimation.duration }
--                StandardAnimation { target: edgeHint; property: "size"; from: hintAnimation.maxGlow; to: 1; duration: hintAnimation.duration }
--            }
--        }
--    }
--}
 === modified file 'qml/Launcher/Launcher.qml'
 --- qml/Launcher/Launcher.qml	2014-12-11 13:24:26 +0000
 +++ qml/Launcher/Launcher.qml	2015-02-11 16:31:26 +0000
@@ -26,6 +26,7 @@
      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)
@@ -33,6 +34,10 @@
      property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
                                  (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
++    readonly property bool dragging: dragArea.dragging
++    readonly property real dragDistance: dragArea.dragging ? dragArea.touchX : 0
++    readonly property real visibleWidth: panel.width + panel.x
++
      readonly property bool shown: panel.x > -panel.width
      // emitted when an application is selected
@@ -154,7 +159,7 @@
      MouseArea {
          id: launcherDragArea
--        enabled: root.state == "visible"
++        enabled: root.available && root.state == "visible"
          anchors.fill: panel
          anchors.rightMargin: -units.gu(2)
          drag {
@@ -180,7 +185,7 @@
              right: parent.right
              bottom: parent.bottom
+         }
--        enabled: root.state == "visible"
++        enabled: root.shadeBackground && root.state == "visible"
          onPressed: {
              root.state = ""
+         }
@@ -190,7 +195,7 @@
          id: backgroundShade
          anchors.fill: parent
          color: "black"
--        opacity: root.state == "visible" ? 0.6 : 0
++        opacity: root.shadeBackground && root.state == "visible" ? 0.6 : 0
          Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.BriskDuration } }
+     }
@@ -198,14 +203,14 @@
      LauncherPanel {
          id: panel
          objectName: "launcherPanel"
--        enabled: root.available
++        enabled: root.available && root.state == "visible"
          width: root.panelWidth
          anchors {
              top: parent.top
              bottom: parent.bottom
+         }
          x: -width
--        visible: x > -width || dragArea.status === DirectionalDragArea.Undecided
++        visible: root.x > 0 || x > -width || dragArea.status === DirectionalDragArea.Undecided
          model: LauncherModel
          property bool animate: true
@@ -247,6 +252,7 @@
          direction: Direction.Rightwards
          enabled: root.available
++        x: -root.x // so if launcher is adjusted relative to screen, we stay put (like tutorial does when teasing)
          width: root.dragAreaWidth
          height: root.height
@@ -260,7 +266,7 @@
              // would appear right next to the user's finger out of nowhere.
              // Instead, we make the panel go towards the user's finger in several
              // steps. ie., in an animated way.
--            var targetPanelX = Math.min(0, touchX - panel.width)
++            var targetPanelX = Math.min(0, touchX - panel.width) - root.x
              var delta = targetPanelX - panel.x
              // the trick is not to go all the way (1.0) as it would cause a sudden jump
              panel.x += 0.4 * delta
@@ -292,7 +298,7 @@
              name: "visible"
              PropertyChanges {
                  target: panel
--                x: 0
++                x: -root.x // so we never go past panelWidth, even when teased by tutorial
+             }
          },
          State {
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2015-02-05 10:29:34 +0000
 +++ qml/Shell.qml	2015-02-11 16:31:26 +0000
@@ -36,6 +36,7 @@
  import "Components"
  import "Notifications"
  import "Stages"
++import "Tutorial"
  import "Wizard"
  import Unity.Notifications 1.0 as NotificationBackend
  import Unity.Session 0.1
@@ -62,7 +63,7 @@
      readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
      readonly property alias hasLockedApp: greeter.hasLockedApp
--    readonly property bool forcedUnlock: edgeDemo.running
++    readonly property bool forcedUnlock: tutorial.running
      onForcedUnlockChanged: if (forcedUnlock) lockscreen.hide()
      property bool sideStageEnabled: shell.width >= units.gu(100)
@@ -161,7 +162,7 @@
      ScreenGrabber {
          id: screenGrabber
--        z: edgeDemo.z + 10
++        z: dialogs.z + 10
          enabled: Powerd.status === Powerd.On
+     }
@@ -252,14 +253,16 @@
+             }
              onApplicationAdded: {
--                if (greeter.shown && appId != "unity8-dash") {
--                    greeter.startUnlock()
++                if (appId != "unity8-dash") {
++                    if (greeter.shown) {
++                        greeter.startUnlock();
++                    }
                      // If this happens on first boot, we may be in edge
                      // tutorial or wizard while receiving a call.  But a call
                      // is more important than wizard so just bail out of those.
--                    if (edgeDemo.running) {
--                        edgeDemo.hideEdgeDemos();
++                    if (tutorial.running) {
++                        tutorial.finish();
                          wizard.hide();
+                     }
+                 }
@@ -287,6 +290,15 @@
              source: usageModeSettings.usageMode === "Windowed" ? "Stages/DesktopStage.qml"
                          : tabletMode ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
++            property bool interactive: tutorial.stagesEnabled
++                    && !greeter.shown
++                    && !lockscreen.shown
++                    && panel.indicators.fullyClosed
++                    && launcher.progress == 0
++                    && !notifications.useModal
++
++            onInteractiveChanged: { if (interactive) { focus = true; } }
++
              Binding {
                  target: applicationsDisplayLoader.item
                  property: "objectName"
@@ -306,12 +318,12 @@
              Binding {
                  target: applicationsDisplayLoader.item
                  property: "interactive"
--                value: edgeDemo.stagesEnabled && !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0 && !notifications.useModal
++                value: applicationsDisplayLoader.interactive
+             }
              Binding {
                  target: applicationsDisplayLoader.item
                  property: "spreadEnabled"
--                value: edgeDemo.stagesEnabled && !greeter.hasLockedApp
++                value: tutorial.stagesEnabled && !greeter.hasLockedApp
+             }
              Binding {
                  target: applicationsDisplayLoader.item
@@ -644,9 +656,13 @@
                  LauncherModel.setUser(user);
+             }
--            onTapped: launcher.tease()
++            onTapped: {
++                if (!tutorial.running) {
++                    launcher.tease();
++                }
++            }
              onDraggingChanged: {
--                if (dragging) {
++                if (dragging && !tutorial.running) {
                      launcher.tease();
+                 }
+             }
@@ -684,7 +700,7 @@
          onStatusChanged: {
              if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
--                    !callManager.hasCalls && !edgeDemo.running) {
++                    !callManager.hasCalls && !tutorial.running) {
                  // 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
@@ -700,7 +716,7 @@
+     }
      function showHome() {
--        if (edgeDemo.running) {
++        if (tutorial.running) {
              return
+         }
@@ -742,8 +758,8 @@
              anchors.fill: parent //because this draws indicator menus
              indicators {
                  hides: [launcher]
--                available: edgeDemo.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
--                contentEnabled: edgeDemo.panelContentEnabled
++                available: tutorial.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
++                contentEnabled: tutorial.panelContentEnabled
                  width: parent.width > units.gu(60) ? units.gu(40) : parent.width
                  minimizedPanelHeight: units.gu(3)
@@ -776,8 +792,9 @@
              anchors.bottom: parent.bottom
              width: parent.width
              dragAreaWidth: shell.edgeSize
--            available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
++            available: tutorial.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
              inverted: usageModeSettings.usageMode === "Staged"
++            shadeBackground: !tutorial.running
              onShowDashHome: showHome()
              onDash: showDash()
@@ -790,7 +807,7 @@
                  if (greeter.hasLockedApp) {
                      greeter.startUnlock()
+                 }
--                if (!edgeDemo.running)
++                if (!tutorial.running)
                      shell.activateApplication(appId)
+             }
              onShownChanged: {
@@ -863,15 +880,17 @@
+         }
+     }
--    EdgeDemo {
--        id: edgeDemo
--        objectName: "edgeDemo"
--        z: dialogs.z + 10
--        paused: Powerd.status === Powerd.Off || wizard.active // Saves power
--        greeter: greeter
++    Tutorial {
++        id: tutorial
++        objectName: "tutorial"
++        active: AccountsService.demoEdges
++        paused: LightDM.Greeter.active
          launcher: launcher
          panel: panel
          stages: stages
++        overlay: overlay
++
++        onFinished: AccountsService.demoEdges = false
+     }
      Connections {
@@ -881,7 +900,7 @@
      Rectangle {
          id: shutdownFadeOutRectangle
--        z: edgeDemo.z + 10
++        z: screenGrabber.z + 10
          enabled: false
          visible: false
          color: "black"
 === modified file 'qml/Stages/ApplicationWindow.qml'
 --- qml/Stages/ApplicationWindow.qml	2014-11-04 14:51:13 +0000
 +++ qml/Stages/ApplicationWindow.qml	2015-02-11 16:31:26 +0000
@@ -18,7 +18,7 @@
  import Ubuntu.Components 1.1
  import Unity.Application 0.1
--Item {
++FocusScope {
      id: root
      // to be read from outside
@@ -120,6 +120,8 @@
                  d.surfaceInitialized = false;
+             }
+         }
++
++        focus: true
+     }
      StateGroup {
 === modified file 'qml/Stages/PhoneStage.qml'
 --- qml/Stages/PhoneStage.qml	2015-01-12 11:21:17 +0000
 +++ qml/Stages/PhoneStage.qml	2015-02-11 16:31:26 +0000
@@ -109,6 +109,8 @@
          onFocusedAppIdChanged: focusedAppDelegate = spreadRepeater.itemAt(0);
++        onFocusedAppDelegateChanged: focusedAppDelegate.focus = true;
++
          function indexOf(appId) {
              for (var i = 0; i < ApplicationManager.count; i++) {
                  if (ApplicationManager.get(i).appId == appId) {
 === modified file 'qml/Stages/SessionContainer.qml'
 --- qml/Stages/SessionContainer.qml	2014-11-12 01:09:03 +0000
 +++ qml/Stages/SessionContainer.qml	2015-02-11 16:31:26 +0000
@@ -17,7 +17,7 @@
  import QtQuick 2.0
  import "Animations"
--Item {
++FocusScope {
      id: root
      objectName: "sessionContainer"
      property QtObject session
@@ -34,8 +34,8 @@
          orientation: root.orientation
+     }
--
      Repeater {
++        id: childSessionsRepeater
          model: root.childSessions
          delegate: Loader {
@@ -45,9 +45,17 @@
              // Only way to do recursive qml items.
              source: Qt.resolvedUrl("SessionContainer.qml")
--            Binding {
--                target: item; when: item
--                property: "interactive"; value: root.interactive
++            z: index
++
++            // Since a Loader is a FocusScope, propagate its focus to the loaded Item
++            Binding {
++                target: item; when: item
++                property: "focus"; value: focus
++            }
++
++            Binding {
++                target: item; when: item
++                property: "interactive"; value: index == (childSessionsRepeater.count - 1) && root.interactive
+             }
              Binding {
@@ -69,10 +77,6 @@
                  target: item; when: item
                  property: "orientation"; value: root.orientation
+             }
--
--            Component.onDestruction: {
--                root.session.surface.forceActiveFocus();
--            }
+         }
+     }
@@ -138,5 +142,16 @@
      QtObject {
          id: d
          property var animations: []
++
++        property var focusedChild: {
++            if (childSessionsRepeater.count == 0) {
++                return _surfaceContainer;
++            } else {
++                return childSessionsRepeater.itemAt(childSessionsRepeater.count - 1);
++            }
++        }
++        onFocusedChildChanged: {
++            focusedChild.focus = true;
++        }
+     }
+ }
 === modified file 'qml/Stages/SpreadDelegate.qml'
 --- qml/Stages/SpreadDelegate.qml	2014-11-27 11:13:08 +0000
 +++ qml/Stages/SpreadDelegate.qml	2015-02-11 16:31:26 +0000
@@ -21,7 +21,7 @@
  import Ubuntu.Components 1.1
  import "../Components"
--Item {
++FocusScope {
      id: root
      // to be read from outside
@@ -65,6 +65,7 @@
          ApplicationWindow {
              id: appWindow
              objectName: application ? "appWindow_" + application.appId : "appWindow_null"
++            focus: true
              anchors {
                  fill: parent
                  topMargin: appWindow.fullscreen ? 0 : maximizedAppTopMargin
 === modified file 'qml/Stages/SurfaceContainer.qml'
 --- qml/Stages/SurfaceContainer.qml	2014-11-04 14:49:47 +0000
 +++ qml/Stages/SurfaceContainer.qml	2015-02-11 16:31:26 +0000
@@ -18,7 +18,7 @@
  import Ubuntu.Components 1.1
  import Ubuntu.Gestures 0.1 // For TouchGate
--Item {
++FocusScope {
      id: root
      objectName: "surfaceContainer"
      property Item surface: null
@@ -26,10 +26,15 @@
      property int orientation
      property bool interactive
++    signal surfacePressed()
++
      onSurfaceChanged: {
          if (surface) {
++            // Set the surface focus *after* it is added to the scene to
++            // ensure an update to the scene's active focus.
++            surface.focus = false;
              surface.parent = root;
--            d.forceSurfaceActiveFocusIfReady();
++            surface.focus = true;
          } else {
              hadSurface = true;
+         }
@@ -38,7 +43,6 @@
      Binding { target: surface; property: "orientation"; value: root.orientation }
      Binding { target: surface; property: "z"; value: 1 }
      Binding { target: surface; property: "enabled"; value: root.interactive; when: surface }
--    Binding { target: surface; property: "focus"; value: root.interactive; when: surface }
      Binding { target: surface; property: "antialiasing"; value: !root.interactive; when: surface }
      TouchGate {
@@ -46,28 +50,10 @@
          anchors.fill: root
          enabled: root.surface ? root.surface.enabled : false
          z: 2
--    }
--
--    Connections {
--        target: root.surface
--        // FIXME: I would rather not need to do this, but currently it doesn't get
--        // active focus without it and I don't know why.
--        // Possibly because if an item get focus=true before it has a parent, once
--        // it gets a parent QQuickWindow won't check its focus and update its activeFocus
--        // accordingly. Unlike when you focus=true after the item already has a parent.
--        onFocusChanged: d.forceSurfaceActiveFocusIfReady();
--        onParentChanged: d.forceSurfaceActiveFocusIfReady();
--        onEnabledChanged: d.forceSurfaceActiveFocusIfReady();
--    }
--
--    QtObject {
--        id: d
--        function forceSurfaceActiveFocusIfReady() {
--            if (root.surface !== null &&
--                    root.surface.focus &&
--                    root.surface.parent === root &&
--                    root.surface.enabled) {
--                root.surface.forceActiveFocus();
++        onPressed: {
++            root.focus = true;
++            if (root.interactive) {
++                root.forceActiveFocus();
+             }
+         }
+     }
 === modified file 'qml/Stages/TabletStage.qml'
 --- qml/Stages/TabletStage.qml	2015-01-12 11:21:17 +0000
 +++ qml/Stages/TabletStage.qml	2015-02-11 16:31:26 +0000
@@ -76,6 +76,20 @@
              appId0 = ApplicationManager.count >= 1 ? ApplicationManager.get(0).appId : "";
              appId1 = ApplicationManager.count > 1 ? ApplicationManager.get(1).appId : "";
++
++            // Update the QML focus accordingly
++            updateSpreadDelegateFocus();
++        }
++
++        function updateSpreadDelegateFocus() {
++            if (priv.focusedAppId) {
++                var focusedAppIndex = priv.indexOf(priv.focusedAppId);
++                if (focusedAppIndex !== -1) {
++                    spreadRepeater.itemAt(focusedAppIndex).focus = true;
++                } else {
++                    console.warn("TabletStage: Failed to find the SpreadDelegate for appID=" + priv.focusedAppId);
++                }
++            }
+         }
          function indexOf(appId) {
 === modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
 --- qml/Stages/TransformedTabletSpreadDelegate.qml	2014-09-02 12:57:15 +0000
 +++ qml/Stages/TransformedTabletSpreadDelegate.qml	2015-02-11 16:31:26 +0000
@@ -366,7 +366,7 @@
          Scale {
              origin { x: 0; y: (spreadView.height * priv.scale) + maximizedAppTopMargin * 3 }
              xScale: 1
--            yScale: isFullscreen ? 1 - priv.topMarginProgress * maximizedAppTopMargin / spreadView.height : 1
++            yScale: fullscreen ? 1 - priv.topMarginProgress * maximizedAppTopMargin / spreadView.height : 1
          },
          Translate {
              x: priv.xTranslate
 === added directory 'qml/Tutorial'
 === added file 'qml/Tutorial/Arrow.qml'
 --- qml/Tutorial/Arrow.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/Arrow.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,56 @@
++/*
++ * 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.3
++import Ubuntu.Components 1.1
++
++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/Slider.qml'
 --- qml/Tutorial/Slider.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/Slider.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,117 @@
++/*
++ * 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.3
++import Ubuntu.Components 1.1
++
++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: Math.min(root.offset - 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
++        anchors.leftMargin: d.slideOffset
++        anchors.verticalCenter: parent.verticalCenter
++    }
++}
 === added file 'qml/Tutorial/Tutorial.qml'
 --- qml/Tutorial/Tutorial.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/Tutorial.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,85 @@
++/*
++ * 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.3
++import Ubuntu.Components 1.1
++
++Item {
++    id: root
++
++    property alias active: loader.active
++    property bool paused
++
++    property Item launcher
++    property Item panel
++    property Item stages
++    property Item overlay
++
++    readonly property bool launcherEnabled: loader.item ? loader.item.launcherEnabled : true
++    readonly property bool stagesEnabled: loader.item ? loader.item.stagesEnabled : 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() {
++        if (loader.item) {
++            loader.item.finish();
++        }
++    }
++
++    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: "launcher"
++            value: root.launcher
++        }
++
++        Binding {
++            target: loader.item
++            property: "panel"
++            value: root.panel
++        }
++
++        Binding {
++            target: loader.item
++            property: "stages"
++            value: root.stages
++        }
++
++        Binding {
++            target: loader.item
++            property: "overlay"
++            value: root.overlay
++        }
++
++        Connections {
++            target: loader.item
++            onFinished: root.finished()
++        }
++    }
++}
 === added file 'qml/Tutorial/TutorialContent.qml'
 --- qml/Tutorial/TutorialContent.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/TutorialContent.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,130 @@
++/*
++ * Copyright (C) 2013,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.3
++import Ubuntu.Components 1.1
++
++Item {
++    id: root
++
++    property Item launcher
++    property Item panel
++    property Item stages
++    property Item overlay
++
++    readonly property bool launcherEnabled: !running ||
++                                            (!paused && loader.target === leftComponent)
++    readonly property bool stagesEnabled: !running
++    readonly property bool panelEnabled: !running
++    readonly property bool panelContentEnabled: !running
++    readonly property bool running: loader.sourceComponent !== null
++
++    property bool paused: false
++
++    signal finished()
++
++    function finish() {
++        d.stop();
++        finished();
++    }
++
++    ////
++
++    Component.onCompleted: {
++        d.start();
++    }
++
++    QtObject {
++        id: d
++
++        function stop() {
++            loader.sourceComponent = null;
++        }
++
++        function start() {
++            loader.load(leftComponent);
++        }
++    }
++
++    Loader {
++        id: loader
++        objectName: "tutorialLoader"
++
++        property Component target: {
++            if (next) {
++                return next;
++            } else if (loader.item && loader.item.shown) {
++                return sourceComponent;
++            } else {
++                return null;
++            }
++        }
++
++        property Component next: null
++
++        function load(comp) {
++            if (loader.item) {
++                next = comp;
++                loader.item.hide();
++            } else {
++                loader.sourceComponent = comp;
++            }
++        }
++
++        Connections {
++            target: loader.item
++            onFinished: {
++                loader.sourceComponent = loader.next;
++                if (loader.next != null) {
++                    loader.next = null;
++                } else {
++                    root.finished();
++                }
++            }
++        }
++
++        Binding {
++            target: loader.item
++            property: "paused"
++            value: root.paused
++        }
++    }
++
++    Component {
++        id: leftComponent
++        TutorialLeft {
++            objectName: "tutorialLeft"
++            parent: root.stages
++            anchors.fill: parent
++            launcher: root.launcher
++
++            onFinished: loader.load(leftFinishComponent)
++        }
++    }
++
++    Component {
++        id: leftFinishComponent
++        TutorialLeftFinish {
++            objectName: "tutorialLeftFinish"
++            parent: root.stages
++            anchors.fill: parent
++            textXOffset: root.launcher.panelWidth
++            backgroundFadesOut: true
++
++            onFinished: root.launcher.hide()
++        }
++    }
++}
 === added file 'qml/Tutorial/TutorialLeft.qml'
 --- qml/Tutorial/TutorialLeft.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/TutorialLeft.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,91 @@
++/*
++ * 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.3
++import Ubuntu.Components 1.1
++import "." as LocalComponents
++
++TutorialPage {
++    id: root
++
++    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
++        paused: running && root.paused
++        running: !slider.active && root.launcher.visibleWidth === 0 && root.shown
++        loops: Animation.Infinite
++
++        UbuntuNumberAnimation {
++            target: root.launcher
++            property: "x"
++            to: units.gu(2)
++            duration: UbuntuAnimation.SleepyDuration
++        }
++        UbuntuNumberAnimation {
++            target: root.launcher
++            property: "x"
++            to: 0
++            duration: UbuntuAnimation.SleepyDuration
++        }
++    }
++
++    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
++            }
++        ]
++    }
++}
 === added file 'qml/Tutorial/TutorialLeftFinish.qml'
 --- qml/Tutorial/TutorialLeftFinish.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/TutorialLeftFinish.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,47 @@
++/*
++ * 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.3
++import Ubuntu.Components 1.1
++
++TutorialPage {
++    id: root
++
++    title: i18n.tr("These are the shortcuts to favorite apps")
++    text: i18n.tr("Tap here to finish.")
++    fullTextWidth: true
++
++    foreground {
++        children: [
++            Image {
++                objectName: "tick"
++                anchors {
++                    horizontalCenter: parent.horizontalCenter
++                    top: parent.top
++                    topMargin: root.textBottom + units.gu(3)
++                }
++                source: Qt.resolvedUrl("graphics/tick.png")
++                height: units.gu(6.5)
++                width: units.gu(6.5)
++
++                MouseArea {
++                    anchors.fill: parent
++                    onClicked: root.hide()
++                }
++            }
++        ]
++    }
++}
 === added file 'qml/Tutorial/TutorialPage.qml'
 --- qml/Tutorial/TutorialPage.qml	1970-01-01 00:00:00 +0000
 +++ qml/Tutorial/TutorialPage.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,240 @@
++/*
++ * Copyright (C) 2013,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.3
++import Ubuntu.Components 1.1
++import "../Components"
++
++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 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 opacity
++    property real foregroundOpacity: 1
++
++    signal finished()
++
++    function showError() {
++        errorTimer.start();
++    }
++
++    ////
++
++    shown: false
++    Component.onCompleted: show()
++
++    property real _foregroundHideOpacity
++
++    showAnimation: StandardAnimation {
++        property: root.backgroundFadesIn ? "opacity" : "_foregroundHideOpacity"
++        from: 0
++        to: 1
++        duration: root.backgroundFadesIn ? UbuntuAnimation.SleepyDuration : UbuntuAnimation.BriskDuration
++    }
++
++    hideAnimation: StandardAnimation {
++        property: root.backgroundFadesOut ? "opacity" : "_foregroundHideOpacity"
++        to: 0
++        duration: UbuntuAnimation.BriskDuration
++        onRunningChanged: {
++            if (!running) {
++                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;
++            }
++        }
++    }
++
++    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.foregroundOpacity < 1 ? root.foregroundOpacity : root._foregroundHideOpacity
++
++        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
++                }
++            }
++        }
++    }
++}
 === added directory 'qml/Tutorial/graphics'
 === added file 'qml/Tutorial/graphics/chevron.png'
 Binary files qml/Tutorial/graphics/chevron.png	1970-01-01 00:00:00 +0000 and qml/Tutorial/graphics/chevron.png	2015-02-11 16:31:26 +0000 differ
 === added file 'qml/Tutorial/graphics/tick.png'
 Binary files qml/Tutorial/graphics/tick.png	1970-01-01 00:00:00 +0000 and qml/Tutorial/graphics/tick.png	2015-02-11 16:31:26 +0000 differ
 === renamed file 'tests/autopilot/unity8/shell/emulators/edges_demo.py' => 'tests/autopilot/unity8/shell/emulators/tutorial.py'
 --- tests/autopilot/unity8/shell/emulators/edges_demo.py	2014-12-16 16:32:40 +0000
 +++ tests/autopilot/unity8/shell/emulators/tutorial.py	2015-02-11 16:31:26 +0000
@@ -29,112 +29,26 @@
  logger = logging.getLogger(__name__)
--class RightEdgeDemoOverlay(
--        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
--
--    @classmethod
--    def validate_dbus_object(cls, path, state):
--        name = introspection.get_classname_from_path(path)
--        if name == b'EdgeDemoOverlay':
--            if state['edge'][1] == 'right':
--                return True
--        return False
--
--    @autopilot.logging.log_action(logger.info)
--    def swipe(self):
--        """Swipe to the left to complete this demo step."""
--        x, y, width, height = self.globalRect
--        start_x = x + width
--        stop_x = x
--        start_y = stop_y = y + height // 2
--        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
--        return self.get_root_instance().wait_select_single(
--            edge='top', active=True)
--
--
--class TopEdgeDemoOverlay(
--        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
--
--    @classmethod
--    def validate_dbus_object(cls, path, state):
--        name = introspection.get_classname_from_path(path)
--        if name == b'EdgeDemoOverlay':
--            if state['edge'][1] == 'top':
--                return True
--        return False
--
--    @autopilot.logging.log_action(logger.info)
--    def swipe(self):
--        """Swipe to the bottom to complete this demo step."""
--        x, y, width, height = self.globalRect
--        start_x = stop_x = x + width // 2
--        start_y = y
--        stop_y = y + height
--        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
--        return self.get_root_instance().wait_select_single(
--            edge='bottom', active=True)
--
--
--class BottomEdgeDemoOverlay(
--        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
--
--    @classmethod
--    def validate_dbus_object(cls, path, state):
--        name = introspection.get_classname_from_path(path)
--        if name == b'EdgeDemoOverlay':
--            if state['edge'][1] == 'bottom':
--                return True
--        return False
--
--    @autopilot.logging.log_action(logger.info)
--    def swipe(self):
--        """Swipe to the top to complete this demo step."""
--        x, y, width, height = self.globalRect
--        start_x = stop_x = x + width // 2
--        start_y = y + height
--        stop_y = y
--        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
--        return self.get_root_instance().wait_select_single(
--            edge='left', active=True)
--
--
--class LeftEdgeDemoOverlay(
--        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
--
--    @classmethod
--    def validate_dbus_object(cls, path, state):
--        name = introspection.get_classname_from_path(path)
--        if name == b'EdgeDemoOverlay':
--            if state['edge'][1] == 'left':
--                return True
--        return False
--
--    @autopilot.logging.log_action(logger.info)
--    def swipe(self):
--        """Swipe to the right to complete this demo step."""
++class TutorialPage(
++        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    @classmethod
++    def validate_dbus_object(cls, path, state):
++        name = introspection.get_classname_from_path(path)
++        return name == b'TutorialPage' or name == b'TutorialLeft'
++
++    @autopilot.logging.log_action(logger.info)
++    def short_swipe_right(self):
          x, y, width, height = self.globalRect
          start_x = x
--        stop_x = x + width
++        stop_x = x + width // 3
          start_y = stop_y = y + height // 2
          self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
--        return self.get_root_instance().wait_select_single(
--            edge='none', active=True)
--
--
--class FinalEdgeDemoOverlay(
--        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
--
--    @classmethod
--    def validate_dbus_object(cls, path, state):
--        name = introspection.get_classname_from_path(path)
--        if name == b'EdgeDemoOverlay':
--            if state['edge'][1] == 'none':
--                return True
--        return False
++        self.shown.wait_for(False)
      @autopilot.logging.log_action(logger.info)
--    def tap_to_start(self):
--        """Tap to finish the demo and start using the Ubuntu Touch."""
--        time.sleep(1)
--        self.pointing_device.click_object(self)
++    def tap(self):
++        """Tap the tick button to complete this step."""
++        button = self.select_single(objectName="tick")
++        self.pointing_device.click_object(button)
          self.shown.wait_for(False)
 === modified file 'tests/autopilot/unity8/shell/fixture_setup.py'
 --- tests/autopilot/unity8/shell/fixture_setup.py	2014-12-16 16:32:40 +0000
 +++ tests/autopilot/unity8/shell/fixture_setup.py	2015-02-11 16:31:26 +0000
@@ -54,7 +54,7 @@
          return ld_library_path
--class EdgesDemo(fixtures.Fixture):
++class Tutorial(fixtures.Fixture):
      def __init__(self, enable):
          super().__init__()
@@ -62,12 +62,12 @@
      def setUp(self):
          super().setUp()
--        original_state = self._is_edges_demo_enabled()
++        original_state = self._is_tutorial_enabled()
          if self.enable != original_state:
--            self.addCleanup(self._set_edges_demo, original_state)
--            self._set_edges_demo(self.enable)
++            self.addCleanup(self._set_tutorial, original_state)
++            self._set_tutorial(self.enable)
--    def _is_edges_demo_enabled(self):
++    def _is_tutorial_enabled(self):
          command = [
              'dbus-send', '--system', '--print-reply',
              '--dest=org.freedesktop.Accounts',
@@ -79,7 +79,7 @@
          output = subprocess.check_output(command, universal_newlines=True)
          return True if output.count('true') else False
--    def _set_edges_demo(self, value):
++    def _set_tutorial(self, value):
          value_string = 'true' if value else 'false'
          command = [
              'dbus-send', '--system', '--print-reply',
 === renamed file 'tests/autopilot/unity8/shell/tests/test_edges_demo.py' => 'tests/autopilot/unity8/shell/tests/test_tutorial.py'
 --- tests/autopilot/unity8/shell/tests/test_edges_demo.py	2015-01-21 13:50:14 +0000
 +++ tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-02-11 16:31:26 +0000
@@ -24,28 +24,27 @@
      fixture_setup,
      tests
+ )
--# unused import to load the edge emulators custom proxy objects.
--from unity8.shell.emulators import edges_demo  # NOQA
--
--
--class EdgesDemoTestCase(tests.UnityTestCase):
++# unused import to load the tutorial emulators custom proxy objects.
++from unity8.shell.emulators import tutorial  # NOQA
++
++
++class TutorialTestCase(tests.UnityTestCase):
      def setUp(self):
--        super(EdgesDemoTestCase, self).setUp()
++        super(TutorialTestCase, self).setUp()
          self._qml_mock_enabled = False
          self._data_dirs_mock_enabled = False
--        self.useFixture(fixture_setup.EdgesDemo(True))
++        self.useFixture(fixture_setup.Tutorial(True))
          self.unity = self.launch_unity()
--    def test_complete_edge_demo(self):
--        edge_demo = self.unity.select_single('EdgeDemo')
--        self.assertThat(edge_demo.running, Eventually(Equals(True)))
--        right_edge_overlay = self.unity.wait_select_single(
--            edge='right', active=True)
--        top_edge_overlay = right_edge_overlay.swipe()
--        bottom_edge_overlay = top_edge_overlay.swipe()
--        left_edge_overlay = bottom_edge_overlay.swipe()
--        final_overlay = left_edge_overlay.swipe()
--        final_overlay.tap_to_start()
--        self.assertThat(edge_demo.running, Eventually(Equals(False)))
++    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()
++        self.assertThat(tutorial.running, Eventually(Equals(False)))
 === modified file 'tests/mocks/Unity/Application/MirSurfaceItem.qml'
 --- tests/mocks/Unity/Application/MirSurfaceItem.qml	2014-10-01 13:20:32 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceItem.qml	2015-02-11 16:31:26 +0000
@@ -44,9 +44,24 @@
+     }
      Text {
++        text: surfaceText.text
++        color: "black"
++        font: surfaceText.font
++        fontSizeMode: Text.Fit
++        minimumPixelSize: 10
++        verticalAlignment: Text.AlignVCenter
++        x: surfaceText.x
++        y: surfaceText.y
++        width: surfaceText.width
++        height: surfaceText.height
++
++        transform: Translate { x: -2; y: -2 }
++    }
++    Text {
++        id: surfaceText
          anchors.fill: parent
          text: "SURFACE"
--        color: "yellow"
++        color: root.parent && root.parent.activeFocus ? "yellow" : "blue"
          font.bold: true
          fontSizeMode: Text.Fit
          minimumPixelSize: 10; font.pixelSize: 200
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2015-01-22 11:56:24 +0000
 +++ tests/qmltests/CMakeLists.txt	2015-02-11 16:31:26 +0000
@@ -25,7 +25,6 @@
  add_qml_test(Components Carousel)
  add_qml_test(Components Dialogs)
  add_qml_test(Components DraggingArea)
--add_qml_test(Components EdgeDemoOverlay)
  add_qml_test(Components LazyImage)
  add_qml_test(Components Lockscreen)
  add_qml_test(Components Rating)
@@ -88,6 +87,8 @@
  add_qml_test(Stages SpreadDelegate ENVIRONMENT)
  add_qml_test(Stages SurfaceContainer ENVIRONMENT)
  add_qml_test(Stages SessionContainer ENVIRONMENT)
++add_qml_test(Stages TabletStage)
  add_qml_test(Stages WindowMoveResizeArea)
  add_qml_test(Stages Splash)
++add_qml_test(Tutorial Tutorial)
  add_qml_test(Wizard Wizard)
 === removed file 'tests/qmltests/Components/tst_EdgeDemoOverlay.qml'
 --- tests/qmltests/Components/tst_EdgeDemoOverlay.qml	2013-12-17 16:04:47 +0000
 +++ tests/qmltests/Components/tst_EdgeDemoOverlay.qml	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
--/*
-- * Copyright 2013 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.0
--import QtTest 1.0
--import Unity.Test 0.1 as UT
--import "../../../qml/Components"
--
--Item {
--    id: root
--    width: boxWidth * 3
--    height: boxHeight * 2
--
--    property int boxWidth: 250
--    property int boxHeight: 250
--
--    EdgeDemoOverlay {
--        id: top
--        edge: "top"
--        title: "Top"
--        text: "Displayed on top left"
--        anchors.left: parent.left
--        anchors.top: parent.top
--        width: boxWidth
--        height: boxHeight
--    }
--
--    EdgeDemoOverlay {
--        id: right
--        edge: "right"
--        title: "Right"
--        text: "Displayed on top right"
--        anchors.right: parent.right
--        anchors.top: parent.top
--        width: boxWidth
--        height: boxHeight
--    }
--
--    EdgeDemoOverlay {
--        id: left
--        edge: "left"
--        title: "Left"
--        text: "Displayed on bottom right"
--        anchors.right: parent.right
--        anchors.bottom: parent.bottom
--        width: boxWidth
--        height: boxHeight
--        available: false
--    }
--
--    EdgeDemoOverlay {
--        id: bottom
--        edge: "bottom"
--        title: "Bottom"
--        text: "Displayed on bottom left"
--        anchors.left: parent.left
--        anchors.bottom: parent.bottom
--        width: boxWidth
--        height: boxHeight
--    }
--
--    EdgeDemoOverlay {
--        id: none
--        edge: "none"
--        title: "None"
--        text: "Displayed on top middle"
--        anchors.horizontalCenter: parent.horizontalCenter
--        anchors.top: parent.top
--        width: boxWidth
--        height: boxHeight
--    }
--
--    SignalSpy {
--        id: signalSpy
--    }
--
--    UT.UnityTestCase {
--        name: "EdgeDemoOverlay"
--        when: windowShown
--
--        function test_animations() {
--            compare(right.running, true)
--
--            compare(left.running, false)
--            left.available = true
--            compare(left.running, true)
--        }
--
--        function test_skip() {
--            signalSpy.target = bottom
--            signalSpy.signalName = "skip"
--            signalSpy.clear()
--            var bottomSkip = findChild(bottom, "skipLabel")
--            mousePress(bottomSkip, 1, 1)
--            mouseRelease(bottomSkip, 1, 1)
--            signalSpy.wait()
--            compare(bottom.available, false)
--
--            // Test that the 'none' edge skips anywhere
--            signalSpy.target = none
--            signalSpy.clear()
--            var backgroundShade = findChild(none, "backgroundShadeMouseArea")
--            tryCompare(backgroundShade, "enabled", true)
--            mousePress(backgroundShade, 1, 1)
--            mouseRelease(backgroundShade, 1, 1)
--            signalSpy.wait()
--            compare(none.available, false)
--        }
--    }
--}
 === added file 'tests/qmltests/Stages/ApplicationCheckBox.qml'
 --- tests/qmltests/Stages/ApplicationCheckBox.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Stages/ApplicationCheckBox.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,45 @@
++/*
++ * 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.0
++import QtQuick.Layouts 1.1
++import Ubuntu.Components 1.1
++import Unity.Application 0.1
++
++RowLayout {
++    id: root
++    property string appId
++    property alias checked: checkbox.checked
++
++    Layout.fillWidth: true
++    CheckBox {
++        id: checkbox
++        checked: false
++        activeFocusOnPress: false
++        onCheckedChanged: {
++            if (checked) {
++                ApplicationManager.startApplication(root.appId);
++            } else {
++                ApplicationManager.stopApplication(root.appId);
++            }
++        }
++    }
++    Label {
++        text: root.appId
++        color: "white"
++        anchors.verticalCenter: parent.verticalCenter
++    }
++}
 === modified file 'tests/qmltests/Stages/RecursingChildSessionControl.qml'
 --- tests/qmltests/Stages/RecursingChildSessionControl.qml	2014-09-10 16:06:05 +0000
 +++ tests/qmltests/Stages/RecursingChildSessionControl.qml	2015-02-11 16:31:26 +0000
@@ -89,6 +89,7 @@
              CheckBox {
                  id: _surfaceCheckbox;
                  checked: false;
++                activeFocusOnPress: false
                  enabled: root.session
                  onCheckedChanged: {
                      if (checked) {
@@ -117,6 +118,7 @@
              Button {
                  enabled: root.session
++                activeFocusOnPress: false
                  text: removable ? "Remove" : "Release"
                  onClicked: {
                      if (removable) {
@@ -131,6 +133,7 @@
              Button {
                  enabled: root.session !== null
++                activeFocusOnPress: false
                  text: "Add Child"
                  onClicked: {
                      var screenshot = Math.round(Math.random()*100 % (screenshotIds.length-1));
 === modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
 --- tests/qmltests/Stages/tst_ApplicationWindow.qml	2014-10-01 18:16:04 +0000
 +++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-02-11 16:31:26 +0000
@@ -52,10 +52,12 @@
              application: fakeApplication
              orientation: Qt.PortraitOrientation
              interactive: true
++            focus: true
+         }
+     }
      Loader {
          id: applicationWindowLoader
++        focus: true
          anchors {
              top: parent.top
              bottom: parent.bottom
@@ -83,6 +85,7 @@
                  CheckBox {
                      id: sessionCheckbox; checked: false
++                    activeFocusOnPress: false
                      onCheckedChanged: {
                          if (applicationWindowLoader.status !== Loader.Ready)
                              return;
@@ -121,6 +124,7 @@
              ListItem.ItemSelector {
                  id: appStateSelector
++                activeFocusOnPress: false
                  anchors { left: parent.left; right: parent.right }
                  text: "Application state"
                  model: ["Starting",
@@ -146,6 +150,7 @@
              Button {
                  anchors { left: parent.left; right: parent.right }
++                activeFocusOnPress: false
                  text: "Rotate device \u27F3"
                  onClicked: {
                      var orientation = applicationWindowLoader.item.orientation
@@ -398,7 +403,7 @@
              verify(stateGroup.state === "void");
+         }
--        function test_forceActiveFocusFollowsInterative() {
++        function test_surfaceActiveFocusFollowsAppWindowInterative() {
              fakeApplication.createSession();
              applicationWindowLoader.item.interactive = false;
              applicationWindowLoader.item.interactive = true;
 === modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
 --- tests/qmltests/Stages/tst_PhoneStage.qml	2015-01-12 11:21:17 +0000
 +++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-02-11 16:31:26 +0000
@@ -29,6 +29,7 @@
      PhoneStage {
          id: phoneStage
          anchors { fill: parent; rightMargin: units.gu(30) }
++        focus: true
          dragAreaWidth: units.gu(2)
          maximizedAppTopMargin: units.gu(3) + units.dp(2)
          interactive: true
@@ -51,6 +52,7 @@
              Button {
                  anchors { left: parent.left; right: parent.right }
                  text: "Add App"
++                activeFocusOnPress: false
                  onClicked: {
                      testCase.addApps();
+                 }
@@ -58,6 +60,7 @@
              Button {
                  anchors { left: parent.left; right: parent.right }
                  text: "Remove Selected"
++                activeFocusOnPress: false
                  onClicked: {
                      ApplicationManager.stopApplication(ApplicationManager.get(appList.selectedAppIndex).appId);
+                 }
@@ -65,6 +68,7 @@
              Button {
                  anchors { left: parent.left; right: parent.right }
                  text: "Stop Selected"
++                activeFocusOnPress: false
                  onClicked: {
                      ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfoInterface.Stopped);
+                 }
 === modified file 'tests/qmltests/Stages/tst_SessionContainer.qml'
 --- tests/qmltests/Stages/tst_SessionContainer.qml	2014-10-24 14:31:29 +0000
 +++ tests/qmltests/Stages/tst_SessionContainer.qml	2015-02-11 16:31:26 +0000
@@ -42,11 +42,14 @@
              id: sessionContainer
              anchors.fill: parent
              orientation: Qt.PortraitOrientation
++            focus: true
++            interactive: true
+         }
+     }
      Loader {
          id: sessionContainerLoader
++        focus: true
          anchors {
              top: parent.top
              bottom: parent.bottom
@@ -75,6 +78,7 @@
                  CheckBox {
                      id: sessionCheckbox;
                      checked: false;
++                    activeFocusOnPress: false
                      onCheckedChanged: {
                          if (sessionContainerLoader.status !== Loader.Ready)
                              return;
@@ -190,8 +194,6 @@
              var sessionContainer = sessionContainerLoader.item;
              compare(sessionContainer.childSessions.count(), 0);
--            sessionContainer.interactive = true;
--
              var i;
              var sessions = [];
              // 3 sessions should cover all edge cases
@@ -209,14 +211,19 @@
              var a_session;
              while(a_session = sessions.pop()) {
--                a_session.surface.forceActiveFocus();
                  compare(a_session.surface.activeFocus, true);
--                var parentSession = a_session.parentSession;
--                sessionContainer.session.removeChildSession(a_session);
--                compare(a_session.surface.activeFocus, false);
++                ApplicationTest.removeSurface(a_session.surface);
++                ApplicationTest.removeSession(a_session);
--                compare(parentSession.surface.activeFocus, true);
++                if (sessions.length > 0) {
++                    // active focus should have gone to the yongest remaining sibling
++                    var previousSiblingSurface = sessions[sessions.length - 1].surface
++                    tryCompare(previousSiblingSurface, "activeFocus", true);
++                } else {
++                    // active focus should have gone to the parent surface
++                    tryCompare(sessionContainer.session.surface, "activeFocus", true);
++                }
+             }
+         }
 === added file 'tests/qmltests/Stages/tst_TabletStage.qml'
 --- tests/qmltests/Stages/tst_TabletStage.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Stages/tst_TabletStage.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,154 @@
++/*
++ * 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.0
++import QtTest 1.0
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 1.0 as ListItem
++import Unity.Application 0.1
++import Unity.Test 0.1
++
++import "../../../qml/Stages"
++
++Rectangle {
++    id: root
++    color: "grey"
++    width:  tabletStageLoader.width + controls.width
++    height: tabletStageLoader.height
++
++    Loader {
++        id: tabletStageLoader
++
++        x: ((root.width - controls.width) - width) / 2
++        y: (root.height - height) / 2
++        width: units.gu(160*0.7)
++        height: units.gu(100*0.7)
++
++        focus: true
++
++        property bool itemDestroyed: false
++        sourceComponent: Component {
++            TabletStage {
++                anchors.fill: parent
++                Component.onDestruction: {
++                    tabletStageLoader.itemDestroyed = true;
++                }
++                dragAreaWidth: units.gu(2)
++                maximizedAppTopMargin: units.gu(3) + units.dp(2)
++                interactive: true
++                focus: true
++            }
++        }
++    }
++
++    Rectangle {
++        id: controls
++        color: "darkgrey"
++        width: units.gu(30)
++        anchors {
++            top: parent.top
++            bottom: parent.bottom
++            right: parent.right
++        }
++
++        Column {
++            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
++            spacing: units.gu(1)
++            ApplicationCheckBox {
++                id: webbrowserCheckBox
++                appId: "webbrowser-app"
++            }
++            ApplicationCheckBox {
++                id: dialerCheckBox
++                appId: "dialer-app"
++            }
++        }
++    }
++
++    UnityTestCase {
++        id: testCase
++        name: "TabletStage"
++        when: windowShown
++
++        property Item tabletStage: tabletStageLoader.status === Loader.Ready ? tabletStageLoader.item : null
++
++        function init() {
++            tabletStageLoader.active = true;
++            tryCompare(tabletStageLoader, "status", Loader.Ready);
++        }
++
++        function cleanup() {
++            tabletStageLoader.itemDestroyed = false;
++            tabletStageLoader.active = false;
++
++            tryCompare(tabletStageLoader, "status", Loader.Null);
++            tryCompare(tabletStageLoader, "item", null);
++            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
++            // actually took place. Likely because Loader waits until the next event loop
++            // iteration to do its work. So to ensure the reload, we will wait until the
++            // Shell instance gets destroyed.
++            tryCompare(tabletStageLoader, "itemDestroyed", true);
++
++            // kill all (fake) running apps
++            webbrowserCheckBox.checked = false;
++            dialerCheckBox.checked = false;
++        }
++
++        function waitUntilAppSurfaceShowsUp(appId) {
++            var appWindow = findChild(tabletStage, "appWindow_" + appId);
++            verify(appWindow);
++            var appWindowStates = findInvisibleChild(appWindow, "applicationWindowStateGroup");
++            verify(appWindowStates);
++            tryCompare(appWindowStates, "state", "surface");
++        }
++
++        function test_tappingSwitchesFocusBetweenStages() {
++            webbrowserCheckBox.checked = true;
++            waitUntilAppSurfaceShowsUp(webbrowserCheckBox.appId);
++            var webbrowserApp = ApplicationManager.findApplication(webbrowserCheckBox.appId);
++            compare(webbrowserApp.stage, ApplicationInfoInterface.MainStage);
++            tryCompare(webbrowserApp.session.surface, "activeFocus", true);
++
++            dialerCheckBox.checked = true;
++            waitUntilAppSurfaceShowsUp(dialerCheckBox.appId);
++            var dialerApp = ApplicationManager.findApplication(dialerCheckBox.appId);
++            compare(dialerApp.stage, ApplicationInfoInterface.SideStage);
++            tryCompare(dialerApp.session.surface, "activeFocus", true);
++            tryCompare(webbrowserApp.session.surface, "activeFocus", false);
++
++            // Tap on the main stage application and check if the focus
++            // has been passed to it.
++
++            var webbrowserWindow = findChild(tabletStage, "appWindow_" + webbrowserApp.appId);
++            verify(webbrowserWindow);
++            tap(webbrowserWindow);
++
++            tryCompare(dialerApp.session.surface, "activeFocus", false);
++            tryCompare(webbrowserApp.session.surface, "activeFocus", true);
++
++            // Now tap on the side stage application and check if the focus
++            // has been passed back to it.
++
++            var dialerWindow = findChild(tabletStage, "appWindow_" + dialerApp.appId);
++            verify(dialerWindow);
++            tap(dialerWindow);
++
++            tryCompare(dialerApp.session.surface, "activeFocus", true);
++            tryCompare(webbrowserApp.session.surface, "activeFocus", false);
++        }
++    }
++
++}
 === added directory 'tests/qmltests/Tutorial'
 === added file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
 --- tests/qmltests/Tutorial/tst_Tutorial.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-02-11 16:31:26 +0000
@@ -0,0 +1,286 @@
++/*
++ * Copyright (C) 2013,2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import QtTest 1.0
++import AccountsService 0.1
++import LightDM 0.1 as LightDM
++import Ubuntu.Components 1.1
++import Unity.Application 0.1
++import Unity.Test 0.1 as UT
++
++import "../../../qml"
++
++Item {
++    id: root
++    width: shellLoader.width + buttons.width
++    height: shellLoader.height
++
++    QtObject {
++        id: applicationArguments
++
++        function hasGeometry() {
++            return false;
++        }
++
++        function width() {
++            return 0;
++        }
++
++        function height() {
++            return 0;
++        }
++    }
++
++    Component.onCompleted: {
++        // must set the mock mode before loading the Shell
++        LightDM.Greeter.mockMode = "single-pin";
++        LightDM.Users.mockMode = "single-pin";
++        shellLoader.active = true;
++    }
++
++    Row {
++        spacing: 0
++        anchors.fill: parent
++
++        Loader {
++            id: shellLoader
++
++            active: false
++            width: units.gu(40)
++            height: units.gu(71)
++
++            property bool itemDestroyed: false
++            sourceComponent: Component {
++                Shell {
++                    property string indicatorProfile: "phone"
++
++                    Component.onDestruction: {
++                        shellLoader.itemDestroyed = true;
++                    }
++                }
++            }
++        }
++
++        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;
++                        }
++                    }
++                }
++            }
++        }
++    }
++
++    UT.UnityTestCase {
++        id: testCase
++        name: "Tutorial"
++        when: windowShown
++
++        property Item shell: shellLoader.status === Loader.Ready ? shellLoader.item : null
++        property real halfWidth: shell ?  shell.width / 2 : 0
++        property real halfHeight: shell ? shell.height / 2 : 0
++
++        function init() {
++            tryCompare(shell, "enabled", true); // enabled by greeter when ready
++            swipeAwayGreeter();
++            AccountsService.demoEdges = false;
++            AccountsService.demoEdges = true;
++        }
++
++        function cleanup() {
++            shellLoader.itemDestroyed = false;
++
++            shellLoader.active = false;
++
++            tryCompare(shellLoader, "status", Loader.Null);
++            tryCompare(shellLoader, "item", null);
++            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
++            // item might still be alive. So if we set Loader.active back to true
++            // again right now we will get the very same Shell instance back. So no reload
++            // actually took place. Likely because Loader waits until the next event loop
++            // iteration to do its work. So to ensure the reload, we will wait until the
++            // Shell instance gets destroyed.
++            tryCompare(shellLoader, "itemDestroyed", true);
++
++            // kill all (fake) running apps
++            killApps();
++
++            // reload our test subject to get it in a fresh state once again
++            shellLoader.active = true;
++
++            tryCompare(shellLoader, "status", Loader.Ready);
++            removeTimeConstraintsFromDirectionalDragAreas(shellLoader.item);
++        }
++
++        function killApps() {
++            while (ApplicationManager.count > 1) {
++                var appIndex = ApplicationManager.get(0).appId == "unity8-dash" ? 1 : 0
++                ApplicationManager.stopApplication(ApplicationManager.get(appIndex).appId);
++            }
++            compare(ApplicationManager.count, 1)
++        }
++
++        function swipeAwayGreeter() {
++            var greeter = findChild(shell, "greeter");
++            tryCompare(greeter, "showProgress", 1);
++
++            touchFlick(shell, halfWidth, halfHeight, shell.width, halfHeight);
++
++            // wait until the animation has finished
++            tryCompare(greeter, "showProgress", 0);
++            waitForRendering(greeter);
++        }
++
++        function waitForPage(name) {
++            tryCompareFunction(function() { return findChild(shell, name) !== null; }, true);
++            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);
++
++            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() {
++            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.item, "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);
++
++            checkFinished();
++            return null;
++        }
++
++        function test_walkthrough() {
++            goToPage(null);
++        }
++
++        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");
++
++            // 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
++
++            // Now drag out but not past launcher itself
++            touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.9, halfHeight);
++
++            waitForPage("tutorialLeftFinish");
++        }
++
++        function test_launcherLongDrag() {
++            // goToPage does a normal launcher pull.  But here we want to test
++            // a full pull across the page.
++
++            var left = goToPage("tutorialLeft");
++
++            var launcher = findChild(shell, "launcher");
++            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_interrupted() {
++            goToPage("tutorialLeft");
++            ApplicationManager.startApplication("dialer-app");
++            checkFinished();
++        }
++    }
++}
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-01-20 11:50:19 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-02-11 16:31:26 +0000
@@ -63,6 +63,8 @@
          anchors.fill: parent
          Loader {
              id: shellLoader
++            focus: true
++
              active: false
              property bool itemDestroyed: false
              sourceComponent: Component {
@@ -88,6 +90,7 @@
                      anchors { left: parent.left; right: parent.right }
                      Button {
                          text: "Show Greeter"
++                        activeFocusOnPress: false
                          onClicked: {
                              if (shellLoader.status !== Loader.Ready)
                                  return;
@@ -434,11 +437,11 @@
              waitUntilTransitionsEnd(appWindowStateGroup);
+         }
--        function test_surfaceLosesFocusWhilePanelIsOpen() {
++        function test_surfaceLosesActiveFocusWhilePanelIsOpen() {
              var app = ApplicationManager.startApplication("dialer-app");
              waitUntilAppWindowIsFullyLoaded(app);
--            tryCompare(app.session.surface, "focus", true);
++            tryCompare(app.session.surface, "activeFocus", true);
              // Drag the indicators panel half-open
              var touchX = shell.width / 2;
@@ -449,7 +452,7 @@
                      true /* beginTouch */, false /* endTouch */);
              verify(indicators.partiallyOpened);
--            tryCompare(app.session.surface, "focus", false);
++            tryCompare(app.session.surface, "activeFocus", false);
              // And finish getting it open
              touchFlick(indicators,
@@ -458,11 +461,21 @@
                      false /* beginTouch */, true /* endTouch */);
              tryCompare(indicators, "fullyOpened", true);
--            tryCompare(app.session.surface, "focus", false);
++            tryCompare(app.session.surface, "activeFocus", false);
              dragToCloseIndicatorsPanel();
--            tryCompare(app.session.surface, "focus", true);
++            tryCompare(app.session.surface, "activeFocus", true);
++        }
++
++        function test_launchedAppHasActiveFocus() {
++            var dialerApp = ApplicationManager.startApplication("dialer-app");
++            verify(dialerApp);
++            waitUntilAppSurfaceShowsUp("dialer-app")
++
++            verify(dialerApp.session.surface);
++
++            tryCompare(dialerApp.session.surface, "activeFocus", true);
+         }
          // Wait for the whole UI to settle down
@@ -477,6 +490,14 @@
              waitForRendering(shell)
+         }
++        function waitUntilAppSurfaceShowsUp(appId) {
++            var appWindow = findChild(shell, "appWindow_" + appId);
++            verify(appWindow);
++            var appWindowStates = findInvisibleChild(appWindow, "applicationWindowStateGroup");
++            verify(appWindowStates);
++            tryCompare(appWindowStates, "state", "surface");
++        }
++
          function dragToCloseIndicatorsPanel() {
              var indicators = findChild(shell, "indicators");
 === modified file 'tests/qmltests/tst_TabletShell.qml'
 --- tests/qmltests/tst_TabletShell.qml	2015-01-20 11:50:19 +0000
 +++ tests/qmltests/tst_TabletShell.qml	2015-02-11 16:31:26 +0000
@@ -303,8 +303,8 @@
              selectUser(data.user)
              AccountsService.demoEdges = data.demo
--            var edgeDemo = findChild(shell, "edgeDemo")
--            tryCompare(edgeDemo, "running", 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
 === added file 'tests/uqmlscene/ActiveFocusLogger.cpp'
 --- tests/uqmlscene/ActiveFocusLogger.cpp	1970-01-01 00:00:00 +0000
 +++ tests/uqmlscene/ActiveFocusLogger.cpp	2015-02-11 16:31:26 +0000
@@ -0,0 +1,48 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "ActiveFocusLogger.h"
++
++#include <QDebug>
++#include <QQuickItem>
++
++void ActiveFocusLogger::setWindow(QQuickWindow *window)
++{
++    m_window = window;
++    QObject::connect(window, &QQuickWindow::activeFocusItemChanged,
++            this, &ActiveFocusLogger::printActiveFocusInfo);
++}
++
++void ActiveFocusLogger::printActiveFocusInfo()
++{
++    if (!m_window) {
++        return;
++    }
++
++    qDebug() << "============== Active focus info START ================";
++    if (m_window->activeFocusItem()) {
++        qDebug() << m_window->activeFocusItem();
++        qDebug() << "Ancestry:";
++        QQuickItem *item = m_window->activeFocusItem()->parentItem();
++        while (item != nullptr) {
++            qDebug() << item << ", isFocusScope =" << item->isFocusScope();
++            item = item->parentItem();
++        }
++    } else {
++        qDebug() << "NULL";
++    }
++    qDebug() << "============== Active focus info END ================";
++}
 === added file 'tests/uqmlscene/ActiveFocusLogger.h'
 --- tests/uqmlscene/ActiveFocusLogger.h	1970-01-01 00:00:00 +0000
 +++ tests/uqmlscene/ActiveFocusLogger.h	2015-02-11 16:31:26 +0000
@@ -0,0 +1,37 @@
++/*
++ * 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/>.
++ */
++
++#ifndef ACTIVE_FOCUS_LOGGER_H
++#define ACTIVE_FOCUS_LOGGER_H
++
++#include <QObject>
++#include <QQuickWindow>
++#include <QPointer>
++
++class ActiveFocusLogger : public QObject {
++    Q_OBJECT
++
++public:
++    void setWindow(QQuickWindow *window);
++
++private Q_SLOTS:
++    void printActiveFocusInfo();
++
++private:
++    QPointer<QQuickWindow> m_window;
++};
++
++#endif // ACTIVE_FOCUS_LOGGER_H
 === modified file 'tests/uqmlscene/CMakeLists.txt'
 --- tests/uqmlscene/CMakeLists.txt	2014-10-01 13:20:32 +0000
 +++ tests/uqmlscene/CMakeLists.txt	2015-02-11 16:31:26 +0000
@@ -1,5 +1,6 @@
  add_executable(uqmlscene
      ${shellapplication_MOC_SRCS}
++    ActiveFocusLogger.cpp
      main.cpp
      ${CMAKE_SOURCE_DIR}/src/MouseTouchAdaptor.cpp
+     )
 === modified file 'tests/uqmlscene/main.cpp'
 --- tests/uqmlscene/main.cpp	2014-10-17 14:22:40 +0000
 +++ tests/uqmlscene/main.cpp	2015-02-11 16:31:26 +0000
@@ -68,6 +68,12 @@
  // UbuntuGestures lib
  #include <TouchRegistry.h>
++#define UQMLSCENE_DEBUG_ACTIVE_FOCUS 0
++
++#if UQMLSCENE_DEBUG_ACTIVE_FOCUS
++  #include "ActiveFocusLogger.h"
++#endif
++
  #ifdef QML_RUNTIME_TESTING
  class RenderStatistics
+ {
@@ -378,6 +384,10 @@
+ {
      Options options;
++    #if UQMLSCENE_DEBUG_ACTIVE_FOCUS
++    ActiveFocusLogger activeFocusLogger;
++    #endif
++
      QStringList imports;
      QList<QPair<QString, QString> > bundles;
      for (int i = 1; i < argc; ++i) {
@@ -503,6 +513,9 @@
                  QQuickItem *contentItem = qobject_cast<QQuickItem *>(topLevel);
                  if (contentItem) {
                      qxView = new QQuickView(&engine, nullptr);
++                    #if UQMLSCENE_DEBUG_ACTIVE_FOCUS
++                    activeFocusLogger.setWindow(qxView);
++                    #endif
                      TouchRegistry::instance()->setParent(qxView);
                      qxView->installEventFilter(TouchRegistry::instance());
                      window = qxView;