Merge lp:~gerboland/unity8/initialSurfaceGeometry into lp:unity8

[Gerry Boland]

Implement a surfaceSizer exported by qtmir to override the initial surface geometry requested by clients. Also fix small surface size & position bug.

The SurfaceSizer is a Javascript function defined by unity8 which is registered with QtMir as a callback function whenever a client requests a new surface from Mir. It allows unity8 to override the client-requested width & height of the surface. This fixes the startup-resize visual glitching evident right now.

While implementing the surfaceSizer function, I discovered that all non-fullscreen surfaces were 2DP too tall and being occluded by the orange line of the panel. This MR fixes that fact and cleans up what "panelHeight" refers to in Shell.qml - it is the height of the indicator bar plus the orange line.

Implement a surfaceSizer exported by qtmir to override the initial surface geometry requested by clients

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~gerboland/unity-api/surfaceSizerCallback/+merge/230270
https://code.launchpad.net/~gerboland/qtmir/initialSurfaceGeometry/+merge/230491
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[Michał Sawicz (saviq)]

unity8-fake-env should provide unity-applications-4 (or 3?).

review: Needs Fixing

[Michał Sawicz (saviq)]

Oh and you need to depend on the new unity-api.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1142
http://jenkins.qa.ubuntu.com/job/unity8-ci/3869/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/869/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/963/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/963/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/963/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4665/console

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

review: Needs Fixing (continuous-integration)

[lp:~gerboland/unity8/initialSurfaceGeometry]

1143. By Gerry Boland on 2014-08-13

Adjjust to newer API

1144. By Gerry Boland on 2014-08-13

[debian] depend on unity-api 7.89 (supplying unity-application-impl3) and qtmir 0.4.2

[Gerry Boland (gerboland)]

Updated to newer unity-api and comments addressed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1143
http://jenkins.qa.ubuntu.com/job/unity8-ci/3884/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3468/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/884/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/978/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/978/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/978/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4715/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1144
http://jenkins.qa.ubuntu.com/job/unity8-ci/3892/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3506/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/892/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/986/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/986/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/986/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4753/console

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Commented in the diff.

review: Needs Information

[Daniel d'Andrada (dandrader)]

review: Needs Information

[Albert Astals Cid (aacid)]

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

[lp:~gerboland/unity8/initialSurfaceGeometry]

1145. By Gerry Boland on 2014-08-18

Merge trunk & fix conflict

[Gerry Boland (gerboland)]

@Daniel: replied to your question (sorry for delay, forgot to hit "save comment" until now)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1145
http://jenkins.qa.ubuntu.com/job/unity8-ci/4002/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3713/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1003/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1096/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1096/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1096/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4960/console

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

See diff comment.

review: Needs Fixing

[lp:~gerboland/unity8/initialSurfaceGeometry]

1146. By Gerry Boland on 2014-08-19

Merge trunk

1147. By Gerry Boland on 2014-08-19

Remove test crash fix

[Gerry Boland (gerboland)]

Reply inline

[Daniel d'Andrada (dandrader)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1147
http://jenkins.qa.ubuntu.com/job/unity8-ci/4022/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3765/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1023/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5012/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Code does merge properly now

review: Abstain

[Michał Sawicz (saviq)]

review: Abstain

[Michał Sawicz (saviq)]

This conflicts with lp:~dandrader/unity8/lifecycle that's already approved and slated for release soon, maybe rebase on that one and we'll land them together?

review: Needs Information

[lp:~gerboland/unity8/initialSurfaceGeometry]

1148. By Gerry Boland on 2014-08-21

Merge lp:~dandrader/unity8/lifecycle and fix conflicts

1149. By Gerry Boland on 2014-09-03

Merge trunk

1150. By Gerry Boland on 2014-10-07

Merge trunk

1151. By Gerry Boland on 2014-12-03

merge old trunk

1152. By Gerry Boland on 2014-12-03

Merge current trunk

1153. By Gerry Boland on 2014-12-03

Undo all changes to Shell and Panel, start afresh

1154. By Gerry Boland on 2014-12-03

I hate you whitespace cheker

1155. By Gerry Boland on 2014-12-08

Bump unity-api & qtmir dep

1156. By Gerry Boland on 2014-12-09

Merge trunk

1157. By Gerry Boland on 2014-12-09

Delay Dash DBus service creation slightly, to avoid possible shell deadlock

1158. By Gerry Boland on 2015-01-05

Merge trunk

1159. By Gerry Boland on 2015-01-13

Merge trunk

1160. By Gerry Boland on 2015-01-15

Remove Dash block workaround

1161. By Gerry Boland on 2015-01-15

Merge trunk

Unmerged revisions

1161. By Gerry Boland on 2015-01-15

Merge trunk

1160. By Gerry Boland on 2015-01-15

Remove Dash block workaround

1159. By Gerry Boland on 2015-01-13

Merge trunk

1158. By Gerry Boland on 2015-01-05

Merge trunk

1157. By Gerry Boland on 2014-12-09

Delay Dash DBus service creation slightly, to avoid possible shell deadlock

1156. By Gerry Boland on 2014-12-09

Merge trunk

1155. By Gerry Boland on 2014-12-08

Bump unity-api & qtmir dep

1154. By Gerry Boland on 2014-12-03

I hate you whitespace cheker

1153. By Gerry Boland on 2014-12-03

Undo all changes to Shell and Panel, start afresh

1152. By Gerry Boland on 2014-12-03

Merge current trunk

=== modified file 'debian/control'
--- debian/control	2014-08-15 17:37:07 +0000
+++ debian/control	2014-08-21 13:12:27 +0000
@@ -24,7 +24,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.8),
                libqt5xmlpatterns5-dev,
-               libunity-api-dev (>= 7.88),
+               libunity-api-dev (>= 7.89),
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,
@@ -84,7 +84,7 @@
          qmenumodel-qml (>= 0.2.8),
          qml-module-qtquick-xmllistmodel,
          qtdeclarative5-gsettings1.0,
-         qtdeclarative5-qtmir-plugin (>= 0.4.1),
+         qtdeclarative5-qtmir-plugin (>= 0.4.2),
          qtdeclarative5-ubuntu-telephony0.1,
          unity-launcher-impl-3,
          unity8-common (= ${source:Version}),
@@ -111,7 +111,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 0.1.49),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
-         unity-application-impl-2,
+         unity-application-impl-3,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-4,
@@ -158,7 +158,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-2,
+          unity-application-impl-3,
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell
  (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.

=== modified file 'include/paths.h.in'
--- include/paths.h.in	2014-04-17 08:06:29 +0000
+++ include/paths.h.in	2014-08-21 13:12:27 +0000
@@ -80,6 +80,14 @@
     return paths;
 }
 
