Unity 8

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

tutorial-fixups
Merge into trunk

Proposed by Michael Terry on 2016-04-28

Status:

Merged

Approved by:

Daniel d'Andrada on 2016-05-20

Approved revision:

2365

Merged at revision:

2445

Proposed branch:

lp:~mterry/unity8/tutorial-fixups

Merge into:

lp:unity8

Diff against target:

1339 lines (+289/-512)

14 files modified

qml/Components/Dialogs.qml (+3/-1)
qml/Notifications/Notifications.qml (+1/-0)
qml/Shell.qml (+12/-8)
qml/Tutorial/InactivityTimer.qml (+32/-16)
qml/Tutorial/Tutorial.qml (+7/-6)
qml/Tutorial/TutorialBottom.qml (+0/-124)
qml/Tutorial/TutorialContent.qml (+58/-141)
qml/Tutorial/TutorialLeft.qml (+2/-2)
qml/Tutorial/TutorialLeftLong.qml (+3/-1)
qml/Tutorial/TutorialPage.qml (+2/-2)
qml/Tutorial/TutorialRight.qml (+2/-2)
qml/Tutorial/TutorialTop.qml (+2/-3)
tests/qmltests/Tutorial/tst_Tutorial.qml (+165/-196)
tests/qmltests/tst_Shell.qml (+0/-10)

To merge this branch:

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

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-06-05
Daniel d'Andrada (community)		2016-04-28	Approve on 2016-05-20
Review via email: mp+293262@code.launchpad.net

Commit Message

Drop bottom edge tutorials completely and small fixes for other edges.

A bundle of fixes requested by Design, after living with the new tutorial for a while:

- Drop bottom edges completely. The existing in-app hints are enough, and we want to grow them rather than do it from shell. Plus they make the user interaction logic too complicated.

- Don't show any tutorials if a notification, dialog, or spread is already open.

- Left swipe:
* Delay for 20s (instead of immediately being shown)
* Specify "short" in text

- Top swipe:
* Delay for 60s (instead of 30s)
* Use "access to notifications and quick settings" (instead of "open notification bar")

- Long left swipe:
  * Delay for 10s (instead of 5s) -- need to confirm with Design
  * Move to after top swipe tutorial
  * Only show if a non-dash app is focused
  * Disable long left swipe in shell until this tutorial is shown

- Right swipe:
  * Delay for 10s (instead of 3s)
  * Require 3 apps to be open (instead of 2)
  * Remove "short or long" from text

Description of the Change

* 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

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

* If you changed the UI, has there been a design review?
Yup, Paty is good with this (r2367)

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

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-05-19:

In qml/Tutorial/Tutorial.qml

"""
property bool paused // hide any existing tutorial and don't show new ones
property bool delayed // don't show new tutorials
"""

Looks like those two overlap or conflict a bit. Do all combinations make sense (paused && !delayed, paused && delayed, etc)?

Would it make more sense to combine those two (or more, like maybe even active) into a state or enumeration-like property?

- running (current active==true)
- paused (current active & paused)
- delayed (current active & delayed)
- off (current !active)

Also how does paused relate with the property below?

"""
readonly property bool running: loader.item ? loader.item.running : false
"""

Can it can be paused and running at the same time?

review: Needs Information

Daniel d'Andrada (dandrader) wrote on 2016-05-19:

Getting 8 failures and lots of binding loop warnings in tst_Tutorial.

http://pastebin.ubuntu.com/16508103/

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2016-05-19:

Did some basic testing on my mako. Works fine.

Daniel d'Andrada (dandrader) wrote on 2016-05-19:

Please update copyright headers (years) of:
qml/Components/Dialogs.qml
qml/Tutorial/InactivityTimer.qml
qml/Tutorial/Tutorial.qml
qml/Tutorial/TutorialContent.qml
qml/Tutorial/TutorialLeft.qml
qml/Tutorial/TutorialPage.qml
qml/Tutorial/TutorialRight.qml
qml/Tutorial/TutorialTop.qml
tests/qmltests/Tutorial/tst_Tutorial.qml

lp:~mterry/unity8/tutorial-fixups updated on 2016-05-19

2361. By Michael Terry on 2016-05-19: Merge from trunk
2362. By Michael Terry on 2016-05-19: Bump copyright years
2363. By Michael Terry on 2016-05-19: Fix tutorial tests

Michael Terry (mterry) wrote on 2016-05-19:

Yes, there's a good deal of overlap between paused and delayed. Basically paused is "super-delayed". It both delays and immediately stops any currently running tutorial. So just a more urgent delayed.

All combinations are fine and logical. But I agree that an enum would make more sense maybe. Unfortunately, qml best handles enums only if they're defined in C++ first. Otherwise, what? Strings? Kind of annoying.

I could also see changing it to a function call like stopAnyCurrentTutorial() and then setting delayed. But that's less stateful/declarative.

As for "running" -- that indicates if any tutorial is currently being shown (vs the tutorial in general being active, but just between tutorial pages).

I fixed the tests and the copyrights.

Thanks!

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

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-fixups updated on 2016-05-20

2364. By Michael Terry on 2016-05-20: Fix shell test; don't disable tutorial if we receive a call during the wizard
2365. By Michael Terry on 2016-05-20: Make a test more robust

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-20:

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-05-20:

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

* Did CI run pass? If not, please explain why.
No. Some unrelated failures.

review: Approve

lp:~mterry/unity8/tutorial-fixups updated on 2016-06-02

2366. By Michael Terry on 2016-06-01: Merge from trunk
2367. By Michael Terry on 2016-06-02: And also don't start tutorial timers until the wizard is done

Michael Terry (mterry) wrote on 2016-06-02:

I've merged from trunk and made one tiny change -- we don't start tutorial timers until the wizard has finished. This means that the left edge tutorial waits the proper 20s after the wizard is done. I tested too often without bothering to re-enable the wizard. :P

Paty looked at this and said it's good. So all approved.

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

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-05:

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

review: Approve (continuous-integration)

lp:~mterry/unity8/tutorial-fixups updated on 2016-06-10