+inline QString mockPluginsDir() {
+    if (isRunningInstalled()) {
+        return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
+    } else {
+        return QString("@CMAKE_BINARY_DIR@/tests/mocks");
+    }
+}
+
 inline QStringList shellDataDirs() {
     QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
     if (!isRunningInstalled()) {

=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2014-05-30 09:22:58 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2014-08-21 13:12:27 +0000
@@ -1,6 +1,6 @@
 include(FindPkgConfig)
 pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 
 add_definitions(-DSM_BUSNAME=systemBus)

=== modified file 'qml/Dash/graphics/phone/screenshots/vkb_portrait.png'
Binary files qml/Dash/graphics/phone/screenshots/vkb_portrait.png	2014-07-22 10:29:25 +0000 and qml/Dash/graphics/phone/screenshots/vkb_portrait.png	2014-08-21 13:12:27 +0000 differ
=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2014-07-10 13:36:41 +0000
+++ qml/Panel/Panel.qml	2014-08-21 13:12:27 +0000
@@ -22,7 +22,8 @@
 
 Item {
     id: root
-    readonly property real panelHeight: indicatorArea.y + d.indicatorHeight
+    readonly property real panelHeight: indicators.panelHeight + indicatorsSeparatorLine.height
+    readonly property real panelBottomY: indicatorArea.y + panelHeight
     property alias indicators: __indicators
     property alias callHint: __callHint
     property bool fullscreenMode: false
@@ -32,7 +33,7 @@
         property real darkenedOpacity: 0.6
         anchors {
             top: parent.top
-            topMargin: panelHeight
+            topMargin: panelBottomY
             left: parent.left
             right: parent.right
             bottom: parent.bottom
@@ -165,11 +166,6 @@
         }
     }
 
-    QtObject {
-        id: d
-        readonly property real indicatorHeight: indicators.panelHeight + indicatorsSeparatorLine.height
-    }
-
     states: [
         State {
             name: "onscreen" //fully opaque and visible at top edge of screen
@@ -184,7 +180,7 @@
             when: fullscreenMode
             PropertyChanges {
                 target: indicatorArea;
-                anchors.topMargin: indicators.state === "initial" ? -d.indicatorHeight : 0
+                anchors.topMargin: indicators.state === "initial" ? -panelHeight : 0
             }
         }
     ]

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-20 09:19:32 +0000
+++ qml/Shell.qml	2014-08-21 13:12:27 +0000
@@ -185,8 +185,7 @@
             Binding {
                 target: applicationsDisplayLoader.item
                 property: "maximizedAppTopMargin"
-                // Not just using panel.panelHeight as that changes depending on the focused app.
-                value: panel.indicators.panelHeight
+                value: panel.panelHeight
             }
             Binding {
                 target: applicationsDisplayLoader.item
@@ -209,7 +208,7 @@
     InputMethod {
         id: inputMethod
         objectName: "inputMethod"
-        anchors { fill: parent; topMargin: panel.panelHeight }
+        anchors { fill: parent; topMargin: panel.panelBottomY }
         z: notifications.useModal || panel.indicators.shown ? overlay.z + 1 : overlay.z - 1
     }
 
@@ -237,17 +236,17 @@
         id: lockscreen
         objectName: "lockscreen"
 
-        readonly property int backgroundTopMargin: -panel.panelHeight
+        readonly property int backgroundTopMargin: -panel.panelBottomY
 
         hides: [launcher, panel.indicators]
         shown: false
         enabled: true
         showAnimation: StandardAnimation { property: "opacity"; to: 1 }
         hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
-        y: panel.panelHeight
+        y: panel.panelBottomY
         visible: required
         width: parent.width
-        height: parent.height - panel.panelHeight
+        height: parent.height - panel.panelBottomY
         background: shell.background
         alphaNumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard
         minPinLength: 4
@@ -354,9 +353,9 @@
         // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
         id: greeterWrapper
         x: launcher.progress
-        y: panel.panelHeight
+        y: panel.panelBottomY
         width: parent.width
-        height: parent.height - panel.panelHeight
+        height: parent.height - panel.panelBottomY
 
         Behavior on x {
             enabled: !launcher.dashSwipe
@@ -562,9 +561,9 @@
             model: NotificationBackend.Model
             margin: units.gu(1)
 
-            y: panel.panelHeight
+            y: panel.panelBottomY
             width: parent.width
-            height: parent.height - panel.panelHeight
+            height: parent.height - panel.panelBottomY
 
             states: [
                 State {

=== removed file 'qml/Stages/AppSurfaceContainer.qml'
--- qml/Stages/AppSurfaceContainer.qml	2014-08-08 09:40:41 +0000
+++ qml/Stages/AppSurfaceContainer.qml	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-import QtQuick 2.0
-import "Animations"
-
-SurfaceContainer {
-    id: container
-    property var promptSurfaces
-
-    property bool appHasCreatedASurface: false
-
-    onSurfaceChanged: {
-        if (surface) {
-            if (!appHasCreatedASurface) {
-                surface.visible = false; // hide until splash screen removed
-                appHasCreatedASurface = true;
-            }
-        }
-    }
-
-    function revealSurface() {
-        surface.visible = true;
-        splashLoader.source = "";
-    }
-
-    Timer { //FIXME - need to delay removing splash screen to allow surface resize to complete
-        id: surfaceRevealDelay
-        interval: 100
-        onTriggered: surfaceContainer.revealSurface()
-    }
-
-    Loader {
-        z: 3
-        id: splashLoader
-        anchors.fill: parent
-    }
-
-    Repeater {
-        model: container.promptSurfaces
-
-        delegate: SurfaceContainer {
-            anchors {
-                fill: container
-                topMargin: container.surface.anchors.topMargin
-                rightMargin: container.surface.anchors.rightMargin
-                bottomMargin: container.surface.anchors.bottomMargin
-                leftMargin: container.surface.anchors.leftMargin
-            }
-
-            z: 4 + index
-            surface: modelData
-
-            Component.onCompleted: {
-                animateIn();
-            }
-        }
-    }
-
-    StateGroup {
-        id: appSurfaceState
-        states: [
-            State {
-                name: "noSurfaceYet"
-                when: !surfaceContainer.appHasCreatedASurface
-                StateChangeScript {
-                    script: { splashLoader.setSource("Splash.qml", { "name": model.name, "image": model.icon }); }
-                }
-            },
-            State {
-                name: "hasSurface"
-                when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface !== null)
-                StateChangeScript { script: { surfaceRevealDelay.start(); } }
-            },
-            State {
-                name: "surfaceLostButAppStillAlive"
-                when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface === null)
-                // TODO - use app snapshot
-            }
-        ]
-        state: "noSurfaceYet"
-    }
-}

=== added file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/ApplicationWindow.qml	2014-08-21 13:12:27 +0000
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Unity.Application 0.1
+
+Item {
+    id: root
+
+    // to be read from outside
+    readonly property bool fullscreen: application ? application.fullscreen : false
+
+    // to be set from outside
+    property bool interactive: true
+    property QtObject application
+
+    QtObject {
+        id: d
+
+        // helpers so that we don't have to check for the existence of an application everywhere
+        // (in order to avoid breaking qml binding due to a javascript exception)
+        readonly property string name: root.application ? root.application.name : ""
+        readonly property url icon: root.application ? root.application.icon : ""
+        readonly property Item surface: root.application ? root.application.surface : null
+        readonly property int applicationState: root.application ? root.application.state : -1
+        readonly property var promptSurfaces: root.application ? root.application.promptSurfaces : null
+
+        // Whether the Application had a surface before but lost it.
+        property bool hadSurface: false
+
+        property bool needToTakeScreenshot:
+            d.surface && d.surfaceInitialized && screenshotImage.status === Image.Null
+            && d.applicationState === ApplicationInfo.Stopped
+        onNeedToTakeScreenshotChanged: {
+            if (needToTakeScreenshot) {
+                screenshotImage.take();
+            }
+        }
+
+        //FIXME - this is a hack to avoid the first few rendered frames as they
+        // might show the UI accommodating due to surface resizes on startup.
+        // Remove this when possible
+        property bool surfaceInitialized: false
+        onSurfaceChanged: {
+            if (surface) {
+                surfaceInitTimer.start();
+            } else {
+                hadSurface = true;
+                surfaceInitialized = false;
+            }
+        }
+    }
+
+    Timer {
+        id: surfaceInitTimer
+        interval: 100
+        onTriggered: { if (d.surface) {d.surfaceInitialized = true;} }
+    }
+
+    Binding {
+        target: d.surface
+        when: d.surface
+        property: "enabled"
+        value: root.interactive
+    }
+    Binding {
+        target: d.surface
+        when: d.surface
+        property: "focus"
+        value: root.interactive
+    }
+    Connections {
+        target: d.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.
+        onFocusChanged: forceSurfaceActiveFocusIfReady();
+        onParentChanged: forceSurfaceActiveFocusIfReady();
+        onEnabledChanged: forceSurfaceActiveFocusIfReady();
+        function forceSurfaceActiveFocusIfReady() {
+            if (d.surface.focus && d.surface.parent === surfaceContainer && d.surface.enabled) {
+                d.surface.forceActiveFocus();
+            }
+        }
+    }
+
+    SurfaceContainer {
+        id: surfaceContainer
+        objectName: "surfaceContainer"
+        anchors.fill: parent
+        surface: d.surface
+    }
+
+    Image {
+        id: screenshotImage
+        objectName: "screenshotImage"
+        source: ""
+        anchors.fill: parent
+
+        function take() {
+            // Format: "image://application/$APP_ID/$CURRENT_TIME_MS"
+            // eg: "image://application/calculator-app/123456"
+            var timeMs = new Date().getTime();
+            source = "image://application/" + root.application.appId + "/" + timeMs;
+        }
+
+        // Save memory by using a half-resolution (thus quarter size) screenshot
+        sourceSize.width: root.width / 2
+        sourceSize.height: root.height / 2
+    }
+
+    Loader {
+        id: splashLoader
+        visible: active
+        active: false
+        anchors.fill: surfaceContainer
+        sourceComponent: Component {
+            Splash { name: d.name; image: d.icon }
+        }
+    }
+
+    Repeater {
+        model: d.promptSurfaces
+
+        delegate: SurfaceContainer {
+            anchors {
+                fill: container
+            }
+
+            surface: modelData
+
+            Component.onCompleted: {
+                animateIn();
+            }
+        }
+    }
+
+    StateGroup {
+        objectName: "applicationWindowStateGroup"
+        states: [
+            State {
+                name: "void"
+                when:
+                     d.hadSurface && (!d.surface || !d.surfaceInitialized)
+                     &&
+                     screenshotImage.status !== Image.Ready
+            },
+            State {
+                name: "splashScreen"
+                when:
+                     !d.hadSurface && (!d.surface || !d.surfaceInitialized)
+                     &&
+                     screenshotImage.status !== Image.Ready
+            },
+            State {
+                name: "surface"
+                when:
+                      (d.surface && d.surfaceInitialized)
+                      &&
+                      (d.applicationState !== ApplicationInfo.Stopped
+                       || screenshotImage.status !== Image.Ready)
+            },
+            State {
+                name: "screenshot"
+                when:
+                      screenshotImage.status === Image.Ready
+                      &&
+                      (d.applicationState === ApplicationInfo.Stopped
+                       || !d.surface || !d.surfaceInitialized)
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: ""; to: "splashScreen"
+                PropertyAction { target: splashLoader; property: "active"; value: true }
+            },
+            Transition {
+                from: "splashScreen"; to: "surface"
+                SequentialAnimation {
+                    PropertyAction { target: surfaceContainer
+                                     property: "visible"; value: true }
+                    UbuntuNumberAnimation { target: splashLoader; property: "opacity";
+                                            from: 1.0; to: 0.0
+                                            duration: UbuntuAnimation.BriskDuration }
+                    PropertyAction { target: splashLoader; property: "active"; value: false }
+                }
+            },
+            Transition {
+                from: "surface"; to: "splashScreen"
+                SequentialAnimation {
+                    PropertyAction { target: splashLoader; property: "active"; value: true }
+                    PropertyAction { target: surfaceContainer
+                                     property: "visible"; value: true }
+                    UbuntuNumberAnimation { target: splashLoader; property: "opacity";
+                                            from: 0.0; to: 1.0
+                                            duration: UbuntuAnimation.BriskDuration }
+                }
+            },
+            Transition {
+                from: "surface"; to: "screenshot"
+                SequentialAnimation {
+                    PropertyAction { target: screenshotImage
+                                     property: "visible"; value: true }
+                    UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
+                                            from: 0.0; to: 1.0
+                                            duration: UbuntuAnimation.BriskDuration }
+                    PropertyAction { target: surfaceContainer
+                                     property: "visible"; value: false }
+                    ScriptAction { script: { if (d.surface) { d.surface.release(); } } }
+                }
+            },
+            Transition {
+                from: "screenshot"; to: "surface"
+                SequentialAnimation {
+                    PropertyAction { target: surfaceContainer
+                                     property: "visible"; value: true }
+                    UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
+                                            from: 1.0; to: 0.0
+                                            duration: UbuntuAnimation.BriskDuration }
+                    PropertyAction { target: screenshotImage; property: "visible"; value: false }
+                    PropertyAction { target: screenshotImage; property: "source"; value: "" }
+                }
+            },
+            Transition {
+                from: "surface"; to: "void"
+                SequentialAnimation {
+                    PropertyAction { target: surfaceContainer; property: "visible"; value: false }
+                    ScriptAction { script: { if (d.surface) { d.surface.release(); } } }
+                }
+            },
+            Transition {
+                from: "void"; to: "surface"
+                SequentialAnimation {
+                    PropertyAction { target: surfaceContainer; property: "opacity"; value: 0.0 }
+                    PropertyAction { target: surfaceContainer; property: "visible"; value: true }
+                    UbuntuNumberAnimation { target: surfaceContainer; property: "opacity";
+                                            from: 0.0; to: 1.0
+                                            duration: UbuntuAnimation.BriskDuration }
+                }
+            }
+        ]
+    }
+
+}

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2014-07-29 15:22:08 +0000
+++ qml/Stages/PhoneStage.qml	2014-08-21 13:12:27 +0000
@@ -86,6 +86,7 @@
 
     QtObject {
         id: priv
+        objectName: "priv"
 
         property string focusedAppId: ApplicationManager.focusedApplicationId
         property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
@@ -104,13 +105,26 @@
             return -1;
         }
 
+        function surfaceSizer(surface) {
+            surface.width = root.width;
+            surface.height = root.height - maximizedAppTopMargin;
+            return surface;
+        }
+
+        Component.onCompleted: {
+            ApplicationManager.surfaceAboutToBeCreatedCallback = priv.surfaceSizer;
+        }
+        Component.onDestruction: {
+            ApplicationManager.surfaceAboutToBeCreatedCallback = null;
+        }
     }
 
     Flickable {
         id: spreadView
         objectName: "spreadView"
         anchors.fill: parent
-        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) && draggedIndex == -1
+        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
+                     && draggedDelegateCount === 0
         contentWidth: spreadRow.width - shift
         contentX: -shift
 
@@ -148,7 +162,7 @@
         property int phase: 0
 
         property int selectedIndex: -1
-        property int draggedIndex: -1
+        property int draggedDelegateCount: 0
         property int closingIndex: -1
 
         property bool focusChanging: false
@@ -269,7 +283,7 @@
                     swipeToCloseEnabled: spreadView.interactive
                     maximizedAppTopMargin: root.maximizedAppTopMargin
                     dropShadow: spreadView.active ||
-                                priv.focusedAppDelegate.x !== 0
+                                (priv.focusedAppDelegate && priv.focusedAppDelegate.x !== 0)
 
                     readonly property bool isDash: model.appId == "unity8-dash"
 
@@ -290,6 +304,10 @@
                         // Otherwise line up for the spread
                         return spreadView.width + (index - 1) * spreadView.tileDistance;
                     }
+
+                    application: ApplicationManager.get(index)
+                    closeable: !isDash
+
                     property real behavioredIndex: index
                     Behavior on behavioredIndex {
                         enabled: spreadView.closingIndex >= 0
@@ -372,8 +390,15 @@
                         }
                     }
 
+                    onDraggedChanged: {
+                        if (dragged) {
+                            spreadView.draggedDelegateCount++;
+                        } else {
+                            spreadView.draggedDelegateCount--;
+                        }
+                    }
+
                     onClosed: {
-                        spreadView.draggedIndex = -1;
                         spreadView.closingIndex = index;
                         ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
                     }

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2014-08-08 09:40:41 +0000
+++ qml/Stages/SpreadDelegate.qml	2014-08-21 13:12:27 +0000
@@ -14,75 +14,43 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Michael Zanetti <[e-mail]>
-*/
+ *          Daniel d'Andrada <[e-mail]>
+ */
 
 import QtQuick 2.0
-import Unity.Application 0.1
 import Ubuntu.Components 1.1
 import "../Components"
 
 Item {
     id: root
 
+    // to be read from outside
+    readonly property bool dragged: dragArea.moving
+    signal clicked()
+    signal closed()
+
     // to be set from outside
     property bool interactive: true
     property bool dropShadow: true
     property real maximizedAppTopMargin
     property alias swipeToCloseEnabled: dragArea.enabled
-
-    readonly property bool isFullscreen: surface !== null && surfaceContainer.surface.anchors.topMargin == 0
-
-    signal clicked()
-    signal closed()
-
-    AppSurfaceContainer {
-        id: surfaceContainer
-        objectName: "surfaceContainer"
-        anchors.fill: parent
-        surface: model.surface
-        promptSurfaces: model.application.promptSurfaces
-
-        Binding {
-            target: surfaceContainer.surface
-            property: "anchors.topMargin"
-            value: {
-                return surfaceContainer.surface.state === MirSurfaceItem.Fullscreen ? 0 : maximizedAppTopMargin;
-            }
-        }
-
-        Binding {
-            target: surface
-            property: "enabled"
-            value: root.interactive
-        }
-        Binding {
-            target: surface
-            property: "focus"
-            value: root.interactive
-        }
-
-        Connections {
-            target: 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.
-            onFocusChanged: forceSurfaceActiveFocusIfReady();
-            onParentChanged: forceSurfaceActiveFocusIfReady();
-            onEnabledChanged: forceSurfaceActiveFocusIfReady();
-            function forceSurfaceActiveFocusIfReady() {
-                if (surface.focus && surface.parent === surfaceContainer && surface.enabled) {
-                    surface.forceActiveFocus();
-                }
-            }
-        }
+    property bool closeable
+    property alias application: appWindow.application
+
+    Item {
+        objectName: "appWindowWithShadow"
+
+        y: dragArea.distance
+        width: parent.width
+        height: parent.height
 
         BorderImage {
-            id: dropShadowImage
             anchors {
-                fill: parent
+                fill: appWindow
                 leftMargin: -units.gu(2)
                 rightMargin: -units.gu(2)
                 bottomMargin: -units.gu(2)
-                topMargin: -units.gu(2) + (root.isFullscreen ? 0 : maximizedAppTopMargin)
+                topMargin: -units.gu(2)
             }
             source: "graphics/dropshadow.png"
             border { left: 50; right: 50; top: 50; bottom: 50 }
@@ -90,21 +58,26 @@
             Behavior on opacity { UbuntuNumberAnimation {} }
         }
 
-        transform: Translate {
-            y: dragArea.distance
+        ApplicationWindow {
+            id: appWindow
+            anchors {
+                fill: parent
+                topMargin: appWindow.fullscreen ? 0 : maximizedAppTopMargin
+            }
+
+            interactive: root.interactive
         }
     }
 
     DraggingArea {
         id: dragArea
+        objectName: "dragArea"
         anchors.fill: parent
 
         property bool moving: false
         property real distance: 0
 
-        onMovingChanged: {
-            spreadView.draggedIndex = moving ? index : -1
-        }
+        readonly property real minSpeedToClose: units.gu(40)
 
         onDragValueChanged: {
             if (!dragging) {
@@ -123,15 +96,15 @@
         }
 
         onDragEnd: {
-            if (model.appId == "unity8-dash") {
+            if (!root.closeable) {
                 animation.animate("center")
                 return;
             }
 
             // velocity and distance values specified by design prototype
-            if ((dragVelocity < -units.gu(40) && distance < -units.gu(8)) || distance < -root.height / 2) {
+            if ((dragVelocity < -minSpeedToClose && distance < -units.gu(8)) || distance < -root.height / 2) {
                 animation.animate("up")
-            } else if ((dragVelocity > units.gu(40) && distance > units.gu(8)) || distance > root.height / 2) {
+            } else if ((dragVelocity > minSpeedToClose  && distance > units.gu(8)) || distance > root.height / 2) {
                 animation.animate("down")
             } else {
                 animation.animate("center")
@@ -140,6 +113,7 @@
 
         UbuntuNumberAnimation {
             id: animation
+            objectName: "closeAnimation"
             target: dragArea
             property: "distance"
             property bool requestClose: false
@@ -164,9 +138,10 @@
             onRunningChanged: {
                 if (!running) {
                     dragArea.moving = false;
-                    dragArea.distance = 0;
                     if (requestClose) {
                         root.closed();
+                    } else {
+                        dragArea.distance = 0;
                     }
                 }
             }

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2014-08-07 17:15:00 +0000
+++ qml/Stages/SurfaceContainer.qml	2014-08-21 13:12:27 +0000
@@ -45,7 +45,7 @@
     }
 
     Repeater {
-        model: surface.childSurfaces
+        model: surface ? surface.childSurfaces : null
 
         delegate: Loader {
             z: 2

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2014-07-29 13:45:30 +0000
+++ qml/Stages/TabletStage.qml	2014-08-21 13:12:27 +0000
@@ -106,6 +106,27 @@
             }
             return oneWayFlick;
         }
+
+        function surfaceSizer(surface) {
+            surface.width = root.width;
+            surface.height = root.height - maximizedAppTopMargin;
+
+            if (surface.appId) { // if app side stage, set different width
+                var app = ApplicationManager.findApplication(surface.appId);
+                if (app && app.stage === ApplicationInfoInterface.SideStage) {
+                    surface.width = spreadView.sideStageWidth;
+                }
+            }
+
+            return surface;
+        }
+
+        Component.onCompleted: {
+            ApplicationManager.surfaceAboutToBeCreatedCallback = priv.surfaceSizer;
+        }
+        Component.onDestruction: {
+            ApplicationManager.surfaceAboutToBeCreatedCallback = null;
+        }
     }
 
     Connections {
@@ -145,7 +166,8 @@
     Flickable {
         id: spreadView
         anchors.fill: parent
-        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1) && draggedIndex == -1
+        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
+                     && draggedDelegateCount === 0
         contentWidth: spreadRow.width - shift
         contentX: -shift
 
@@ -189,7 +211,7 @@
         readonly property real snapPosition: 0.75
 
         property int selectedIndex: -1
-        property int draggedIndex: -1
+        property int draggedDelegateCount: 0
         property int closingIndex: -1
 
         property bool sideStageDragging: sideStageDragHandle.dragging
@@ -475,6 +497,8 @@
                     swipeToCloseEnabled: spreadView.interactive
                     maximizedAppTopMargin: root.maximizedAppTopMargin
                     dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 ? root.inverseProgress : 0
+                    application: ApplicationManager.get(index)
+                    closeable: !isDash
 
                     readonly property bool isDash: model.appId == "unity8-dash"
 
@@ -533,8 +557,15 @@
                         }
                     }
 
+                    onDraggedChanged: {
+                        if (dragged) {
+                            spreadView.draggedDelegateCount++;
+                        } else {
+                            spreadView.draggedDelegateCount--;
+                        }
+                    }
+
                     onClosed: {
-                        spreadView.draggedIndex = -1;
                         spreadView.closingIndex = index;
                         ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
                     }

=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
--- qml/Stages/TransformedSpreadDelegate.qml	2014-07-29 13:45:30 +0000
+++ qml/Stages/TransformedSpreadDelegate.qml	2014-08-21 13:12:27 +0000
@@ -309,7 +309,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

=== modified file 'tests/mocks/Unity/Application/Application.qmltypes'
--- tests/mocks/Unity/Application/Application.qmltypes	2014-08-14 01:28:06 +0000
+++ tests/mocks/Unity/Application/Application.qmltypes	2014-08-21 13:12:27 +0000
@@ -8,25 +8,6 @@
 
 Module {
     Component {
-        name: "ApplicationImage"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["Unity.Application/ApplicationImage 0.1"]
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "FillMode"
-            values: {
-                "Stretch": 0,
-                "PreserveAspectCrop": 1
-            }
-        }
-        Property { name: "source"; type: "ApplicationInfo"; isPointer: true }
-        Property { name: "fillMode"; type: "FillMode" }
-        Property { name: "ready"; type: "bool" }
-        Method { name: "scheduleUpdate" }
-        Method { name: "updateFromCache" }
-    }
-    Component {
         name: "ApplicationInfo"
         prototype: "unity::shell::application::ApplicationInfoInterface"
         exports: ["Unity.Application/ApplicationInfo 0.1"]

=== removed file 'tests/mocks/Unity/Application/ApplicationImage.cpp'
--- tests/mocks/Unity/Application/ApplicationImage.cpp	2013-06-05 22:03:08 +0000
+++ tests/mocks/Unity/Application/ApplicationImage.cpp	1970-01-01 00:00:00 +0000
@@ -1,123 +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/>.
- */
-
-#include "ApplicationImage.h"
-#include "ApplicationInfo.h"
-
-#include <QQmlEngine>
-#include <QQmlComponent>
-#include <QQmlContext>
-
-ApplicationImage::ApplicationImage(QQuickItem* parent)
-    : QQuickItem(parent),
-    m_source(NULL),
-    m_fillMode(Stretch),
-    m_ready(false),
-    m_imageComponent(0),
-    m_imageItem(0)
-{
-}
-
-void ApplicationImage::setSource(ApplicationInfo* source)
-{
-    if (m_source != source) {
-        if (m_source)
-            disconnect(m_source, &ApplicationInfo::imageQmlChanged,
-                       this, &ApplicationImage::updateImage);
-
-        m_source = source;
-
-        if (m_source) {
-            connect(m_source, &ApplicationInfo::imageQmlChanged,
-                   this, &ApplicationImage::updateImage);
-        }
-        updateImage();
-
-        Q_EMIT sourceChanged();
-    }
-}
-
-void ApplicationImage::setFillMode(FillMode newFillMode)
-{
-    if (m_fillMode != newFillMode) {
-        m_fillMode = newFillMode;
-        Q_EMIT fillModeChanged();
-    }
-}
-
-void ApplicationImage::setReady(bool value)
-{
-    if (value != m_ready) {
-        m_ready = value;
-        Q_EMIT readyChanged();
-    }
-}
-
-void ApplicationImage::destroyImage()
-{
-    delete m_imageItem;
-    m_imageItem = 0;
-    delete m_imageComponent;
-    m_imageComponent = 0;
-    m_qmlUsed.clear();
-    setReady(false);
-}
-
-void ApplicationImage::updateImage()
-{
-    if (!m_source || m_source->imageQml().isEmpty()) {
-        destroyImage();
-    } else if (m_source->imageQml() != m_qmlUsed) {
-        destroyImage();
-        createImageItem();
-    }
-}
-
-void ApplicationImage::createImageItem()
-{
-
-    if (!m_imageComponent)
-        createImageComponent();
-
-    // only create the windowItem one the component is ready
-    if (!m_imageComponent->isReady()) {
-        connect(m_imageComponent, &QQmlComponent::statusChanged,
-                this, &ApplicationImage::onImageComponentStatusChanged);
-    } else {
-        doCreateImageItem();
-    }
-
-}
-
-void ApplicationImage::createImageComponent()
-{
-    QQmlEngine *engine = QQmlEngine::contextForObject(this)->engine();
-    m_imageComponent = new QQmlComponent(engine, this);
-    m_imageComponent->setData(m_source->imageQml().toLatin1(), QUrl());
-}
-
-void ApplicationImage::doCreateImageItem()
-{
-    m_imageItem = qobject_cast<QQuickItem *>(m_imageComponent->create());
-    m_imageItem->setParentItem(this);
-    setReady(true);
-}
-
-void ApplicationImage::onImageComponentStatusChanged(QQmlComponent::Status status)
-{
-    if (status == QQmlComponent::Ready && !m_imageItem)
-        doCreateImageItem();
-}

=== removed file 'tests/mocks/Unity/Application/ApplicationImage.h'
--- tests/mocks/Unity/Application/ApplicationImage.h	2013-06-05 22:03:08 +0000
+++ tests/mocks/Unity/Application/ApplicationImage.h	1970-01-01 00:00:00 +0000
@@ -1,79 +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/>.
- */
-
-#ifndef APPLICATION_IMAGE_H
-#define APPLICATION_IMAGE_H
-
-#include <QQuickItem>
-
-class ApplicationInfo;
-
-/* Fake implementation of ApplicationImage
-
-   That fake implementation is not made in QML just because we can only declare
-   enumerations in C++. We can't even make readonly properties to mimic an enum
-   because properties must begin with a lower case letter.
-*/
-class ApplicationImage : public QQuickItem {
-    Q_OBJECT
-    Q_ENUMS(FillMode)
-    Q_PROPERTY(ApplicationInfo* source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
-    Q_PROPERTY(bool ready READ ready WRITE setReady NOTIFY readyChanged)
-
-public:
-    explicit ApplicationImage(QQuickItem* parent = 0);
-    virtual ~ApplicationImage() {}
-
-    enum FillMode { Stretch, PreserveAspectCrop };
-
-    ApplicationInfo* source() const { return m_source; }
-    void setSource(ApplicationInfo* source);
-
-    FillMode fillMode() const  { return m_fillMode; }
-    void setFillMode(FillMode);
-
-    void setReady(bool value);
-    bool ready() const { return m_ready; }
-
-    Q_INVOKABLE void scheduleUpdate() {}
-    Q_INVOKABLE void updateFromCache() {}
-
-Q_SIGNALS:
-    void sourceChanged();
-    void fillModeChanged();
-    void readyChanged();
-
-private Q_SLOTS:
-    void updateImage();
-    void onImageComponentStatusChanged(QQmlComponent::Status status);
-
-private:
-    void createImageItem();
-    void createImageComponent();
-    void doCreateImageItem();
-    void destroyImage();
-
-    ApplicationInfo* m_source;
-    FillMode m_fillMode;
-    bool m_ready;
-    QQmlComponent *m_imageComponent;
-    QQuickItem* m_imageItem;
-    // the QML script used to create the current m_imageItem
-    QString m_qmlUsed;
-};
-
-#endif // APPLICATION_IMAGE_H

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-08-16 16:38:43 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-08-21 13:12:27 +0000
@@ -18,6 +18,8 @@
 #include "MirSurfaceItem.h"
 #include "SurfaceManager.h"
 
+#include <paths.h>
+
 #include <QGuiApplication>
 #include <QQuickItem>
 #include <QQuickView>
@@ -31,10 +33,10 @@
     , m_state(Starting)
     , m_focused(false)
     , m_fullscreen(false)
+    , m_surface(0)
+    , m_manualSurfaceCreation(false)
     , m_parentItem(0)
-    , m_surface(0)
 {
-    connect(this, &ApplicationInfo::stateChanged, this, &ApplicationInfo::onStateChanged);
 }
 
 ApplicationInfo::ApplicationInfo(QObject *parent)
@@ -43,10 +45,10 @@
     , m_state(Starting)
     , m_focused(false)
     , m_fullscreen(false)
+    , m_surface(0)
+    , m_manualSurfaceCreation(false)
     , m_parentItem(0)
-    , m_surface(0)
 {
-    connect(this, &ApplicationInfo::stateChanged, this, &ApplicationInfo::onStateChanged);
 }
 
 ApplicationInfo::~ApplicationInfo()
@@ -58,28 +60,21 @@
     }
 }
 
-void ApplicationInfo::onStateChanged(State state)
-{
-    if (state == ApplicationInfo::Running) {
-        QTimer::singleShot(1000, this, SLOT(createSurface()));
-    } else if (state == ApplicationInfo::Stopped) {
-        setSurface(nullptr);
-    }
-}
-
 void ApplicationInfo::createSurface()
 {
     if (m_surface || state() == ApplicationInfo::Stopped) return;
 
+    QUrl screenshotUrl = QString("file://%1").arg(m_screenshotFileName);
+
     setSurface(new MirSurfaceItem(name(),
                                    MirSurfaceItem::Normal,
                                    fullscreen() ? MirSurfaceItem::Fullscreen : MirSurfaceItem::Maximized,
-                                   screenshot()));
+                                   screenshotUrl));
 }
 
 void ApplicationInfo::setSurface(MirSurfaceItem* surface)
 {
-    qDebug() << "Application::setSurface - appId=" << appId() << "surface=" << surface;
+    qDebug() << "Application::setSurface - appId=" << appId() << "surface=" << (surface ? surface->name() : "null");
     if (m_surface == surface)
         return;
 
@@ -98,7 +93,6 @@
     }
 
     Q_EMIT surfaceChanged(m_surface);
-    SurfaceManager::singleton()->registerSurface(m_surface);
 }
 
 void ApplicationInfo::addPromptSurface(MirSurfaceItem* surface)
@@ -152,3 +146,77 @@
         return nullptr;
     return p->m_promptSurfaces[index];
 }
+
+void ApplicationInfo::setIconId(const QString &iconId)
+{
+    setIcon(QString("file://%1/graphics/applicationIcons/[e-mail]")
+            .arg(qmlDirectory())
+            .arg(iconId));
+}
+
+void ApplicationInfo::setScreenshotId(const QString &screenshotId)
+{
+    m_screenshotFileName = QString("%1/Dash/graphics/phone/screenshots/[e-mail]")
+            .arg(qmlDirectory())
+            .arg(screenshotId);
+}
+
+void ApplicationInfo::setName(const QString &value)
+{
+    if (value != m_name) {
+        m_name = value;
+        Q_EMIT nameChanged(value);
+    }
+}
+
+void ApplicationInfo::setIcon(const QUrl &value)
+{
+    if (value != m_icon) {
+        m_icon = value;
+        Q_EMIT iconChanged(value);
+    }
+}
+
+void ApplicationInfo::setStage(Stage value)
+{
+    if (value != m_stage) {
+        m_stage = value;
+        Q_EMIT stageChanged(value);
+    }
+}
+
+void ApplicationInfo::setState(State value)
+{
+    if (value != m_state) {
+        m_state = value;
+        Q_EMIT stateChanged(value);
+
+        if (!m_manualSurfaceCreation && m_state == ApplicationInfo::Running) {
+            QTimer::singleShot(1000, this, SLOT(createSurface()));
+        }
+    }
+}
+
+void ApplicationInfo::setFocused(bool value)
+{
+    if (value != m_focused) {
+        m_focused = value;
+        Q_EMIT focusedChanged(value);
+    }
+}
+
+void ApplicationInfo::setFullscreen(bool value)
+{
+    if (value != m_fullscreen) {
+        m_fullscreen = value;
+        Q_EMIT fullscreenChanged(value);
+    }
+}
+
+void ApplicationInfo::setManualSurfaceCreation(bool value)
+{
+    if (value != m_manualSurfaceCreation) {
+        m_manualSurfaceCreation = value;
+        Q_EMIT manualSurfaceCreationChanged(value);
+    }
+}

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2014-08-07 17:15:00 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2014-08-21 13:12:27 +0000
@@ -26,63 +26,52 @@
 // unity-api
 #include <unity/shell/application/ApplicationInfoInterface.h>
 
-// A pretty dumb file. Just a container for properties.
-// Implemented in C++ instead of QML just because of the enumerations
-// See QTBUG-14861
-
 using namespace unity::shell::application;
 
 class ApplicationInfo : public ApplicationInfoInterface {
     Q_OBJECT
 
     Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
-    Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
     Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
     Q_PROPERTY(QQmlListProperty<MirSurfaceItem> promptSurfaces READ promptSurfaces NOTIFY promptSurfacesChanged DESIGNABLE false)
 
     // Only exists in this fake implementation
 
-    // QML component used to represent its image/screenhot
-    Q_PROPERTY(QString imageQml READ imageQml WRITE setImageQml NOTIFY imageQmlChanged)
-
-    // QML component used to represent the application window
-    Q_PROPERTY(QString windowQml READ windowQml WRITE setWindowQml NOTIFY windowQmlChanged)
+    // whether the test code will explicitly control the creation of the application surface
+    Q_PROPERTY(bool manualSurfaceCreation READ manualSurfaceCreation WRITE setManualSurfaceCreation NOTIFY manualSurfaceCreationChanged)
 
 public:
     ApplicationInfo(QObject *parent = NULL);
     ApplicationInfo(const QString &appId, QObject *parent = NULL);
     ~ApplicationInfo();
 
-    #define IMPLEMENT_PROPERTY(name, Name, type) \
-    public: \
-    type name() const { return m_##name; } \
-    void set##Name(const type& value) \
-    { \
-        if (m_##name != value) { \
-            m_##name = value; \
-            Q_EMIT name##Changed(value); \
-        } \
-    } \
-    Q_SIGNALS: \
-    void name##Changed(const type&); \
-    private: \
-    type m_##name;
-
-    IMPLEMENT_PROPERTY(appId, AppId, QString)
-    IMPLEMENT_PROPERTY(name, Name, QString)
-    IMPLEMENT_PROPERTY(comment, Comment, QString)
-    IMPLEMENT_PROPERTY(icon, Icon, QUrl)
-    IMPLEMENT_PROPERTY(stage, Stage, Stage)
-    IMPLEMENT_PROPERTY(state, State, State)
-    IMPLEMENT_PROPERTY(focused, Focused, bool)
-    IMPLEMENT_PROPERTY(fullscreen, Fullscreen, bool)
-    IMPLEMENT_PROPERTY(imageQml, ImageQml, QString)
-    IMPLEMENT_PROPERTY(windowQml, WindowQml, QString)
-    IMPLEMENT_PROPERTY(screenshot, Screenshot, QUrl)
-
-    #undef IMPLEMENT_PROPERTY
-
-public:
+    void setIconId(const QString &iconId);
+    void setScreenshotId(const QString &screenshotId);
+
+    void setAppId(const QString &value) { m_appId = value; }
+    QString appId() const override { return m_appId; }
+
+    void setName(const QString &value);
+    QString name() const override { return m_name; }
+
+    QString comment() const override { return QString(); }
+
+    QUrl icon() const override { return m_icon; }
+
+    void setStage(Stage value);
+    Stage stage() const override { return m_stage; }
+
+    Q_INVOKABLE void setState(State value);
+    State state() const override { return m_state; }
+
+    void setFocused(bool value);
+    bool focused() const override { return m_focused; }
+
+    QString screenshot() const { return m_screenshotFileName; }
+
+    void setFullscreen(bool value);
+    bool fullscreen() const { return m_fullscreen; }
+
     void setSurface(MirSurfaceItem* surface);
     MirSurfaceItem* surface() const { return m_surface; }
 
@@ -92,21 +81,38 @@
     QList<MirSurfaceItem*> promptSurfaceList() const;
     QQmlListProperty<MirSurfaceItem> promptSurfaces();
 
+    bool manualSurfaceCreation() const { return m_manualSurfaceCreation; }
+    void setManualSurfaceCreation(bool value);
+
 Q_SIGNALS:
     void surfaceChanged(MirSurfaceItem*);
     void promptSurfacesChanged();
-
-private Q_SLOTS:
-    void onStateChanged(State state);
-
-    void createSurface();
+    void fullscreenChanged(bool value);
+    void manualSurfaceCreationChanged(bool value);
+
+public Q_SLOTS:
+    Q_INVOKABLE void createSurface();
 
 private:
     static int promptSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop);
     static MirSurfaceItem* promptSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index);
+    void setIcon(const QUrl &value);
+    void setScreenshot(const QUrl &value);
+
+    QString m_screenshotFileName;
+
+    QString m_appId;
+    QString m_name;
+    QUrl m_icon;
+    Stage m_stage;
+    State m_state;
+    bool m_focused;
+    bool m_fullscreen;
+    MirSurfaceItem* m_surface;
+
+    bool m_manualSurfaceCreation;
 
     QQuickItem *m_parentItem;
-    MirSurfaceItem* m_surface;
     QList<MirSurfaceItem*> m_promptSurfaces;
 };
 

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2014-08-07 17:15:00 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2014-08-21 13:12:27 +0000
@@ -48,6 +48,7 @@
 ApplicationManager::ApplicationManager(QObject *parent)
     : ApplicationManagerInterface(parent)
     , m_suspended(false)
+    , m_surfaceAboutToBeCreatedCallback(QJSValue::UndefinedValue)
 {
     m_roleNames.insert(RoleSurface, "surface");
     m_roleNames.insert(RoleFullscreen, "fullscreen");
@@ -55,14 +56,32 @@
 
     buildListOfAvailableApplications();
 
+    // polling to find out when the toplevel window has been created as there's
+    // no signal telling us that
+    connect(&m_windowCreatedTimer, &QTimer::timeout,
+            this, &ApplicationManager::onWindowCreatedTimerTimeout);
+    m_windowCreatedTimer.setSingleShot(false);
+    m_windowCreatedTimer.start(200);
+}
+
+ApplicationManager::~ApplicationManager()
+{
+}
+
+void ApplicationManager::onWindowCreatedTimerTimeout()
+{
+    if (QGuiApplication::topLevelWindows().count() > 0) {
+        m_windowCreatedTimer.stop();
+        onWindowCreated();
+    }
+}
+
+void ApplicationManager::onWindowCreated()
+{
     startApplication("unity8-dash");
     focusApplication("unity8-dash");
 }
 
-ApplicationManager::~ApplicationManager()
-{
-}
-
 int ApplicationManager::rowCount(const QModelIndex& parent) const {
     return !parent.isValid() ? m_runningApplications.size() : 0;
 }
@@ -87,8 +106,6 @@
         return app->state();
     case RoleFocused:
         return app->focused();
-    case RoleScreenshot:
-        return app->screenshot();
     case RoleSurface:
         return QVariant::fromValue(app->surface());
     case RoleFullscreen:
@@ -143,6 +160,16 @@
         if (!appIndex.isValid()) return;
         Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleSurface);
     });