2368. By Michael Terry on 2016-06-10: Merge from trunk

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Components/Dialogs.qml'
 --- qml/Components/Dialogs.qml	2016-05-17 20:46:51 +0000
 +++ qml/Components/Dialogs.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014-2015 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@
  Item {
      id: root
++    readonly property alias hasActiveDialog: dialogLoader.active
++
      // to be set from outside, useful mostly for testing purposes
      property var unitySessionService: DBusUnitySessionService
      property var closeAllApps: function() {
 === modified file 'qml/Notifications/Notifications.qml'
 --- qml/Notifications/Notifications.qml	2016-05-18 18:14:19 +0000
 +++ qml/Notifications/Notifications.qml	2016-06-10 14:15:49 +0000
@@ -26,6 +26,7 @@
      objectName: "notificationList"
      interactive: false
++    readonly property bool hasNotification: count > 1 // placeholder is index 0
      property real margin
      property bool hasMouse
      property url background: ""
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-05-27 13:54:26 +0000
 +++ qml/Shell.qml	2016-06-10 14:15:49 +0000
@@ -116,10 +116,9 @@
+     }
      function _onMainAppChanged(appId) {
          if (wizard.active && appId != "" && appId != "unity8-dash") {
--            // If this happens on first boot, we may be in edge
--            // tutorial or wizard while receiving a call.  But a call
--            // is more important than wizard so just bail out of those.
--            tutorial.finish();
++            // If this happens on first boot, we may be in the
++            // wizard while receiving a call.  But a call is more
++            // important than the wizard so just bail out of it.
              wizard.hide();
+         }
@@ -320,7 +319,7 @@
              Binding {
                  target: applicationsDisplayLoader.item
                  property: "inverseProgress"
--                value: greeter && greeter.locked ? 0 : launcher.progress
++                value: !greeter || greeter.locked || !tutorial.launcherLongSwipeEnabled ? 0 : launcher.progress
+             }
              Binding {
                  target: applicationsDisplayLoader.item
@@ -504,7 +503,8 @@
              launcher.fadeOut();
+         }
--        if (!greeter.locked && ApplicationManager.focusedApplicationId != "unity8-dash") {
++        if (!greeter.locked && tutorial.launcherLongSwipeEnabled
++            && ApplicationManager.focusedApplicationId != "unity8-dash") {
              ApplicationManager.requestFocusApplication("unity8-dash")
              launcher.fadeOut();
+         }
@@ -623,8 +623,12 @@
              objectName: "tutorial"
              anchors.fill: parent
--            paused: callManager.hasCalls || greeter.shown
--            keyboardVisible: inputMethod.state === "shown"
++            paused: callManager.hasCalls || !greeter || greeter.shown ||
++                    wizard.active
++            delayed: dialogs.hasActiveDialog || notifications.hasNotification ||
++                     inputMethod.state === "shown" ||
++                     (launcher.shown && !launcher.lockedVisible) ||
++                     panel.indicators.shown || stage.dragProgress > 0
              usageScenario: shell.usageScenario
              lastInputTimestamp: inputFilter.lastInputTimestamp
              launcher: launcher
 === modified file 'qml/Tutorial/InactivityTimer.qml'
 --- qml/Tutorial/InactivityTimer.qml	2015-11-18 17:08:57 +0000
 +++ qml/Tutorial/InactivityTimer.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -18,36 +18,52 @@
  import Ubuntu.Components 1.3
  Item {
--    readonly property alias running: internalTimer.running
--    property alias interval: internalTimer.interval
++    id: root
++
++    readonly property bool running: delayTimer.running || inactivityTimer.running
++    property int interval: 3000
      property var page
      property int lastInputTimestamp
      function start() {
--        internalTimer.start();
++        if (!delayTimer.running && !inactivityTimer.running) {
++            delayTimer.start();
++        }
+     }
      ////
      onLastInputTimestampChanged: {
--        if (internalTimer.running) {
--            internalTimer.restart();
++        if (inactivityTimer.running) {
++            inactivityTimer.restart();
+         }
+     }
      Connections {
          target: page
          onIsReadyChanged: {
--            if (page.isReady && internalTimer.running) {
--                internalTimer.restart();
--            }
--        }
--    }
--
--    Timer {
--        id: internalTimer
--
--        interval: 3000
++            if (page.isReady && inactivityTimer.running) {
++                inactivityTimer.restart();
++            }
++        }
++        onPausedChanged: {
++            if (root.paused) {
++                delayTimer.stop();
++                inactivityTimer.stop();
++            }
++        }
++    }
++
++    Timer {
++        id: delayTimer
++        interval: Math.max(root.interval - 3000, 0)
++        onTriggered: inactivityTimer.start()
++    }
++
++    Timer {
++        id: inactivityTimer
++
++        interval: Math.min(root.interval, 3000)
          onTriggered: {
              if (page.isReady) {
 === modified file 'qml/Tutorial/Tutorial.qml'
 --- qml/Tutorial/Tutorial.qml	2016-03-29 03:47:39 +0000
 +++ qml/Tutorial/Tutorial.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical, Ltd.
++ * Copyright (C) 2014-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -26,17 +26,18 @@
  Item {
      id: root
--    property alias active: loader.active
++    readonly property alias active: loader.active
      property Item launcher
      property Item panel
      property Item stage
      property string usageScenario
--    property bool paused
--    property bool keyboardVisible
++    property bool paused // hide any existing tutorial and don't show new ones
++    property bool delayed // don't show new tutorials
      property int lastInputTimestamp
      readonly property bool launcherEnabled: loader.item ? loader.item.launcherEnabled : true
++    readonly property bool launcherLongSwipeEnabled: loader.item ? loader.item.launcherLongSwipeEnabled : true
      readonly property bool spreadEnabled: loader.item ? loader.item.spreadEnabled : true
      readonly property bool panelEnabled: loader.item ? loader.item.panelEnabled : true
      readonly property bool running: loader.item ? loader.item.running : false
@@ -85,8 +86,8 @@
          Binding {
              target: loader.item
--            property: "keyboardVisible"
--            value: root.keyboardVisible
++            property: "delayed"
++            value: root.delayed
+         }
          Binding {
 === removed file 'qml/Tutorial/TutorialBottom.qml'
 --- qml/Tutorial/TutorialBottom.qml	2016-04-26 07:32:40 +0000
 +++ qml/Tutorial/TutorialBottom.qml	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
--/*
-- * Copyright (C) 2015 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.4
--import Ubuntu.Components 1.3
--import Ubuntu.Gestures 0.1
--import Unity.Application 0.1
--
--TutorialPage {
--    id: root
--
--    property string usageScenario
--    property var stage
--    property var application: null
--
--    // This page is a bit fragile.  It relies on knowing how the app beneath
--    // the shell will react to a drag.  What we do is put a monitor-only DDA
--    // at the bottom of the page (so that we know when the drag is finished)
--    // and pass the events on through to the app.  Thus, it sees the drag and
--    // brings its bottom edge up.
--    //
--    // Unfortunately, each app is on its own when implementing the bottom edge
--    // drag.  Most share copied-and-pasted code right now, but they will
--    // eventually consolidate on a version of DirectionalDragArea that will
--    // land in the SDK (making our guessing job easier).  Though, also in the
--    // future, this whole bottom tutorial component will also land in the SDK,
--    // rendering our version here obsolete.
--    //
--    // Anyway, for the moment, we base our guesses on the copied-and-pasted
--    // code used in several of the core apps and only bring this component
--    // up if we are in those core apps.
--
--    readonly property real mainStageWidth: stage.width - sideStageWidth
--    readonly property real sideStageWidth: root.usageScenario === "tablet" && stage.sideStageVisible ?
--                                           stage.sideStageWidth : 0
--    readonly property bool isMainStageApp: usageScenario !== "tablet" ||
--                                           stage.stageFocusedSurface === ApplicationInfoInterface.MainStage
--    readonly property real dragAreaHeight: units.gu(3) // based on PageWithBottomEdge.qml
--    readonly property real targetDistance: height * 0.2 + dragAreaHeight // based on PageWithBottomEdge.qml
--
--    opacityOverride: dragArea.dragging ? 1 - (dragArea.distance / targetDistance) : 1
--
--    mouseArea {
--        anchors.bottomMargin: root.dragAreaHeight
--    }
--
--    background {
--        sourceSize.height: 1916
--        sourceSize.width: 1080
--        source: Qt.resolvedUrl("graphics/background2.png")
--        rotation: 180
--    }
--
--    arrow {
--        anchors.bottom: root.bottom
--        anchors.bottomMargin: units.gu(3)
--        anchors.horizontalCenter: label.horizontalCenter
--        anchors.horizontalCenterOffset: -(label.width - label.contentWidth) / 2
--        rotation: 90
--    }
--
--    label {
--        text: !application ? "" :
--              application.appId === "address-book-app" ?
--                                    i18n.tr("Swipe up to add a contact") :
--              application.appId === "com.ubuntu.calculator_calculator" ?
--                                    i18n.tr("Swipe up for favorite calculations") :
--              application.appId === "dialer-app" ?
--                                    i18n.tr("Swipe up for recent calls") :
--              application.appId === "messaging-app" ?
--                                    i18n.tr("Swipe up to create a message") :
--              i18n.tr("Swipe up to manage the app") // shouldn't be used
--        anchors.bottom: arrow.top
--        anchors.bottomMargin: units.gu(3)
--        anchors.left: root.left
--        anchors.leftMargin: (label.width - label.contentWidth) / 2 + sideMargin +
--                            (isMainStageApp ? 0 : mainStageWidth)
--        width: (isMainStageApp ? mainStageWidth : sideStageWidth) - sideMargin * 2
--
--        readonly property real sideMargin: units.gu(4)
--    }
--
--    // Watches drag events but does not intercept them, so that the app beneath
--    // will still drag the bottom edge up.
--    SwipeArea {
--        id: dragArea
--        grabGesture: false
--        direction: Direction.Upwards
--        anchors.left: parent.left
--        anchors.right: parent.right
--        anchors.bottom: parent.bottom
--        height: root.dragAreaHeight
--
--        // Apps currently don't use DDA.  DDA will stop a gesture if
--        // horizontal motion is detected.  But our apps won't.  So turn off
--        // that gesture cleverness on our part, it will only get us out of sync.
--        immediateRecognition: true
--    }
--
--    MouseArea {
--        // A second mouse area because in tablet mode, we only want to let the
--        // user drag up on one of the stages, not both.  So we want to cover
--        // the second bottom edge with an event eater.
--        enabled: root.usageScenario === "tablet"
--        height: root.dragAreaHeight
--        width: isMainStageApp ? sideStageWidth : mainStageWidth
--        anchors.bottom: parent.bottom
--        anchors.left: isMainStageApp ? undefined : parent.left
--        anchors.right: isMainStageApp ? parent.right : undefined
--    }
--}
 === modified file 'qml/Tutorial/TutorialContent.qml'
 --- qml/Tutorial/TutorialContent.qml	2016-03-29 03:47:39 +0000
 +++ qml/Tutorial/TutorialContent.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013,2014 Canonical, Ltd.
++ * Copyright (C) 2013-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -26,19 +26,21 @@
      property Item panel
      property Item stage
      property string usageScenario
--    property bool paused
--    property bool keyboardVisible
++    property bool paused: true // default to true so that we won't start until top level is all ready
++    property bool delayed: true // same
      property var lastInputTimestamp
      readonly property bool launcherEnabled: !running
                                              || tutorialLeftLoader.shown
                                              || tutorialLeftLongLoader.shown
++    readonly property bool launcherLongSwipeEnabled: tutorialLeftLongLoader.shown
++                                                     || tutorialLeftLongLoader.skipped
      readonly property bool spreadEnabled: !running || tutorialRightLoader.shown
      readonly property bool panelEnabled: !running || tutorialTopLoader.shown
      readonly property bool running: tutorialLeftLoader.shown
++                                    || tutorialLeftLongLoader.shown
                                      || tutorialTopLoader.shown
                                      || tutorialRightLoader.shown
--                                    || tutorialBottomLoader.shown
      signal finished()
@@ -57,16 +59,11 @@
                                        root.usageScenario === "phone" ||
                                        root.usageScenario === "tablet"
--        property var focusedApp: ApplicationManager.focusedApplicationId
--                                 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
--                                 : null
--
          function haveShown(tutorialId) {
              return AccountsService.demoEdgesCompleted.indexOf(tutorialId) != -1;
+         }
--        property bool endPointsFinished: tutorialRightLoader.skipped &&
--                                         tutorialBottomLoader.skipped
++        property bool endPointsFinished: tutorialRightLoader.skipped
          onEndPointsFinishedChanged: if (endPointsFinished) root.finish()
+     }
@@ -88,15 +85,14 @@
              hides: [launcher, panel.indicators]
              paused: root.paused
--            isReady: !tutorialLeftLoader.skipped && !paused && !keyboardVisible &&
--                     !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow
++            isReady: !tutorialLeftLoader.skipped && !paused && !delayed
--            // Use an idle timer here, because when constructed, all our isReady variables will be false.
--            // Qml needs a moment to copy their values from Tutorial.qml.  So we idle it and recheck.
--            Timer {
++            InactivityTimer {
                  id: tutorialLeftTimer
--                interval: 0
--                onTriggered: if (tutorialLeft.isReady && !tutorialLeft.shown) tutorialLeft.show()
++                objectName: "tutorialLeftTimer"
++                interval: 20000
++                lastInputTimestamp: root.lastInputTimestamp
++                page: parent
+             }
              onIsReadyChanged: if (isReady && !shown) tutorialLeftTimer.start()
@@ -105,6 +101,40 @@
+     }
      Loader {
++        id: tutorialTopLoader
++        objectName: "tutorialTopLoader"
++        anchors.fill: parent
++
++        readonly property bool skipped: !d.mobileScenario || d.haveShown("top")
++        readonly property bool shown: item && item.shown
++        active: !skipped || (item && item.visible)
++        onSkippedChanged: if (skipped && shown) item.hide()
++
++        sourceComponent: TutorialTop {
++            id: tutorialTop
++            objectName: "tutorialTop"
++            anchors.fill: parent
++            panel: root.panel
++            hides: [launcher, panel.indicators]
++            paused: root.paused
++
++            skipped: tutorialTopLoader.skipped
++            isReady: tutorialLeftLoader.skipped && !skipped && !paused && !delayed
++
++            InactivityTimer {
++                id: tutorialTopTimer
++                objectName: "tutorialTopTimer"
++                interval: 60000
++                lastInputTimestamp: root.lastInputTimestamp
++                page: parent
++            }
++
++            onIsReadyChanged: if (isReady && !shown) tutorialTopTimer.start()
++            onFinished: AccountsService.markDemoEdgeCompleted("top")
++        }
++    }
++
++    Loader {
          id: tutorialLeftLongLoader
          objectName: "tutorialLeftLongLoader"
          anchors.fill: parent
@@ -123,22 +153,15 @@
              paused: root.paused
              skipped: tutorialLeftLongLoader.skipped
--            isReady: tutorialLeftLoader.skipped && !skipped && !paused && !keyboardVisible &&
--                     !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow
++            isReady: tutorialTopLoader.skipped && !skipped && !paused && !delayed &&
++                     ApplicationManager.focusedApplicationId != "unity8-dash"
--            Timer {
++            InactivityTimer {
                  id: tutorialLeftLongTimer
                  objectName: "tutorialLeftLongTimer"
                  interval: 5000
--                onTriggered: {
--                    if (parent.isReady) {
--                        if (!parent.shown) {
--                            parent.show();
--                        }
--                    } else if (!parent.skipped) {
--                        restart();
--                    }
--                }
++                lastInputTimestamp: root.lastInputTimestamp
++                page: parent
+             }
              onIsReadyChanged: if (isReady && !shown) tutorialLeftLongTimer.start()
@@ -147,48 +170,6 @@
+     }
      Loader {
--        id: tutorialTopLoader
--        objectName: "tutorialTopLoader"
--        anchors.fill: parent
--
--        readonly property bool skipped: !d.mobileScenario || d.haveShown("top")
--        readonly property bool shown: item && item.shown
--        active: !skipped || (item && item.visible)
--        onSkippedChanged: if (skipped && shown) item.hide()
--
--        sourceComponent: TutorialTop {
--            id: tutorialTop
--            objectName: "tutorialTop"
--            anchors.fill: parent
--            panel: root.panel
--            hides: [launcher, panel.indicators]
--            paused: root.paused
--
--            skipped: tutorialTopLoader.skipped
--            isReady: tutorialLeftLongLoader.skipped && !skipped && !paused && !keyboardVisible &&
--                     !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow
--
--            // We fire 30s after left edge tutorial, with at least 3s of inactivity
--
--            InactivityTimer {
--                id: tutorialTopInactivityTimer
--                lastInputTimestamp: root.lastInputTimestamp
--                page: parent
--            }
--
--            Timer {
--                id: tutorialTopTimer
--                objectName: "tutorialTopTimer"
--                interval: 27000
--                onTriggered: tutorialTopInactivityTimer.start()
--            }
--
--            onIsReadyChanged: if (isReady && !shown) tutorialTopTimer.start()
--            onFinished: AccountsService.markDemoEdgeCompleted("top")
--        }
--    }
--
--    Loader {
          id: tutorialRightLoader
          objectName: "tutorialRightLoader"
          anchors.fill: parent
@@ -208,83 +189,19 @@
              paused: root.paused
              skipped: tutorialRightLoader.skipped
--            isReady: tutorialTopLoader.skipped && !skipped && !paused && !keyboardVisible &&
--                     !tutorialBottomLoader.shown && !tutorialBottomLoader.mightShow &&
--                     ApplicationManager.count >= 3
++            isReady: tutorialTopLoader.skipped && !skipped && !paused && !delayed &&
++                     ApplicationManager.count >= 4
              InactivityTimer {
--                id: tutorialRightInactivityTimer
--                objectName: "tutorialRightInactivityTimer"
++                id: tutorialRightTimer
++                objectName: "tutorialRightTimer"
++                interval: 10000
                  lastInputTimestamp: root.lastInputTimestamp
                  page: parent
+             }
--            Connections {
--                target: d
--                onFocusedAppChanged: {
--                    if (tutorialRight.isReady && !tutorialRight.shown && d.focusedApp
--                            && d.focusedApp.state === ApplicationInfoInterface.Starting) {
--                        tutorialRight.show();
--                    }
--                }
--            }
--
--            onIsReadyChanged: if (isReady && !shown) tutorialRightInactivityTimer.start()
++            onIsReadyChanged: if (isReady && !shown) tutorialRightTimer.start()
              onFinished: AccountsService.markDemoEdgeCompleted("right")
+         }
+     }
--
--    Loader {
--        id: tutorialBottomLoader
--        objectName: "tutorialBottomLoader"
--        anchors.fill: parent
--
--        // See TutorialBottom.qml for an explanation of why we only support
--        // certain apps.
--        readonly property var supportedApps: ["address-book-app",
--                                              "com.ubuntu.calculator_calculator",
--                                              "dialer-app",
--                                              "messaging-app"]
--        readonly property bool skipped: {
--            if (!d.mobileScenario) {
--                return true;
--            }
--            for (var i = 0; i < supportedApps.length; i++) {
--                if (!d.haveShown("bottom-" + supportedApps[i])) {
--                    return false;
--                }
--            }
--            return true;
--        }
--        readonly property bool shown: item && item.shown
--        readonly property bool haveShownFocusedApp: d.focusedApp &&
--                                                    d.haveShown("bottom-" + d.focusedApp.appId)
--        readonly property bool mightShow: !skipped && d.focusedApp &&
--                                          supportedApps.indexOf(d.focusedApp.appId) !== -1 &&
--                                          !haveShownFocusedApp
--        active: !skipped || (item && item.visible)
--        onHaveShownFocusedAppChanged: if (haveShownFocusedApp && shown) hide()
--        onSkippedChanged: if (skipped && shown) item.hide()
--
--        sourceComponent: TutorialBottom {
--            id: tutorialBottom
--            objectName: "tutorialBottom"
--            anchors.fill: parent
--            hides: [launcher, panel.indicators]
--            paused: root.paused
--            usageScenario: root.usageScenario
--            stage: root.stage
--            application: d.focusedApp
--
--            skipped: tutorialBottomLoader.skipped
--            isReady: !tutorialBottomLoader.skipped && !paused && !keyboardVisible &&
--                     !tutorialLeftLoader.shown && !tutorialLeftLongLoader.shown &&
--                     !tutorialTopLoader.shown && !tutorialRightLoader.shown &&
--                     tutorialBottomLoader.mightShow &&
--                     d.focusedApp.state === ApplicationInfoInterface.Running
--
--            onIsReadyChanged: if (isReady && !shown) show()
--            onFinished: AccountsService.markDemoEdgeCompleted("bottom-" + d.focusedApp.appId)
--        }
--    }
+ }
 === modified file 'qml/Tutorial/TutorialLeft.qml'
 --- qml/Tutorial/TutorialLeft.qml	2016-03-29 03:47:39 +0000
 +++ qml/Tutorial/TutorialLeft.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
+     }
      label {
--        text: i18n.tr("Swipe from the left edge to open the launcher")
++        text: i18n.tr("Short swipe from the left edge to open the launcher")
          anchors.left: arrow.right
          anchors.leftMargin: units.gu(3)
          anchors.right: root.right
 === modified file 'qml/Tutorial/TutorialLeftLong.qml'
 --- qml/Tutorial/TutorialLeftLong.qml	2016-02-19 17:40:20 +0000
 +++ qml/Tutorial/TutorialLeftLong.qml	2016-06-10 14:15:49 +0000
@@ -23,7 +23,9 @@
      property var launcher
--    opacityOverride: 1 - launcher.dragDistance / launcher.minimizeDistance
++    // Unlike other tutorials, this one can't be skipped before we show it, so
++    // only set opacityOverride if we're already shown.
++    opacityOverride: shown ? 1 - launcher.dragDistance / launcher.minimizeDistance : 1
      mouseArea {
          anchors.leftMargin: launcher.dragAreaWidth
 === modified file 'qml/Tutorial/TutorialPage.qml'
 --- qml/Tutorial/TutorialPage.qml	2016-03-29 03:47:39 +0000
 +++ qml/Tutorial/TutorialPage.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013,2014 Canonical, Ltd.
++ * Copyright (C) 2013-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@
      onOpacityOverrideChanged: {
          if (opacityOverride <= 0) {
              d.showOnUnpause = false;
--            hide();
++            hideNow();
+         }
+     }
      property real _showOpacity: 0
 === modified file 'qml/Tutorial/TutorialRight.qml'
 --- qml/Tutorial/TutorialRight.qml	2016-03-31 03:15:03 +0000
 +++ qml/Tutorial/TutorialRight.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
      label {
          text: root.usageScenario === "desktop" ?
                      i18n.tr("Push your mouse against the right edge to view your open apps") :
--                    i18n.tr("Short or long swipe from the right edge to view your open apps")
++                    i18n.tr("Swipe from the right edge to view your open apps")
          anchors.right: arrow.left
          anchors.rightMargin: units.gu(2) - (label.width - label.contentWidth)
          anchors.verticalCenter: arrow.verticalCenter
 === modified file 'qml/Tutorial/TutorialTop.qml'
 --- qml/Tutorial/TutorialTop.qml	2016-01-21 23:22:52 +0000
 +++ qml/Tutorial/TutorialTop.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -50,8 +50,7 @@
+     }
      label {
--        text: d.landscape ? i18n.tr("Swipe from the top right edge to open the notification bar")
--                          : i18n.tr("Swipe from the top edge to open the notification bar")
++        text: i18n.tr("Swipe from the top edge to access notifications and quick settings")
          anchors.top: arrow.bottom
          anchors.topMargin: units.gu(3)
          anchors.horizontalCenter: arrow.horizontalCenter
 === modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
 --- tests/qmltests/Tutorial/tst_Tutorial.qml	2016-05-02 07:57:07 +0000
 +++ tests/qmltests/Tutorial/tst_Tutorial.qml	2016-06-10 14:15:49 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013,2014,2015 Canonical, Ltd.
++ * Copyright (C) 2013-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
  import Ubuntu.Components.ListItems 1.3
  import Ubuntu.Telephony 0.1 as Telephony
  import Unity.Application 0.1
++import Unity.Notifications 1.0
  import Unity.Test 0.1 as UT
  import Utils 0.1
@@ -55,6 +56,33 @@
          phoneNumber: "+447812221111"
+     }
++    Component {
++        id: mockNotification
++        QtObject {}
++    }
++
++    ListModel {
++        id: mockNotificationsModel
++
++        function getRaw(id) {
++            return mockNotification.createObject(mockNotificationsModel)
++        }
++    }
++
++    function addNotification() {
++        var n = {
++            type: Notification.Confirmation,
++            hints: {},
++            summary: "",
++            body: "",
++            icon: "",
++            secondaryIcon: "",
++            actions: []
++        };
++
++        mockNotificationsModel.append(n);
++    }
++
      Component.onCompleted: {
          // must set the mock mode before loading the Shell
          LightDM.Greeter.mockMode = "single-pin";
@@ -231,6 +259,8 @@
              prepareShell();
              var tutorialLeft = findChild(shell, "tutorialLeft");
++            var tutorialLeftTimer = findInvisibleChild(tutorialLeft, "tutorialLeftTimer");
++            tutorialLeftTimer.interval = 0;
              tryCompare(tutorialLeft, "opacity", 1);
+         }
@@ -260,6 +290,7 @@
              // reload our test subject to get it in a fresh state once again
              shellLoader.active = true;
++            mockNotificationsModel.clear();
              tryCompare(shellLoader, "status", Loader.Ready);
              removeTimeConstraintsFromSwipeAreas(shellLoader.item);
+         }
@@ -300,40 +331,41 @@
              var tutorialTopTimer = findInvisibleChild(tutorialTop, "tutorialTopTimer");
              tutorialTopTimer.interval = 1;
--            AccountsService.demoEdgesCompleted = ["left", "left-long"];
++            AccountsService.demoEdgesCompleted = ["left"];
              tryCompare(tutorialLeftLoader, "active", false);
              tryCompare(tutorialTop, "shown", true);
              tryCompare(tutorialTop, "opacity", 1);
+         }
++        function openTutorialLeftLong() {
++            var tutorialLeftLong = findChild(shell, "tutorialLeftLong");
++            var tutorialLeftLongTimer = findChild(tutorialLeftLong, "tutorialLeftLongTimer");
++
++            AccountsService.demoEdgesCompleted = ["left", "top"];
++            ApplicationManager.startApplication("gallery-app");
++
++            tutorialLeftLongTimer.interval = 1;
++            tryCompare(tutorialLeftLong, "shown", true);
++            tryCompare(tutorialLeftLong, "opacity", 1);
++        }
++
          function openTutorialRight() {
              var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
              var tutorialRight = findChild(shell, "tutorialRight");
++            var tutorialRightTimer = findChild(tutorialRight, "tutorialRightTimer");
--            AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];
++            AccountsService.demoEdgesCompleted = ["left", "top", "left-long"];
              ApplicationManager.startApplication("gallery-app");
              ApplicationManager.startApplication("facebook-webapp");
++            ApplicationManager.startApplication("camera-app");
              tryCompare(tutorialLeftLoader, "active", false);
++            tutorialRightTimer.interval = 1;
              tryCompare(tutorialRight, "shown", true);
              tryCompare(tutorialRight, "opacity", 1);
+         }
--        function openTutorialBottom() {
--            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
--            var tutorialBottom = findChild(shell, "tutorialBottom");
--
--            AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right"];
--            tryCompare(tutorialLeftLoader, "active", false);
--
--            ApplicationManager.startApplication("dialer-app");
--            ApplicationManager.requestFocusApplication("dialer-app");
--
--            tryCompare(tutorialBottom, "shown", true);
--            tryCompare(tutorialBottom, "opacity", 1);
--        }
--
          function test_tutorialLeftEdges() {
              var tutorial = findChild(shell, "tutorial");
              var tutorialLeft = findChild(tutorial, "tutorialLeft");
@@ -353,12 +385,12 @@
          function test_tutorialLeftFinish() {
              var tutorial = findChild(shell, "tutorial");
--            var tutorialLeft = findChild(tutorial, "tutorialLeft");
++            var tutorialLeftLoader = findChild(tutorial, "tutorialLeftLoader");
              var launcher = findChild(shell, "launcher");
              touchFlick(shell, 0, halfHeight, halfWidth, halfHeight);
--            tryCompare(tutorialLeft, "shown", false);
++            tryCompare(tutorialLeftLoader, "shown", false);
              tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
              tryCompare(launcher, "state", "visible");
+         }
@@ -368,6 +400,7 @@
              // letting go (i.e. not triggering the "progress" property of
              // Launcher).
              var tutorialLeft = findChild(shell, "tutorialLeft");
++            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
              var launcher = findChild(shell, "launcher");
              // Confirm fade during drag
@@ -384,31 +417,32 @@
              // out much.
              touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight);
              tryCompare(launcher, "state", ""); // should remain hidden
--            tryCompare(tutorialLeft, "shown", true); // and we should still be on left
++            tryCompare(tutorialLeftLoader, "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);
--            tryCompare(tutorialLeft, "shown", false);
++            tryCompare(tutorialLeftLoader, "shown", false);
              tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
              tryCompare(launcher, "state", "visible");
+         }
--        function test_tutorialLeftLongDrag() {
--            // Just confirm that a long drag ("dash" drag) doesn't confuse us
--
--            // So that we actually switch to dash and launcher hides
++        function test_tutorialLeftLongFinish() {
++            AccountsService.demoEdgesCompleted = ["left", "top"];
++
++            var tutorialLeftLongTimer = findInvisibleChild(shell, "tutorialLeftLongTimer");
++            tutorialLeftLongTimer.interval = 1;
++
              ApplicationManager.startApplication("gallery-app");
--            var launcher = findChild(shell, "launcher");
--            var tutorialLeft = findChild(shell, "tutorialLeftLoader");
--            verify(tutorialLeft);
++            var tutorialLeftLongLoader = findChild(shell, "tutorialLeftLongLoader");
++            tryCompare(tutorialLeftLongLoader, "shown", true);
              touchFlick(shell, 0, halfHeight, shell.width, halfHeight);
--            tryCompare(tutorialLeft, "shown", false);
--            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long"]);
++            tryCompare(tutorialLeftLongLoader, "shown", false);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "top", "left-long"]);
+         }
          function test_tutorialLeftAutoSkipped() {
@@ -423,6 +457,24 @@
              tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);
+         }
++        function test_tutorialLongLeftSwipeDisabled() {
++            // Test that a long left swipe is disabled until we get to or pass
++            // the long left tutorial.
++            var tutorial = findChild(shell, "tutorial");
++
++            verify(!tutorial.launcherLongSwipeEnabled);
++
++            openTutorialLeftLong();
++            verify(tutorial.launcherLongSwipeEnabled);
++
++            openTutorialRight();
++            verify(tutorial.launcherLongSwipeEnabled);
++
++            AccountsService.demoEdges = false;
++            tryCompare(tutorial, "running", false);
++            verify(tutorial.launcherLongSwipeEnabled);
++        }
++
          function test_tutorialTopEdges() {
              var tutorial = findChild(shell, "tutorial");
              var tutorialTop = findChild(tutorial, "tutorialTop");
@@ -444,14 +496,14 @@
          function test_tutorialTopFinish() {
              var tutorial = findChild(shell, "tutorial");
--            var tutorialTop = findChild(tutorial, "tutorialTop");
++            var tutorialTopLoader = findChild(tutorial, "tutorialTopLoader");
              var panel = findChild(shell, "panel");
              openTutorialTop();
              touchFlick(shell, halfWidth, 0, halfWidth, shell.height);
--            tryCompare(tutorialTop, "shown", false);
--            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top"]);
++            tryCompare(tutorialTopLoader, "shown", false);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "top"]);
              tryCompare(panel.indicators, "fullyOpened", true);
+         }
@@ -477,12 +529,12 @@
              var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
              var tutorialTop = findChild(shell, "tutorialTop");
--            AccountsService.demoEdgesCompleted = ["left", "left-long"];
++            AccountsService.demoEdgesCompleted = ["left"];
              tryCompare(tutorialLeftLoader, "active", false);
              verify(!tutorialTop.shown);
              touchFlick(shell, halfWidth, 0, halfWidth, shell.height);
--            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top"]);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "top"]);
+         }
          function test_tutorialRightEdges() {
@@ -505,15 +557,11 @@
+         }
          function test_tutorialRightFinish() {
--            var tutorial = findChild(shell, "tutorial");
--            var tutorialRight = findChild(tutorial, "tutorialRight");
--            var stage = findChild(shell, "stage");
--
              openTutorialRight();
              touchFlick(shell, shell.width, halfHeight, 0, halfHeight);
--            tryCompare(tutorialRight, "shown", false);
--            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right"]);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "top", "left-long", "right"]);
++            tryCompare(AccountsService, "demoEdges", false);
+         }
          function test_tutorialRightShortDrag() {
@@ -537,17 +585,18 @@
              // Test that if we exit the top tutorial, we don't immediately
              // jump into right tutorial.
              var tutorialRight = findChild(shell, "tutorialRight");
--            var tutorialRightTimer = findInvisibleChild(tutorialRight, "tutorialRightInactivityTimer");
++            var tutorialRightTimer = findInvisibleChild(tutorialRight, "tutorialRightTimer");
--            tutorialRightTimer.interval = 1;
              openTutorialTop();
              ApplicationManager.startApplication("gallery-app");
              ApplicationManager.startApplication("facebook-webapp");
--            tryCompare(ApplicationManager, "count", 3);
++            ApplicationManager.startApplication("camera-app");
++            tryCompare(ApplicationManager, "count", 4);
--            AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];
--            verify(tutorialRightTimer.running, true);
++            AccountsService.demoEdgesCompleted = ["left", "top", "left-long"];
++            verify(tutorialRightTimer.running);
              verify(!tutorialRight.shown);
++            tutorialRightTimer.interval = 1;
              tryCompare(tutorialRight, "shown", true);
+         }
@@ -555,112 +604,11 @@
              // Test that we skip the tutorial if user uses right edge themselves
              var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
--            AccountsService.demoEdgesCompleted = ["left", "left-long"];
++            AccountsService.demoEdgesCompleted = ["left"];
              tryCompare(tutorialLeftLoader, "active", false);
              touchFlick(shell, shell.width, halfHeight, 0, halfHeight);
--            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "right"]);
--        }
--
--        function test_tutorialBottomEdges() {
--            var tutorial = findChild(shell, "tutorial");
--            var tutorialBottom = findChild(tutorial, "tutorialBottom");
--            var tutorialLabel = findChild(tutorialBottom, "tutorialLabel");
--            var launcher = findChild(shell, "launcher");
--            var stage = findChild(shell, "stage");
--            var panel = findChild(shell, "panel");
--
--            openTutorialBottom();
--
--            tryCompare(tutorial, "running", true);
--            verify(!tutorial.launcherEnabled);
--            verify(!tutorial.spreadEnabled);
--            verify(!tutorial.panelEnabled);
--            verify(tutorialBottom.shown);
--            verify(!launcher.available);
--            verify(!stage.spreadEnabled);
--            verify(!panel.indicators.available);
--            compare(tutorialLabel.text, "Swipe up for recent calls");
--        }
--
--        function test_tutorialBottomFinish() {
--            var tutorial = findChild(shell, "tutorial");
--            var tutorialBottom = findChild(tutorial, "tutorialBottom");
--
--            openTutorialBottom();
--            touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
--
--            tryCompare(tutorialBottom, "shown", false);
--            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right", "bottom-dialer-app"]);
--
--            // OK, we did one, just confirm that when all are done, we mark whole tutorial as done.
--            verify(AccountsService.demoEdges);
--            AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right",
--                                                  "bottom-address-book-app",
--                                                  "bottom-com.ubuntu.calculator_calculator",
--                                                  "bottom-dialer-app",
--                                                  "bottom-messaging-app"];
--            verify(!AccountsService.demoEdges);
--        }
--
--        function test_tutorialBottomAppearsBeforeRight() {
--            // Confirm that if bottom edge and right edge would appear on the
--            // the same app open, bottom edge appears first. (this is a lightly
--            // edited version of openTutorialRight)
--            var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
--            var tutorialRight = findChild(shell, "tutorialRight");
--            var tutorialBottom = findChild(shell, "tutorialBottom");
--
--            AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];
--            ApplicationManager.startApplication("gallery-app");
--            ApplicationManager.startApplication("dialer-app");
--
--            tryCompare(tutorialLeftLoader, "active", false);
--            tryCompare(tutorialBottom, "shown", true);
--            tryCompare(tutorialBottom, "opacity", 1);
--            tryCompare(tutorialRight, "visible", false);
--        }
--
--        function test_tutorialBottomOnlyCoversSideStageOnTablet() {
--            loadShell("tablet");
--
--            var tutorialBottom = findChild(shell, "tutorialBottom");
--            var targetHeight = shell.height - units.gu(4);
--            var mainStageX = units.gu(20);
--            var sideStageX = shell.width - units.gu(20);
--
--            WindowStateStorage.saveStage("dialer-app", ApplicationInfoInterface.SideStage);
--            openTutorialBottom();
--
--            touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);
--            compare(tutorialBottom.opacity, 1);
--            touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, false, true);
--
--            touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);
--            verify(tutorialBottom.opacity < 1);
--            touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, false, true);
--        }
--
--        function test_tutorialBottomOnlyCoversMainStageOnTablet() {
--            loadShell("tablet");
--
--            var tutorialBottom = findChild(shell, "tutorialBottom");
--            var targetHeight = shell.height - units.gu(4);
--            var mainStageX = units.gu(20);
--            var sideStageX = shell.width - units.gu(20);
--
--            WindowStateStorage.saveStage("notes-app", ApplicationInfoInterface.SideStage);
--            ApplicationManager.startApplication("notes-app");
--
--            openTutorialBottom();
--
--            touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);
--            compare(tutorialBottom.opacity, 1);
--            touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, false, true);
--
--            touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);
--            verify(tutorialBottom.opacity < 1);
--            touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, false, true);
++            tryCompare(AccountsService, "demoEdgesCompleted", ["left", "right"]);
+         }
          function test_activeCallInterruptsTutorial() {
@@ -678,31 +626,6 @@
              verify(!tutorialLeft.paused);
+         }
--        function test_dialerInterruptionWithNoOverlappingTutorials() {
--            var tutorialLeft = findChild(shell, "tutorialLeft");
--            var tutorialBottom = findChild(shell, "tutorialBottom");
--            verify(tutorialLeft.shown);
--
--            // Start call, hiding left tutorial
--            callManager.foregroundCall = phoneCall;
--            tryCompare(tutorialLeft, "shown", false);
--
--            // Start dialer app
--            ApplicationManager.startApplication("dialer-app");
--            tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");
--            verify(!tutorialBottom.shown);
--
--            // Dismiss call, bottom tutorial should appear
--            callManager.foregroundCall = null;
--            tryCompare(tutorialBottom, "shown", true);
--            verify(!tutorialLeft.shown);
--
--            // Get rid of bottom tutorial, left should now be shown
--            touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);
--            tryCompare(tutorialBottom, "shown", false);
--            tryCompare(tutorialLeft, "shown", true);
--        }
--
          function test_greeterInterruptsTutorial() {
              var tutorialLeft = findChild(shell, "tutorialLeft");
              verify(tutorialLeft.shown);
@@ -738,7 +661,7 @@
              verify(!tutorialRight.isReady);
              verify(!tutorialRight.shown);
              verify(!tutorialRight.paused);
--            compare(AccountsService.demoEdgesCompleted, ["left", "left-long", "top"]);
++            compare(AccountsService.demoEdgesCompleted, ["left", "top", "left-long"]);
+         }
          function test_desktopOnlyShowsTutorialRight() {
@@ -746,17 +669,22 @@
              var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");
              var tutorialTopLoader = findChild(shell, "tutorialTopLoader");
++            var tutorialLeftLongLoader = findChild(shell, "tutorialLeftLongLoader");
              var tutorialRightLoader = findChild(shell, "tutorialRightLoader");
--            var tutorialBottomLoader = findChild(shell, "tutorialBottomLoader");
              verify(!tutorialLeftLoader.active);
              verify(!tutorialTopLoader.active);
++            verify(!tutorialLeftLongLoader.active);
              verify(tutorialRightLoader.active);
--            verify(!tutorialBottomLoader.active);
              compare(AccountsService.demoEdgesCompleted, []);
++            var tutorialRightTimer = findInvisibleChild(tutorialRightLoader, "tutorialRightTimer");
++            tutorialRightTimer.interval = 1;
++
              ApplicationManager.startApplication("dialer-app");
              ApplicationManager.startApplication("camera-app");
++            ApplicationManager.startApplication("facebook-webapp");
              tryCompare(tutorialRightLoader.item, "isReady", true);
++
              tryCompare(tutorialRightLoader, "shown", true);
+         }
@@ -764,8 +692,11 @@
              loadShell("desktop");
              var tutorialRight = findChild(shell, "tutorialRight");
++            var tutorialRightTimer = findInvisibleChild(tutorialRight, "tutorialRightTimer");
++            tutorialRightTimer.interval = 1;
              ApplicationManager.startApplication("dialer-app");
              ApplicationManager.startApplication("camera-app");
++            ApplicationManager.startApplication("facebook-webapp");
              tryCompare(tutorialRight, "shown", true);
              var stage = findChild(shell, "stage");
@@ -789,24 +720,60 @@
              verify(tutorialLeft.shown);
+         }
--        function test_oskPreventsTutorial() {
--            var surface = SurfaceManager.inputMethodSurface;
--            var inputMethod = findInvisibleChild(shell, "inputMethod");
--
--            AccountsService.demoEdges = false;
--            surface.setState(Mir.RestoredState);
--            tryCompare(inputMethod, "state", "shown");
--
--            var tutorial = findChild(shell, "tutorial");
--            tryCompare(tutorial, "keyboardVisible", true);
--
--            AccountsService.demoEdges = true;
--            var tutorialLeft = findChild(shell, "tutorialLeft");
--            verify(!tutorialLeft.shown);
--
--            surface.setState(Mir.MinimizedState);
--            tryCompare(inputMethod, "state", "hidden");
--            tryCompare(tutorialLeft, "shown", false);
++        function test_oskDelaysTutorial() {
++            var tutorial = findChild(shell, "tutorial");
++            verify(!tutorial.delayed);
++
++            SurfaceManager.inputMethodSurface.setState(Mir.RestoredState);
++
++            tryCompare(tutorial, "delayed", true);
++        }
++
++        function test_notificationDelaysTutorial() {
++            var tutorial = findChild(shell, "tutorial");
++            verify(!tutorial.delayed);
++
++            var notifications = findChild(shell, "notificationList");
++            notifications.model = mockNotificationsModel;
++            addNotification(); // placeholder
++            addNotification();
++
++            tryCompare(tutorial, "delayed", true);
++        }
++
++        function test_dialogDelaysTutorial() {
++            var tutorial = findChild(shell, "tutorial");
++            verify(!tutorial.delayed);
++
++            var dialogs = findChild(shell, "dialogs");
++            dialogs.showPowerDialog();
++
++            verify(tutorial.delayed);
++        }
++
++        function test_delayedTutorial() {
++            var tutorial = findChild(shell, "tutorial");
++            var tutorialTop = findChild(tutorial, "tutorialTop");
++            var tutorialTopTimer = findChild(tutorialTop, "tutorialTopTimer");
++
++            // Get top tutorial ready
++            AccountsService.demoEdgesCompleted = ["left"];
++            verify(tutorialTop.isReady);
++            verify(tutorialTopTimer.running);
++
++            // Confirm that we become unready when delayed, but timer still goes
++            tutorial.delayed = true;
++            verify(!tutorialTop.isReady);
++            verify(tutorialTopTimer.running);
++
++            // Confirm that we don't open the tutorial when delayed
++            tutorialTopTimer.interval = 1;
++            wait(5);
++            verify(!tutorialTop.shown);
++
++            // Confirm we go back to normal when undelayed
++            tutorial.delayed = false;
++            tryCompare(tutorialTop, "shown", true);
+         }
          function test_accountsServiceSettings() {
@@ -820,7 +787,9 @@
              AccountsService.demoEdges = true;
              tutorialLeft = findChild(shell, "tutorialLeft");
              verify(tutorialLeft != null);
--            tryCompare(tutorialLeft, "shown", true);
++
++            var tutorialLeftTimer = findChild(tutorialLeft, "tutorialLeftTimer");
++            verify(tutorialLeftTimer.running);
+         }
+     }
+ }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-05-27 13:51:53 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-06-10 14:15:49 +0000
@@ -1233,13 +1233,10 @@
          function test_wizardEarlyExit() {
              Wizard.System.wizardEnabled = true;
--            AccountsService.demoEdges = true;
              loadShell("phone");
              var wizard = findChild(shell, "wizard");
--            var tutorial = findChild(shell, "tutorial");
              tryCompare(wizard, "active", true);
--            tryCompare(tutorial, "running", true);
              tryCompareFunction(function() { return topLevelSurfaceList.applicationAt(0).appId; }, "unity8-dash");
              // Make sure we stay running when there's no top level window (can happen for
@@ -1252,14 +1249,12 @@
              tryCompare(topLevelSurfaceList, "count", 0);
              compare(wizard.shown, true);
--            compare(tutorial.running, true);
              // And make sure we stay running when dash comes back again
              var dashSurfaceId = topLevelSurfaceList.nextId;
              ApplicationManager.startApplication(dashApplication.appId);
              waitUntilAppWindowIsFullyLoaded(dashSurfaceId);
              compare(wizard.shown, true);
--            compare(tutorial.running, true);
              // And make sure we stop when some other surface shows app
              var gallerySurfaceId = topLevelSurfaceList.nextId;
@@ -1267,12 +1262,7 @@
              waitUntilAppWindowIsFullyLoaded(gallerySurfaceId);
              tryCompareFunction(function() { return topLevelSurfaceList.applicationAt(0).appId; }, "gallery-app");
              compare(wizard.shown, false);
--            compare(tutorial.running, false);
--            tryCompare(AccountsService, "demoEdges", false);
              tryCompare(Wizard.System, "wizardEnabled", false);
--
--            var tutorialLeft = findChild(tutorial, "tutorialLeft");
--            compare(tutorialLeft, null); // should be destroyed with tutorial
+         }
          function test_tutorialPausedDuringGreeter() {