+    connect(application, &ApplicationInfo::focusedChanged, this, [application, this]() {
+        QModelIndex appIndex = findIndex(application);
+        if (!appIndex.isValid()) return;
+        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleFocused);
+    });
+    connect(application, &ApplicationInfo::stateChanged, this, [application, this]() {
+        QModelIndex appIndex = findIndex(application);
+        if (!appIndex.isValid()) return;
+        Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << ApplicationManager::RoleState);
+    });
 }
 
 void ApplicationManager::remove(ApplicationInfo *application) {
@@ -155,7 +182,7 @@
         Q_EMIT countChanged();
         if (isEmpty()) Q_EMIT emptyChanged(isEmpty());
     }
-    disconnect(application, &ApplicationInfo::surfaceChanged, this, 0);
+    disconnect(application, 0, this, 0);
 }
 
 void ApplicationManager::move(int from, int to) {
@@ -198,15 +225,7 @@
                                               const QStringList &arguments)
 {
     Q_UNUSED(arguments)
-    ApplicationInfo *application = 0;
-
-    for (ApplicationInfo *availableApp : m_availableApplications) {
-        if (availableApp->appId() == appId) {
-            application = availableApp;
-            break;
-        }
-    }
-
+    ApplicationInfo *application = add(appId);
     if (!application)
         return 0;
 
@@ -214,12 +233,28 @@
             && application->stage() == ApplicationInfo::SideStage) {
         application->setStage(ApplicationInfo::MainStage);
     }
-    add(application);
     application->setState(ApplicationInfo::Running);
 
     return application;
 }
 
+ApplicationInfo* ApplicationManager::add(QString appId)
+{
+    ApplicationInfo *application = 0;
+
+    for (ApplicationInfo *availableApp : m_availableApplications) {
+        if (availableApp->appId() == appId) {
+            application = availableApp;
+            break;
+        }
+    }
+
+    if (application)
+        add(application);
+
+    return application;
+}
+
 bool ApplicationManager::stopApplication(const QString &appId)
 {
     if (appId == "unity8-dash") {
@@ -238,27 +273,6 @@
     return true;
 }
 
-bool ApplicationManager::updateScreenshot(const QString &appId)
-{
-    int idx = -1;
-    ApplicationInfo *application = nullptr;
-    for (int i = 0; i < m_availableApplications.count(); ++i) {
-        application = m_availableApplications.at(i);
-        if (application->appId() == appId) {
-            idx = i;
-            break;
-        }
-    }
-
-    if (idx == -1) {
-        return false;
-    }
-
-    QModelIndex appIndex = index(idx);
-    Q_EMIT dataChanged(appIndex, appIndex, QVector<int>() << RoleScreenshot);
-    return true;
-}
-
 QString ApplicationManager::focusedApplicationId() const {
     for (ApplicationInfo *app : m_runningApplications) {
         if (app->focused()) {
@@ -293,32 +307,18 @@
     if (application == nullptr)
         return false;
 
-    if (application->stage() == ApplicationInfo::MainStage) {
-        // unfocus currently focused mainstage app
-        for (ApplicationInfo *app : m_runningApplications) {
-            if (app->focused() && app->stage() == ApplicationInfo::MainStage) {
-                app->setFocused(false);
-                app->setState(ApplicationInfo::Suspended);
-            }
-        }
-
-        // focus this app
-        application->setFocused(true);
-        application->setState(ApplicationInfo::Running);
-    } else if (application->stage() == ApplicationInfo::SideStage) {
-        // unfocus currently focused sidestage app
-        for (ApplicationInfo *app : m_runningApplications) {
-            if (app->focused() && app->stage() == ApplicationInfo::SideStage) {
-                app->setFocused(false);
-                app->setState(ApplicationInfo::Suspended);
-            }
-        }
-
-        // focus this app
-        application->setFocused(true);
-        application->setState(ApplicationInfo::Running);
+    // unfocus currently focused app
+    for (ApplicationInfo *app : m_runningApplications) {
+        if (app->focused()) {
+            app->setFocused(false);
+            app->setState(ApplicationInfo::Suspended);
+        }
     }
 
+    // focus this app
+    application->setFocused(true);
+    application->setState(ApplicationInfo::Running);
+
     // move app to top of stack
     move(m_runningApplications.indexOf(application), 0);
     Q_EMIT focusedApplicationIdChanged();
@@ -341,10 +341,23 @@
     Q_EMIT focusedApplicationIdChanged();
 }
 
-void ApplicationManager::generateQmlStrings(ApplicationInfo *application)
-{
-    application->setScreenshot(QString("file://%1/Dash/graphics/phone/screenshots/[e-mail]").arg(qmlDirectory())
-                                                                                             .arg(application->icon().toString()));
+QJSValue ApplicationManager::surfaceAboutToBeCreatedCallback() const
+{
+    return m_surfaceAboutToBeCreatedCallback;
+}
+
+void ApplicationManager::setSurfaceAboutToBeCreatedCallback(const QJSValue &callback)
+{
+    if (m_surfaceAboutToBeCreatedCallback.equals(callback))
+        return;
+
+    if (callback.isCallable()) {
+        m_surfaceAboutToBeCreatedCallback = callback;
+    } else {
+        qWarning() << "ApplicationManager::setSurfaceAboutToBeCreatedCallback - attempted to register a non-function!";
+        m_surfaceAboutToBeCreatedCallback = QJSValue::UndefinedValue;
+    }
+    Q_EMIT surfaceAboutToBeCreatedCallbackChanged();
 }
 
 void ApplicationManager::buildListOfAvailableApplications()
@@ -354,128 +367,120 @@
     application = new ApplicationInfo(this);
     application->setAppId("unity8-dash");
     application->setName("Unity 8 Mock Dash");
-    application->setIcon(QUrl("unity8-dash"));
+    application->setScreenshotId("unity8-dash");
     application->setStage(ApplicationInfo::MainStage);
-    generateQmlStrings(application);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("dialer-app");
     application->setName("Dialer");
-    application->setIcon(QUrl("dialer"));
+    application->setScreenshotId("dialer");
+    application->setIconId("dialer-app");
     application->setStage(ApplicationInfo::SideStage);
-    generateQmlStrings(application);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("camera-app");
     application->setName("Camera");
-    application->setIcon(QUrl("camera"));
+    application->setScreenshotId("camera");
+    application->setIconId("camera");
     application->setFullscreen(true);
-    generateQmlStrings(application);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("gallery-app");
     application->setName("Gallery");
-    application->setIcon(QUrl("gallery"));
-    generateQmlStrings(application);
+    application->setScreenshotId("gallery");
+    application->setIconId("gallery");
+    application->setFullscreen(true);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("facebook-webapp");
     application->setName("Facebook");
-    application->setIcon(QUrl("facebook"));
+    application->setScreenshotId("facebook");
+    application->setIconId("facebook");
     application->setStage(ApplicationInfo::SideStage);
-    generateQmlStrings(application);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("webbrowser-app");
     application->setFullscreen(true);
     application->setName("Browser");
-    application->setIcon(QUrl("browser"));
-    generateQmlStrings(application);
+    application->setScreenshotId("browser");
+    application->setIconId("browser");
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("twitter-webapp");
     application->setName("Twitter");
-    application->setIcon(QUrl("twitter"));
+    application->setScreenshotId("twitter");
+    application->setIconId("twitter");
     application->setStage(ApplicationInfo::SideStage);
-    generateQmlStrings(application);
+    m_availableApplications.append(application);
+
+    application = new ApplicationInfo(this);
+    application->setAppId("map");
+    application->setName("Map");
+    application->setIconId("map");
+    application->setScreenshotId("map");
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("gmail-webapp");
     application->setName("GMail");
-    application->setIcon(QUrl("gmail"));
+    application->setIconId("gmail");
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("ubuntu-weather-app");
     application->setName("Weather");
-    application->setIcon(QUrl("weather"));
+    application->setIconId("weather");
     application->setStage(ApplicationInfo::SideStage);
-    generateQmlStrings(application);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("notes-app");
     application->setName("Notepad");
-    application->setIcon(QUrl("notepad"));
+    application->setIconId("notepad");
     application->setStage(ApplicationInfo::SideStage);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("calendar-app");
     application->setName("Calendar");
-    application->setIcon(QUrl("calendar"));
+    application->setIconId("calendar");
     application->setStage(ApplicationInfo::SideStage);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
-    application->setAppId("mediaplayer-app");
-    application->setName("Media Player");
-    application->setIcon(QUrl("mediaplayer-app"));
-    application->setFullscreen(true);
-    m_availableApplications.append(application);
-
-    application = new ApplicationInfo(this);
     application->setAppId("evernote");
     application->setName("Evernote");
-    application->setIcon(QUrl("evernote"));
-    m_availableApplications.append(application);
-
-    application = new ApplicationInfo(this);
-    application->setAppId("map");
-    application->setName("Map");
-    application->setIcon(QUrl("map"));
-    generateQmlStrings(application);
+    application->setIconId("evernote");
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("pinterest");
     application->setName("Pinterest");
-    application->setIcon(QUrl("pinterest"));
+    application->setIconId("pinterest");
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("soundcloud");
     application->setName("SoundCloud");
-    application->setIcon(QUrl("soundcloud"));
+    application->setIconId("soundcloud");
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("wikipedia");
     application->setName("Wikipedia");
-    application->setIcon(QUrl("wikipedia"));
+    application->setIconId("wikipedia");
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("youtube");
     application->setName("YouTube");
-    application->setIcon(QUrl("youtube"));
+    application->setIconId("youtube");
     m_availableApplications.append(application);
 }
 

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2014-08-07 17:15:00 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2014-08-21 13:12:27 +0000
@@ -20,6 +20,7 @@
 #include <QObject>
 #include <QList>
 #include <QStringList>
+#include <QTimer>
 #include "ApplicationInfo.h"
 
 // unity-api
@@ -51,7 +52,7 @@
     static ApplicationManager *singleton();
 
     enum MoreRoles {
-        RoleSurface = RoleScreenshot+1,
+        RoleSurface = RoleFocused+1,
         RoleFullscreen,
         RoleApplication,
     };
@@ -97,14 +98,17 @@
     Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
     Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
     Q_INVOKABLE bool stopApplication(const QString &appId) override;
-    Q_INVOKABLE bool updateScreenshot(const QString &appId) override;
 
     QString focusedApplicationId() const override;
-    bool suspended() const;
-    void setSuspended(bool suspended);
+    bool suspended() const override;
+    void setSuspended(bool suspended) override;
+
+    QJSValue surfaceAboutToBeCreatedCallback() const override;
+    void setSurfaceAboutToBeCreatedCallback(const QJSValue &callback) override;
 
     // Only for testing
     Q_INVOKABLE QStringList availableApplications();
+    Q_INVOKABLE ApplicationInfo* add(QString appId);
 
     QModelIndex findIndex(ApplicationInfo* application);
 
@@ -115,15 +119,19 @@
     void focusRequested(const QString &appId);
     void emptyChanged(bool empty);
 
+ private Q_SLOTS:
+    void onWindowCreatedTimerTimeout();
+
  private:
     void add(ApplicationInfo *application);
     void remove(ApplicationInfo* application);
-    void showApplicationWindow(ApplicationInfo *application);
     void buildListOfAvailableApplications();
-    void generateQmlStrings(ApplicationInfo *application);
+    void onWindowCreated();
     bool m_suspended;
+    QJSValue m_surfaceAboutToBeCreatedCallback;
     QList<ApplicationInfo*> m_runningApplications;
     QList<ApplicationInfo*> m_availableApplications;
+    QTimer m_windowCreatedTimer;
 
     static ApplicationManager *the_application_manager;
 };

=== modified file 'tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp'
--- tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp	2014-07-25 00:10:11 +0000
+++ tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp	2014-08-21 13:12:27 +0000
@@ -44,11 +44,9 @@
         return QImage();
     }
 
-    QString filePath = QString("%1/Dash/graphics/phone/screenshots/[e-mail]").arg(qmlDirectory()).arg(app->icon().toString());
-
     QImage image;
-    if (!image.load(filePath)) {
-        qWarning() << "failed loading app image" << filePath;
+    if (!image.load(app->screenshot())) {
+        qWarning() << "failed loading app image" << app->screenshot();
     }
 
 

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2014-07-22 13:24:37 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2014-08-21 13:12:27 +0000
@@ -1,15 +1,13 @@
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
 
 set(FakeUnityApplicationQml_SOURCES
     plugin.cpp
     ApplicationDBusAdaptor.cpp
     ApplicationInfo.cpp
-    ApplicationImage.cpp
     ApplicationManager.cpp
     ApplicationScreenshotProvider.cpp
     MirSurfaceItem.cpp
     SurfaceManager.cpp
-    VirtualKeyboard.cpp
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
 )

=== removed file 'tests/mocks/Unity/Application/InputFilterArea.qml'
--- tests/mocks/Unity/Application/InputFilterArea.qml	2013-06-05 22:03:08 +0000
+++ tests/mocks/Unity/Application/InputFilterArea.qml	1970-01-01 00:00:00 +0000
@@ -1,21 +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 QtQuick 2.0;
-
-Item {
-    property bool blockInput: false
-}

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-08-08 09:40:50 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-08-21 13:12:27 +0000
@@ -17,33 +17,67 @@
 #include "MirSurfaceItem.h"
 #include "ApplicationInfo.h"
 
-#include <QPainter>
+#include <paths.h>
+
+#include <QGuiApplication>
+#include <QQuickView>
+#include <QQmlProperty>
 #include <QQmlEngine>
+#include <QString>
+
+#include <QDebug>
 
 MirSurfaceItem::MirSurfaceItem(const QString& name,
                                MirSurfaceItem::Type type,
                                MirSurfaceItem::State state,
                                const QUrl& screenshot,
+                               const QString &qmlFilePath,
                                QQuickItem *parent)
-    : QQuickPaintedItem(parent)
+    : QQuickItem(parent)
     , m_application(nullptr)
     , m_name(name)
     , m_type(type)
     , m_state(state)
-    , m_img(screenshot.isLocalFile() ? screenshot.toLocalFile() : screenshot.toString())
     , m_parentSurface(nullptr)
-    , m_haveInputMethod(false)
+    , m_qmlItem(nullptr)
+    , m_screenshotUrl(screenshot)
 {
     qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();
 
     QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
 
-    // The virtual keyboard (input method) has a big transparent area so that
-    // content behind it show through
-    setFillColor(Qt::transparent);
-
     connect(this, &QQuickItem::focusChanged,
             this, &MirSurfaceItem::onFocusChanged);
+
+    // The assumptions I make here really should hold.
+    QQuickView *quickView =
+        qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
+
+    QString qmlComponentFilePath;
+    if (!qmlFilePath.isEmpty()) {
+        qmlComponentFilePath.append(qmlFilePath);
+    } else {
+        qmlComponentFilePath = QString("%1/Unity/Application/MirSurfaceItem.qml")
+            .arg(mockPluginsDir());
+    }
+
+    m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlComponentFilePath);
+
+    switch (m_qmlContentComponent->status()) {
+        case QQmlComponent::Ready:
+            createQmlContentItem();
+            break;
+        case QQmlComponent::Loading:
+            connect(m_qmlContentComponent, &QQmlComponent::statusChanged,
+                    this, &MirSurfaceItem::onComponentStatusChanged);
+            break;
+        case QQmlComponent::Error:
+            printComponentErrors();
+            qFatal("MirSurfaceItem: failed to create content component.");
+            break;
+        default:
+            qFatal("MirSurfaceItem: Unhandled component status");
+    }
 }
 
 MirSurfaceItem::~MirSurfaceItem()
@@ -61,10 +95,11 @@
         m_application->removeSurface(this);
 }
 
-void MirSurfaceItem::paint(QPainter * painter)
+void MirSurfaceItem::printComponentErrors()
 {
-    if (!m_img.isNull()) {
-        painter->drawImage(contentsBoundingRect(), m_img, QRect(QPoint(0,0), m_img.size()));
+    QList<QQmlError> errors = m_qmlContentComponent->errors();
+    for (int i = 0; i < errors.count(); ++i) {
+        qDebug() << errors[i];
     }
 }
 
@@ -155,19 +190,24 @@
 }
 
 
-void MirSurfaceItem::touchEvent(QTouchEvent * event)
+void MirSurfaceItem::onQmlWantInputMethodChanged()
 {
-    if (event->type() == QEvent::TouchBegin && hasFocus()) {
+    QQmlProperty prop(m_qmlItem, "wantInputMethod");
+    bool wantInputMethod = prop.read().toBool();
+
+    if (hasFocus() && wantInputMethod) {
         Q_EMIT inputMethodRequested();
-        m_haveInputMethod = true;
     }
 }
 
 void MirSurfaceItem::onFocusChanged()
 {
-    if (!hasFocus() && m_haveInputMethod) {
+    QQmlProperty prop(m_qmlItem, "wantInputMethod");
+    bool wantInputMethod = prop.read().toBool();
+
+    if (!hasFocus() && wantInputMethod) {
         Q_EMIT inputMethodDismissed();
-        m_haveInputMethod = false;
+        prop.write(QVariant::fromValue(false));
     }
 }
 
@@ -178,3 +218,34 @@
         Q_EMIT stateChanged(newState);
     }
 }
+
+void MirSurfaceItem::onComponentStatusChanged(QQmlComponent::Status status)
+{
+    if (status == QQmlComponent::Ready) {
+        createQmlContentItem();
+    }
+}
+
+void MirSurfaceItem::createQmlContentItem()
+{
+    qDebug() << "MirSurfaceItem::createQmlContentItem()";
+
+    m_qmlItem = qobject_cast<QQuickItem*>(m_qmlContentComponent->create());
+    m_qmlItem->setParentItem(this);
+
+    setImplicitWidth(m_qmlItem->implicitWidth());
+    setImplicitHeight(m_qmlItem->implicitHeight());
+
+    {
+        QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
+        screenshotSource.write(QVariant::fromValue(m_screenshotUrl));
+    }
+
+    {
+        QQmlProperty prop(m_qmlItem, "wantInputMethod");
+        if (prop.type() == QQmlProperty::Property) {
+            bool ok = prop.connectNotifySignal(this, SLOT(onQmlWantInputMethodChanged()));
+            if (!ok) qCritical("MirSurfaceItem: failed to connect to wantInputMethod notify signal");
+        }
+    }
+}

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2014-08-07 17:15:00 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2014-08-21 13:12:27 +0000
@@ -17,12 +17,13 @@
 #ifndef MIRSURFACEITEM_H
 #define MIRSURFACEITEM_H
 
-#include <QQuickPaintedItem>
-#include <QImage>
+#include <QQuickItem>
+#include <QQmlComponent>
+#include <QUrl>
 
 class ApplicationInfo;
 
-class MirSurfaceItem : public QQuickPaintedItem
+class MirSurfaceItem : public QQuickItem
 {
     Q_OBJECT
     Q_ENUMS(Type)
@@ -59,6 +60,7 @@
                             Type type,
                             State state,
                             const QUrl& screenshot,
+                            const QString &qmlFilePath = QString(),
                             QQuickItem *parent = 0);
     ~MirSurfaceItem();
 
@@ -76,9 +78,6 @@
     Q_INVOKABLE void setState(State newState);
     Q_INVOKABLE void release();
 
-    void paint(QPainter * painter) override;
-    void touchEvent(QTouchEvent * event) override;
-
 Q_SIGNALS:
     void typeChanged(Type);
     void stateChanged(State);
@@ -93,9 +92,8 @@
 
 private Q_SLOTS:
     void onFocusChanged();
-
-protected:
-    const QImage &screenshotImage() { return m_img; }
+    void onComponentStatusChanged(QQmlComponent::Status status);
+    void onQmlWantInputMethodChanged();
 
 private:
     void addChildSurface(MirSurfaceItem* surface);
@@ -105,15 +103,20 @@
     static int childSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop);
     static MirSurfaceItem* childSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index);
 
+    void createQmlContentItem();
+    void printComponentErrors();
+
     ApplicationInfo* m_application;
     const QString m_name;
     const Type m_type;
     State m_state;
-    const QImage m_img;
 
     MirSurfaceItem* m_parentSurface;
     QList<MirSurfaceItem*> m_children;
-    bool m_haveInputMethod;
+
+    QQmlComponent *m_qmlContentComponent;
+    QQuickItem *m_qmlItem;
+    QUrl m_screenshotUrl;
 };
 
 Q_DECLARE_METATYPE(MirSurfaceItem*)

=== added file 'tests/mocks/Unity/Application/MirSurfaceItem.qml'
--- tests/mocks/Unity/Application/MirSurfaceItem.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.qml	2014-08-21 13:12:27 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Rectangle {
+    objectName: "fakeSurfaceQML"
+    id: root
+    color: "pink"
+
+    anchors.fill: parent
+
+    implicitWidth: units.gu(40)
+    implicitHeight: units.gu(70)
+
+    property alias screenshotSource: screenshotImage.source
+
+    property bool wantInputMethod: false
+
+    property int touchPressCount: 0
+    property int touchReleaseCount: 0
+
+    Image {
+        id: screenshotImage
+        anchors.fill: parent
+        fillMode: Image.Stretch
+    }
+
+    Text {
+        anchors.fill: parent
+        text: "SURFACE"
+        color: "yellow"
+        font.bold: true
+        fontSizeMode: Text.Fit
+        minimumPixelSize: 10; font.pixelSize: 200
+        verticalAlignment: Text.AlignVCenter
+    }
+
+    MultiPointTouchArea {
+        anchors.fill: parent
+        onPressed: { root.wantInputMethod = true; root.touchPressCount++; }
+        onReleased: { root.touchReleaseCount++; }
+    }
+}

=== removed file 'tests/mocks/Unity/Application/OSKController.qml'
--- tests/mocks/Unity/Application/OSKController.qml	2013-09-10 15:06:32 +0000
+++ tests/mocks/Unity/Application/OSKController.qml	1970-01-01 00:00:00 +0000
@@ -1,20 +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 QtQuick 2.0;
-
-Item {
-}

=== modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
--- tests/mocks/Unity/Application/SurfaceManager.cpp	2014-07-24 19:22:20 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.cpp	2014-08-21 13:12:27 +0000
@@ -16,9 +16,8 @@
 
 #include "SurfaceManager.h"
 
+#include <paths.h>
 #include "MirSurfaceItem.h"
-#include "VirtualKeyboard.h"
-
 
 SurfaceManager *SurfaceManager::the_surface_manager = nullptr;
 
@@ -66,7 +65,19 @@
 MirSurfaceItem *SurfaceManager::inputMethodSurface()
 {
     if (!m_virtualKeyboard) {
-        m_virtualKeyboard = new VirtualKeyboard(MirSurfaceItem::Minimized);
+
+        QString screenshotPath = QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")
+            .arg(qmlDirectory());
+
+        QString qmlFilePath = QString("%1/Unity/Application/VirtualKeyboard.qml")
+            .arg(mockPluginsDir());
+
+        m_virtualKeyboard = new MirSurfaceItem(
+                "input-method",
+                MirSurfaceItem::InputMethod,
+                MirSurfaceItem::Minimized,
+                screenshotPath,
+                qmlFilePath);
         Q_EMIT surfaceCreated(m_virtualKeyboard);
     }
     return m_virtualKeyboard;

=== modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
--- tests/mocks/Unity/Application/SurfaceManager.h	2014-07-24 19:22:20 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.h	2014-08-21 13:12:27 +0000
@@ -20,7 +20,6 @@
 #include <QObject>
 
 class MirSurfaceItem;
-class VirtualKeyboard;
 
 class SurfaceManager : public QObject
 {
@@ -48,7 +47,7 @@
 
 private:
     static SurfaceManager *the_surface_manager;
-    VirtualKeyboard *m_virtualKeyboard;
+    MirSurfaceItem *m_virtualKeyboard;
 };
 
 #endif // SURFACEMANAGER_H

=== removed file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
--- tests/mocks/Unity/Application/VirtualKeyboard.cpp	2014-07-22 10:29:25 +0000
+++ tests/mocks/Unity/Application/VirtualKeyboard.cpp	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "VirtualKeyboard.h"
-
-#include <paths.h>
-
-VirtualKeyboard::VirtualKeyboard(State state, QQuickItem *parent)
-    : MirSurfaceItem("input-method",
-            MirSurfaceItem::InputMethod,
-            state,
-            QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png").arg(qmlDirectory()),
-            parent)
-{
-}
-
-void VirtualKeyboard::touchEvent(QTouchEvent *event)
-{
-    if (event->type() == QEvent::TouchBegin && !hasTouchInsideKeyboard(event)) {
-        event->ignore();
-    }
-}
-
-bool VirtualKeyboard::hasTouchInsideKeyboard(QTouchEvent *event)
-{
-    const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
-    for (int i = 0; i < touchPoints.count(); ++i) {
-        QPoint pos = touchPoints.at(i).pos().toPoint();
-
-        // Map to image coords
-        int imageX = (int)( ( ((qreal)pos.x()) / width() ) * ((qreal)screenshotImage().size().width()) );
-        int imageY = (int)( ( ((qreal)pos.y()) / height() ) * ((qreal)screenshotImage().size().height()) );
-
-        QRgb pixelHit = screenshotImage().pixel(imageX, imageY);
-
-        // The keyboard depicted in the image is in its opaque part.
-        if (qAlpha(pixelHit) != 0) {
-            return true;
-        }
-    }
-    return false;
-}

=== removed file 'tests/mocks/Unity/Application/VirtualKeyboard.h'
--- tests/mocks/Unity/Application/VirtualKeyboard.h	2014-07-22 10:29:25 +0000
+++ tests/mocks/Unity/Application/VirtualKeyboard.h	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef VIRTUALKEYBOARD_H
-#define VIRTUALKEYBOARD_H
-
-#include "MirSurfaceItem.h"
-
-class VirtualKeyboard : public MirSurfaceItem
-{
-    Q_OBJECT
-public:
-    VirtualKeyboard(State state,
-                    QQuickItem *parent = 0);
-
-    void touchEvent(QTouchEvent * event) override;
-
-private:
-    bool hasTouchInsideKeyboard(QTouchEvent *event);
-};
-
-#endif // VIRTUALKEYBOARD_H

=== added file 'tests/mocks/Unity/Application/VirtualKeyboard.qml'
--- tests/mocks/Unity/Application/VirtualKeyboard.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/VirtualKeyboard.qml	2014-08-21 13:12:27 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Item {
+    implicitWidth: units.gu(40)
+    implicitHeight: units.gu(70)
+
+    anchors.fill: parent
+
+    property alias screenshotSource: screenshotImage.source
+
+    property bool landscape: width > height
+
+    Image {
+        id: screenshotImage
+        height: landscape ? parent.height * 0.4 : width * 0.6
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+
+        MultiPointTouchArea {
+            anchors.fill: parent
+        }
+    }
+}

=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
--- tests/mocks/Unity/Application/plugin.cpp	2014-07-19 11:52:38 +0000
+++ tests/mocks/Unity/Application/plugin.cpp	2014-08-21 13:12:27 +0000
@@ -16,7 +16,6 @@
 
 #include "plugin.h"
 #include "ApplicationInfo.h"
-#include "ApplicationImage.h"
 #include "ApplicationManager.h"
 #include "ApplicationScreenshotProvider.h"
 #include "MirSurfaceItem.h"
@@ -49,8 +48,6 @@
     qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
 
     qmlRegisterUncreatableType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem", "MirSurfaceItem can't be instantiated from QML");
-
-    qmlRegisterType<ApplicationImage>(uri, 0, 1, "ApplicationImage");
 }
 
 void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'tests/mocks/Unity/Application/qmldir'
--- tests/mocks/Unity/Application/qmldir	2014-05-02 22:57:21 +0000
+++ tests/mocks/Unity/Application/qmldir	2014-08-21 13:12:27 +0000
@@ -1,6 +1,3 @@
 module Unity.Application
 plugin FakeUnityApplicationQml
 typeinfo Application.qmltypes
-
-InputFilterArea 0.1 InputFilterArea.qml
-OSKController 0.1 OSKController.qml

=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2014-05-30 09:22:58 +0000
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2014-08-21 13:12:27 +0000
@@ -1,6 +1,6 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=3)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -50,7 +50,7 @@
     ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     )
 target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS})
-qt5_use_modules(launchermodeltestExec Test Core DBus)
+qt5_use_modules(launchermodeltestExec Test Core DBus Qml)
 
 # copy .desktop files into build directory for shadow builds
 file(GLOB DESKTOP_FILES *.desktop)

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-07-03 12:03:57 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2014-08-21 13:12:27 +0000
@@ -93,10 +93,11 @@
         m_list.takeAt(index)->deleteLater();
         endRemoveRows();
     }
-    bool updateScreenshot(const QString &appId) { Q_UNUSED(appId); return true; }
     bool requestFocusApplication(const QString &appId) { Q_UNUSED(appId); return true; }
     bool suspended() const { return false; }
     void setSuspended(bool) {}
+    QJSValue surfaceAboutToBeCreatedCallback() const override { return QJSValue(false); }
+    void setSurfaceAboutToBeCreatedCallback(const QJSValue &callback) override { Q_UNUSED(callback); }
 
 private:
     QList<MockApp*> m_list;

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-08-20 08:39:09 +0000
+++ tests/qmltests/CMakeLists.txt	2014-08-21 13:12:27 +0000
@@ -76,4 +76,6 @@
 # These MenuItemFactory tests need the test/mocks/ to come before plugins/
 add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
+add_qml_test(Stages ApplicationWindow ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
 add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
+add_qml_test(Stages SpreadDelegate ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")

=== added file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2014-08-21 13:12:27 +0000
@@ -0,0 +1,346 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Unity.Test 0.1 as UT
+import ".."
+import "../../../qml/Stages"
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+import Unity.Application 0.1
+
+Rectangle {
+    color: "red"
+    id: root
+    width: units.gu(70)
+    height: units.gu(70)
+
+    Component.onCompleted: {
+        root.fakeApplication = ApplicationManager.add("gallery-app");
+        root.fakeApplication.manualSurfaceCreation = true;
+        root.fakeApplication.setState(ApplicationInfo.Starting);
+    }
+    property QtObject fakeApplication: null
+
+    Connections {
+        target: fakeApplication
+        onSurfaceChanged: {
+            surfaceCheckbox.checked = fakeApplication.surface !== null;
+        }
+    }
+
+    Component {
+        id: applicationWindowComponent
+        ApplicationWindow {
+            anchors.fill: parent
+            application: fakeApplication
+        }
+    }
+    Loader {
+        id: applicationWindowLoader
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: parent.left
+        }
+        width: units.gu(40)
+        sourceComponent: applicationWindowComponent
+    }
+
+    Rectangle {
+        color: "white"
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: applicationWindowLoader.right
+            right: parent.right
+        }
+
+        Column {
+            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
+            spacing: units.gu(1)
+            Row {
+                anchors { left: parent.left; right: parent.right }
+                CheckBox {
+                    id: surfaceCheckbox; checked: false
+                    onCheckedChanged: {
+                        if (applicationWindowLoader.status !== Loader.Ready)
+                            return;
+
+                        if (checked && !fakeApplication.surface) {
+                            fakeApplication.createSurface();
+                        } else if (!checked && fakeApplication.surface) {
+                            fakeApplication.surface.release();
+                        }
+                    }
+                }
+                Label { text: "Surface" }
+            }
+            ListItem.ItemSelector {
+                id: appStateSelector
+                anchors { left: parent.left; right: parent.right }
+                text: "Application state"
+                model: ["Starting",
+                        "Running",
+                        "Suspended",
+                        "Stopped"]
+                property int selectedApplicationState: {
+                    if (model[selectedIndex] === "Starting") {
+                        return ApplicationInfo.Starting;
+                    } else if (model[selectedIndex] === "Running") {
+                        return ApplicationInfo.Running;
+                    } else if (model[selectedIndex] === "Suspended") {
+                        return ApplicationInfo.Suspended;
+                    } else {
+                        return ApplicationInfo.Stopped;
+                    }
+                }
+                onSelectedApplicationStateChanged: {
+                    // state is a read-only property, thus we have to call the setter function
+                    fakeApplication.setState(selectedApplicationState);
+                }
+            }
+        }
+    }
+
+    UT.UnityTestCase {
+        id: testCase
+        name: "ApplicationWindow"
+        when: windowShown
+
+        // just to make them shorter
+        property int appStarting: ApplicationInfo.Starting
+        property int appRunning: ApplicationInfo.Running
+        property int appSuspended: ApplicationInfo.Suspended
+        property int appStopped: ApplicationInfo.Stopped
+
+        function setApplicationState(appState) {
+            switch (appState) {
+            case appStarting:
+                appStateSelector.selectedIndex = 0;
+                break;
+            case appRunning:
+                appStateSelector.selectedIndex = 1;
+                break;
+            case appSuspended:
+                appStateSelector.selectedIndex = 2;
+                break;
+            case appStopped:
+                appStateSelector.selectedIndex = 3;
+                break;
+            }
+        }
+
+        // holds some of the internal ApplicationWindow objects we probe during the tests
+        property var stateGroup: null
+
+        function findInterestingApplicationWindowChildren() {
+            stateGroup = findInvisibleChild(applicationWindowLoader.item, "applicationWindowStateGroup");
+            verify(stateGroup);
+        }
+
+        function forgetApplicationWindowChildren() {
+            stateGroup = null;
+        }
+
+        // wait until any transition animation has finished
+        function waitUntilTransitionsEnd() {
+            var transitions = stateGroup.transitions;
+            for (var i = 0; i < transitions.length; ++i) {
+                var transition = transitions[i];
+                tryCompare(transition, "running", false, 2000);
+            }
+        }
+
+        function init() {
+            findInterestingApplicationWindowChildren();
+        }
+
+        function cleanup() {
+            forgetApplicationWindowChildren();
+
+            // reload our test subject to get it in a fresh state once again
+            applicationWindowLoader.active = false;
+
+            appStateSelector.selectedIndex = 0;
+            surfaceCheckbox.checked = false;
+
+            if (fakeApplication.surface)
+                fakeApplication.surface.release();
+
+            applicationWindowLoader.active = true;
+        }
+
+        function test_showSplashUntilAppFullyInit_data() {
+            return [
+                {tag: "state=Running then create surface", swapInitOrder: false},
+
+                {tag: "create surface then state=Running", swapInitOrder: true},
+            ]
+        }
+
+        function test_showSplashUntilAppFullyInit() {
+            verify(stateGroup.state === "splashScreen");
+
+            if (data.swapInitOrder) {
+                surfaceCheckbox.checked = true;
+            } else {
+                setApplicationState(appRunning);
+            }
+
+            verify(stateGroup.state === "splashScreen");
+
+            if (data.swapInitOrder) {
+                setApplicationState(appRunning);
+            } else {
+                surfaceCheckbox.checked = true;
+            }
+
+            tryCompare(stateGroup, "state", "surface");
+        }
+
+        function test_suspendedAppShowsSurface() {
+            surfaceCheckbox.checked = true;
+            setApplicationState(appRunning);
+
+            tryCompare(stateGroup, "state", "surface");
+
+            waitUntilTransitionsEnd();
+
+            setApplicationState(appSuspended);
+
+            verify(stateGroup.state === "surface");
+            waitUntilTransitionsEnd();
+        }
+
+        function test_killedAppShowsScreenshot() {
+            surfaceCheckbox.checked = true;
+            setApplicationState(appRunning);
+            tryCompare(stateGroup, "state", "surface");
+
+            setApplicationState(appSuspended);
+
+            verify(stateGroup.state === "surface");
+            verify(fakeApplication.surface !== null);
+
+            // kill it!
+            setApplicationState(appStopped);
+
+            tryCompare(stateGroup, "state", "screenshot");
+            tryCompare(fakeApplication, "surface", null);
+        }
+
+        function test_restartApp() {
+            var screenshotImage = findChild(applicationWindowLoader.item, "screenshotImage");
+
+            surfaceCheckbox.checked = true;
+            setApplicationState(appRunning);
+            tryCompare(stateGroup, "state", "surface");
+            waitUntilTransitionsEnd();
+
+            setApplicationState(appSuspended);
+
+            // kill it
+            setApplicationState(appStopped);
+
+            tryCompare(stateGroup, "state", "screenshot");
+            waitUntilTransitionsEnd();
+            tryCompare(fakeApplication, "surface", null);
+
+            // and restart it
+            setApplicationState(appStarting);
+
+            waitUntilTransitionsEnd();
+            verify(stateGroup.state === "screenshot");
+            verify(fakeApplication.surface === null);
+
+            setApplicationState(appRunning);
+
+            waitUntilTransitionsEnd();
+            verify(stateGroup.state === "screenshot");
+
+            surfaceCheckbox.checked = true;
+
+            tryCompare(stateGroup, "state", "surface");
+            tryCompare(screenshotImage, "status", Image.Null);
+        }
+
+        function test_appCrashed() {
+            surfaceCheckbox.checked = true;
+            setApplicationState(appRunning);
+            tryCompare(stateGroup, "state", "surface");
+            waitUntilTransitionsEnd();
+
+            // oh, it crashed...
+            setApplicationState(appStopped);
+
+            tryCompare(stateGroup, "state", "screenshot");
+            tryCompare(fakeApplication, "surface", null);
+        }
+
+        function test_keepSurfaceWhileInvisible() {
+            surfaceCheckbox.checked = true;
+            setApplicationState(appRunning);
+            tryCompare(stateGroup, "state", "surface");
+            waitUntilTransitionsEnd();
+            verify(fakeApplication.surface !== null);
+
+            applicationWindowLoader.item.visible = false;
+
+            waitUntilTransitionsEnd();
+            verify(stateGroup.state === "surface");
+            verify(fakeApplication.surface !== null);
+
+            applicationWindowLoader.item.visible = true;
+
+            waitUntilTransitionsEnd();
+            verify(stateGroup.state === "surface");
+            verify(fakeApplication.surface !== null);
+        }
+
+        function test_touchesReachSurfaceWhenItsShown() {
+            setApplicationState(appRunning);
+            surfaceCheckbox.checked = true;
+
+            tryCompare(stateGroup, "state", "surface");
+
+            waitUntilTransitionsEnd();
+
+            // Because doing stuff in C++ is a PITA we keep the counter in the interal qml impl.
+            var fakeSurface = findChild(fakeApplication.surface, "fakeSurfaceQML");
+            fakeSurface.touchPressCount = 0;
+            fakeSurface.touchReleaseCount = 0;
+
+            tap(applicationWindowLoader.item,
+                applicationWindowLoader.item.width / 2, applicationWindowLoader.item.height / 2);
+
+            verify(fakeSurface.touchPressCount === 1);
+            verify(fakeSurface.touchReleaseCount === 1);
+        }
+
+        function test_showNothingOnSuddenSurfaceLoss() {
+            surfaceCheckbox.checked = true;
+            setApplicationState(appRunning);
+            tryCompare(stateGroup, "state", "surface");
+            waitUntilTransitionsEnd();
+
+            surfaceCheckbox.checked = false;
+
+            verify(stateGroup.state === "void");
+        }
+    }
+}

=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
--- tests/qmltests/Stages/tst_PhoneStage.qml	2014-07-25 00:01:00 +0000
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2014-08-21 13:12:27 +0000
@@ -26,14 +26,11 @@
     width: units.gu(70)
     height: units.gu(70)
 
-    Rectangle {
-
-    }
-
     PhoneStage {
         id: phoneStage
         anchors { fill: parent; rightMargin: units.gu(30) }
         dragAreaWidth: units.gu(2)
+        maximizedAppTopMargin: units.gu(3) + units.dp(2)
     }
 
     Binding {
@@ -46,6 +43,7 @@
         anchors { fill: parent; leftMargin: phoneStage.width }
 
         Column {
+            id: buttons
             anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
             spacing: units.gu(1)
             Button {
@@ -57,9 +55,33 @@
             }
             Button {
                 anchors { left: parent.left; right: parent.right }
-                text: "Remove App"
-                onClicked: {
-                    ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
+                text: "Remove Selected"
+                onClicked: {
+                    ApplicationManager.stopApplication(ApplicationManager.get(appList.selectedAppIndex).appId);
+                }
+            }
+            Button {
+                anchors { left: parent.left; right: parent.right }
+                text: "Stop Selected"
+                onClicked: {
+                    ApplicationManager.get(appList.selectedAppIndex).setState(ApplicationInfo.Stopped);
+                }
+            }
+        }
+        ListView {
+            id: appList
+            property int selectedAppIndex
+            anchors { left: parent.left; right: parent.right; top: buttons.bottom; bottom: parent.bottom }
+            boundsBehavior: Flickable.StopAtBounds
+            model: ApplicationManager
+            delegate: Rectangle {
+                anchors { left: parent.left; right: parent.right }
+                height: units.gu(2)
+                color: appList.selectedAppIndex === model.index ? "red" : "white"
+                Text { anchors.fill: parent; text: model.appId }
+                MouseArea {
+                    anchors.fill: parent
+                    onPressed: { appList.selectedAppIndex = model.index; }
                 }
             }
         }
@@ -84,7 +106,9 @@
         function goToSpread() {
             var spreadView = findChild(phoneStage, "spreadView");
 
-            var startX = phoneStage.width;
+            // Keep it inside the PhoneStage otherwise the controls on the right side will
+            // capture the press thus the "- 2"  on startX.
+            var startX = phoneStage.width - 2;
             var startY = phoneStage.height / 2;
             var endY = startY;
             var endX = units.gu(2);
@@ -132,7 +156,9 @@
 
             var spreadView = findChild(phoneStage, "spreadView");
 
-            var startX = phoneStage.width;
+            // Keep it inside the PhoneStage otherwise the controls on the right side will
+            // capture the press thus the "- 2"  on startX.
+            var startX = phoneStage.width - 2;
             var startY = phoneStage.height / 2;
             var endY = startY;
             var endX = spreadView.width - (spreadView.width * spreadView[data.positionMarker]) - data.offset;
@@ -230,6 +256,15 @@
             compare(ApplicationManager.focusedApplicationId, selectedApp.appId);
         }
 
+        function test_surfaceSizer() {
+            var surface = { width: 100, height: 200 };
+            var phoneStagePriv = findInvisibleChild(phoneStage, "priv");
+
+            surface = phoneStagePriv.surfaceSizer(surface);
+            compare(surface.width, phoneStage.width);
+            compare(surface.height, phoneStage.height - phoneStage.maximizedAppTopMargin);
+        }
+
         function cleanup() {
             while (ApplicationManager.count > 1) {
                 var oldCount = ApplicationManager.count;

=== added file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
--- tests/qmltests/Stages/tst_SpreadDelegate.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2014-08-21 13:12:27 +0000
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Unity.Test 0.1 as UT
+import ".."
+import "../../../qml/Stages"
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+import Unity.Application 0.1
+
+Rectangle {
+    color: "red"
+    id: root
+    width: units.gu(70)
+    height: units.gu(70)
+
+    Component.onCompleted: {
+        root.fakeApplication = ApplicationManager.startApplication("gallery-app");
+    }
+    property QtObject fakeApplication: null
+
+    Component {
+        id: spreadDelegateComponent
+        SpreadDelegate {
+            anchors.fill: parent
+            swipeToCloseEnabled: swipeToCloseCheckbox.checked
+            closeable: closeableCheckbox.checked
+            application: fakeApplication
+        }
+    }
+    Loader {
+        id: spreadDelegateLoader
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: parent.left
+        }
+        width: units.gu(40)
+        sourceComponent: spreadDelegateComponent
+    }
+
+    Rectangle {
+        color: "white"
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: spreadDelegateLoader.right
+            right: parent.right
+        }
+
+        Column {
+            anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
+            spacing: units.gu(1)
+            Row {
+                anchors { left: parent.left; right: parent.right }
+                CheckBox { id: swipeToCloseCheckbox; checked: false; }
+                Label { text: "swipeToCloseEnabled" }
+            }
+            Row {
+                anchors { left: parent.left; right: parent.right }
+                CheckBox { id: closeableCheckbox; checked: false }
+                Label { text: "closeable" }
+            }
+        }
+    }
+
+    UT.UnityTestCase {
+        id: testCase
+        name: "SpreadDelegate"
+        when: windowShown
+
+        SignalSpy {
+            id: spyClosedSignal
+            target: spreadDelegateLoader.item
+            signalName: "closed"
+        }
+
+        property var dragArea
+
+        function init() {
+            dragArea = findInvisibleChild(spreadDelegateLoader.item, "dragArea");
+            dragArea.__dateTime = fakeDateTime;
+        }
+
+        function cleanup() {
+            // reload our test subject to get it in a fresh state once again
+            spreadDelegateLoader.active = false;
+            spreadDelegateLoader.active = true;
+
+            spyClosedSignal.clear();
+        }
+
+        function test_swipeToClose_data() {
+            return [
+                {tag: "swipeToClose=true closeable=true -> appWindow moves away",
+                 swipeToClose: true, closeable: true },
+
+                {tag: "swipeToClose=true closeable=alse -> appWindow bounces back",
+                 swipeToClose: true, closeable: false },
+
+                {tag: "swipeToClose=false -> appWindow stays put",
+                 swipeToClose: false, closeable: true },
+            ]
+        }
+
+        function test_swipeToClose(data) {
+            var appWindowWithShadow = findChild(spreadDelegateLoader.item, "appWindowWithShadow");
+
+            verify(appWindowWithShadow.y === 0);
+
+            swipeToCloseCheckbox.checked = data.swipeToClose;
+            closeableCheckbox.checked = data.closeable;
+
+            var dragDistance = spreadDelegateLoader.item.height / 2;
+            var touchX = spreadDelegateLoader.item.width / 2;
+            var fromY = spreadDelegateLoader.item.height / 2;
+            var toY = fromY - dragDistance;
+            touchFlick(spreadDelegateLoader.item,
+                touchX /* fromX */,  fromY, touchX /* toX */,  toY,
+                true /* beginTouch */, false /* endTouch */, dragArea.minSpeedToClose * 1.1 /* speed */);
+
+
+            if (data.swipeToClose) {
+                verify(appWindowWithShadow.y < 0);
+                verify(Math.abs(Math.abs(appWindowWithShadow.y) - dragDistance) < units.gu(1));
+
+                touchRelease(spreadDelegateLoader.item, touchX, toY - units.gu(1));
+
+                waitForCloseAnimationToFinish();
+
+                if (data.closeable) {
+                    verify(spyClosedSignal.count === 1);
+                } else {
+                    verify(spyClosedSignal.count === 0);
+                    tryCompare(appWindowWithShadow, "y", 0);
+                }
+
+            } else {
+                verify(appWindowWithShadow.y === 0);
+
+                touchRelease(spreadDelegateLoader.item, touchX, toY);
+            }
+        }
+
+        function waitForCloseAnimationToFinish() {
+            var closeAnimation = findInvisibleChild(spreadDelegateLoader.item, "closeAnimation");
+            wait(closeAnimation.duration * 1.5);
+            tryCompare(closeAnimation, "running", false);
+        }
+
+    }
+}

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-07-29 11:35:10 +0000
+++ tests/qmltests/tst_Shell.qml	2014-08-21 13:12:27 +0000
@@ -403,11 +403,11 @@
             compare(panel.fullscreenMode, false);
             ApplicationManager.startApplication("camera-app");
             tryCompare(panel, "fullscreenMode", true);
-            ApplicationManager.startApplication("gallery-app");
+            ApplicationManager.startApplication("dialer-app");
             tryCompare(panel, "fullscreenMode", false);
             ApplicationManager.requestFocusApplication("camera-app");
             tryCompare(panel, "fullscreenMode", true);
-            ApplicationManager.requestFocusApplication("gallery-app");
+            ApplicationManager.requestFocusApplication("dialer-app");
             tryCompare(panel, "fullscreenMode", false);
         }
 

=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2014-06-23 16:40:11 +0000
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2014-08-21 13:12:27 +0000
@@ -312,12 +312,15 @@
     }
 
     function tap(item, x, y) {
+        var root = fetchRootItem(item)
+        var rootPoint = item.mapToItem(root, x, y)
+
         var event = touchEvent()
-        event.press(0 /* touchId */, x, y)
+        event.press(0 /* touchId */, rootPoint.x, rootPoint.y)
         event.commit()
 
         event = touchEvent()
-        event.release(0 /* touchId */, x, y)
+        event.release(0 /* touchId */, rootPoint.x, rootPoint.y)
         event.commit()
     }