Merge lp:~unity-team/unity8/silo0 into lp:unity8

[Gerry Boland]

DO NOT MERGE! Extras for pocket desktop demo in silo0.

[lp:~unity-team/unity8/silo0]

1850. By Launchpad Translations on behalf of unity-team on 2015-07-11

Launchpad automatic translations update.

1851. By Launchpad Translations on behalf of unity-team on 2015-07-12

Launchpad automatic translations update.

1852. By Launchpad Translations on behalf of unity-team on 2015-07-13

Launchpad automatic translations update.

1853. By Daniel d'Andrada on 2015-07-13

Dismiss the apps spread if greeter gets shown

Enables Shell to rotate itself back into place while greeter is shown because PhoneStage doesn't allow rotations while the apps spread is open Fixes: #1471609
Approved by: Michael Zanetti

1854. By Albert Astals Cid on 2015-07-13

Revert Session Screenshotter Fixes: #1473476
Approved by: Michael Zanetti

1855. By CI Train Bot Account on 2015-07-13

Releasing 8.10+15.10.20150713-0ubuntu1

1856. By Launchpad Translations on behalf of unity-team on 2015-07-14

Launchpad automatic translations update.

1857. By Launchpad Translations on behalf of unity-team on 2015-07-16

Launchpad automatic translations update.

1858. By Launchpad Translations on behalf of unity-team on 2015-07-17

Launchpad automatic translations update.

1859. By Josh Arenson on 2015-07-17

Add a basic autopilot test for the SettingsWizard
Approved by: Albert Astals Cid, Richard Huddie

1860. By Daniel d'Andrada on 2015-07-17

Update tst_ShellWithPin

Spread is no longer enabled while the greeter is being shown.
Approved by: Albert Astals Cid

1861. By Albert Astals Cid on 2015-07-17

Fix build with ninja
Approved by: Pete Woods, Michael Zanetti

1862. By Nick Dedekind on 2015-07-17

Fixed qml warnings in 'make tryShell'
Approved by: Mirco Müller

1863. By Albert Astals Cid on 2015-07-17

Ensure tutorial doesn't let user drag the launcher past screen edge.

This was because the bouncing animation on the left added a bit of extra offset to the launcher. So I just made sure that offset doesn't go past the screen edge as the user drags the launcher out.

And added a test. Fixes: #1454882
Approved by: Albert Astals Cid

1864. By Lukáš Tinkl on 2015-07-17

Avoid sync DBUS calls
Approved by: Michael Zanetti

1865. By Michael Zanetti on 2015-07-17

Add PreviewSocialComment
Approved by: Albert Astals Cid, Josh Arenson

1866. By Marcus Tomlinson on 2015-07-17

Handle TERM, HUP, and INT signals in unity-scope-tool Fixes: #1470464
Approved by: Albert Astals Cid, Michi Henning

1867. By CI Train Bot Account on 2015-07-17

Releasing 8.10+15.10.20150717-0ubuntu1

1868. By CI Train Bot Account on 2015-07-21

Resync trunk.

1869. By Launchpad Translations on behalf of unity-team on 2015-07-21

Launchpad automatic translations update.

1870. By Josh Arenson on 2015-07-21

Add handling for the location page to the autopilot settings wizard test
Approved by: Albert Astals Cid

1871. By Albert Astals Cid on 2015-07-21

Update state of indicators bar only when the user is actively dragging himself

Fixes race with timer causing bug 1457044 Fixes: #1457044
Approved by: Nick Dedekind

1872. By Albert Astals Cid on 2015-07-21

PreviewExpandable should be not expanded on startup

Approved by: Andrea Cimitan

1873. By Albert Astals Cid on 2015-07-21

icon-actions preview widget

Approved by: Andrea Cimitan

1874. By Albert Astals Cid on 2015-07-21

Fix warning when doing make try*
Approved by: Andrea Cimitan

1875. By handsome_feng on 2015-07-21

Added touch state on navigation. Fixes: #1383213
Approved by: Mirco Müller

1876. By Albert Astals Cid on 2015-07-21

make testPageHeader more stable

Approved by: Andrea Cimitan

1877. By Albert Astals Cid on 2015-07-21

Fix i18n in scope tool

It had half of it but not completely, this is the counterpart for scope tool from r1247 Fixes: #1317541
Approved by: Andrea Cimitan

1878. By Albert Astals Cid on 2015-07-21

New phone background provided by design

Removes a 1 px bright line on its right edge Fixes: #1364537
Approved by: Andrea Cimitan

1879. By Michael Zanetti on 2015-07-21

allow opening the manage dash area by clicking with a mouse on the arrow label

This is meant to be temporary and will be replaced with the upcoming bottom edge
component in the UITK.
Approved by: Albert Astals Cid

1880. By Albert Astals Cid on 2015-07-21

Add context for "Please re-enter"

Translators need to know we're asking the user to reenter the passphrase Fixes: #1377195
Approved by: Andrea Cimitan

1881. By CI Train Bot Account on 2015-07-21

Releasing 8.10+15.10.20150721-0ubuntu1

1882. By CI Train Bot Account on 2015-07-24

Resync trunk.

1883. By Launchpad Translations on behalf of unity-team on 2015-07-25

Launchpad automatic translations update.

1884. By Launchpad Translations on behalf of unity-team on 2015-07-27

Launchpad automatic translations update.

1885. By Launchpad Translations on behalf of unity-team on 2015-07-28

Launchpad automatic translations update.

1886. By Gerry Boland on 2015-07-08

Bump version

1887. By Gerry Boland on 2015-07-16

Specify multimonitor orientation per device, change orientation even for desktop state when necessary

1888. By Gerry Boland on 2015-08-06

Merge mirSurface

1889. By Gerry Boland on 2015-08-06

Merge MousePointer

1890. By Gerry Boland on 2015-08-07

unity-api dep too high

1891. By Gerry Boland on 2015-08-07

Fuk you whitespace test

1892. By Gerry Boland on 2015-08-12

Merge trunk

1893. By Gerry Boland on 2015-08-12

update changelog

1894. By Gerry Boland on 2015-08-13

Merge trunk

1895. By Gerry Boland on 2015-08-13

Merge lp:~dandrader/unity8/multiSurfaceApp

1896. By Gerry Boland on 2015-08-14

Fix apps surfaces appearing

Unmerged revisions

1896. By Gerry Boland on 2015-08-14

Fix apps surfaces appearing

1895. By Gerry Boland on 2015-08-13

Merge lp:~dandrader/unity8/multiSurfaceApp

1894. By Gerry Boland on 2015-08-13

Merge trunk

1893. By Gerry Boland on 2015-08-12

update changelog

1892. By Gerry Boland on 2015-08-12

Merge trunk

1891. By Gerry Boland on 2015-08-07

Fuk you whitespace test

1890. By Gerry Boland on 2015-08-07

unity-api dep too high

1889. By Gerry Boland on 2015-08-06

Merge MousePointer

1888. By Gerry Boland on 2015-08-06

Merge mirSurface

1887. By Gerry Boland on 2015-07-16

Specify multimonitor orientation per device, change orientation even for desktop state when necessary

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-23 12:19:15 +0000
+++ CMakeLists.txt	2015-08-14 11:40:06 +0000
@@ -56,7 +56,7 @@
 find_package(Qt5Concurrent 5.2 REQUIRED)
 find_package(Qt5Sql 5.2 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=7)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=8)
 
 # Standard install paths
 include(GNUInstallDirs)

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-12 08:41:24 +0000
+++ debian/changelog	2015-08-14 11:40:06 +0000
@@ -1,3 +1,9 @@
+unity8 (8.12) UNRELEASED; urgency=medium
+
+  * Silo0 special build
+
+ -- Gerry Boland <[e-mail]>  Wed, 12 Aug 2015 17:14:03 +0100
+
 unity8 (8.11+15.04.20150812-0ubuntu1) vivid; urgency=medium
 
   [ Albert Astals Cid ]

=== modified file 'debian/control'
--- debian/control	2015-08-11 14:45:07 +0000
+++ debian/control	2015-08-14 11:40:06 +0000
@@ -87,7 +87,8 @@
 Package: unity8
 Architecture: any
 Provides: indicator-renderer,
-Depends: gsettings-desktop-schemas,
+Depends: dmz-cursor-theme,
+         gsettings-desktop-schemas,
          libcap2-bin,
          libglib2.0-bin,
          qmenumodel-qml (>= 0.2.9),

=== modified file 'plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp'
--- plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp	2015-05-05 11:19:15 +0000
+++ plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp	2015-08-14 11:40:06 +0000
@@ -101,8 +101,6 @@
                     if (!iDevice)
                         continue;
 
-                    qDebug() << "*** ADDING DEVICE" << eventPath;
-
                     iDevice->setTypes(getInputTypes(dev));
 
                 if (iDevice->switches().count() > 0 && iDevice->buttons().count() == 0)
@@ -125,12 +123,6 @@
 
 QInputDeviceInfo::InputTypes QInputDeviceInfoPrivate::getInputTypes( struct udev_device *dev)
 {
-    qDebug() << "******* have input type Keyboard" << udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD");
-    qDebug() << "******* have input type Mouse" << udev_device_get_property_value(dev, "ID_INPUT_MOUSE");
-    qDebug() << "******* have input type Touchpad" << udev_device_get_property_value(dev, "ID_INPUT_TOUCHPAD");
-    qDebug() << "******* have input type Touchscreen" << udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN");
-    qDebug() << "******* have input type Tablet" << udev_device_get_property_value(dev, "ID_INPUT_TABLET");
-    qDebug() << "******* have input type joystick" << udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");
     QInputDeviceInfo::InputTypes types = QInputDeviceInfo::Unknown;
     if (qstrcmp(udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD"), "1") == 0 )
        types |= QInputDeviceInfo::Keyboard;
@@ -151,6 +143,7 @@
 QInputDevice *QInputDeviceInfoPrivate::addDevice(const QString &path)
 {
     QInputDevice *inputDevice = new QInputDevice(this);
+    inputDevice->setDevicePath(path);
 
     struct libevdev *dev = NULL;
     int fd;
@@ -158,17 +151,15 @@
     fd = open(path.toLatin1(), O_RDONLY|O_NONBLOCK);
 
     if (fd == -1) {
-        qDebug() << "Failed to open";
         return inputDevice;
     }
     rc = libevdev_new_from_fd(fd, &dev);
     if (rc < 0) {
-        qDebug() << "Failed to init libevdev ("<< strerror(-rc) << ")";
+        qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";
         return inputDevice;
     }
 
     inputDevice->setName(QString::fromLatin1(libevdev_get_name(dev)));
-    inputDevice->setDevicePath(path);
     for (int i = 0; i < EV_MAX; i++) {
         if (i == EV_KEY || i == EV_SW || i == EV_REL
                 || i == EV_REL || i == EV_ABS) {

=== modified file 'qml/Components/InputMethod.qml'
--- qml/Components/InputMethod.qml	2014-10-01 13:20:32 +0000
+++ qml/Components/InputMethod.qml	2015-08-14 11:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,24 +22,44 @@
 Item {
     id: root
 
-    property var surface: null
+    Connections {
+        target: SurfaceManager
+        onSurfaceCreated: {
+            if (surface.type == Mir.InputMethodType) {
+                surfaceItem.surface = surface;
+            }
+        }
+    }
 
     property int transitionDuration: UbuntuAnimation.FastDuration
 
-    Binding { target: surface; property: "z"; value: 0 }
+    MirSurfaceItem {
+        id: surfaceItem
+        anchors.fill: parent
+
+        consumesInput: true
+
+        surfaceWidth: width
+        surfaceHeight: height
+
+        onLiveChanged: {
+            if (surface !== null && !live) {
+                surface = null;
+            }
+        }
+    }
 
     TouchGate {
         x: UbuntuKeyboardInfo.x
         y: UbuntuKeyboardInfo.y
-        z: 1
         width: UbuntuKeyboardInfo.width
         height: UbuntuKeyboardInfo.height
 
-        targetItem: root.surface
+        targetItem: surfaceItem
     }
 
     state: {
-        if (surface && surface.state != MirSurfaceItem.Minimized) {
+        if (surfaceItem.surface && surfaceItem.surfaceState != Mir.MinimizedState) {
             return "shown";
         } else {
             return "hidden";
@@ -74,19 +94,4 @@
             UbuntuNumberAnimation { property: "y"; duration: transitionDuration }
         }
     ]
-
-    onSurfaceChanged: {
-        if (surface) {
-            surface.parent = root;
-            surface.anchors.fill = root;
-        }
-    }
-
-    Component.onDestruction: {
-        if (surface) {
-            surface.parent = null;
-            surface.release();
-            surface = null;
-        }
-    }
 }

=== modified file 'qml/DeviceConfiguration.qml'
--- qml/DeviceConfiguration.qml	2015-07-01 17:52:34 +0000
+++ qml/DeviceConfiguration.qml	2015-08-14 11:40:06 +0000
@@ -28,6 +28,7 @@
                                       | Qt.LandscapeOrientation
                                       | Qt.InvertedLandscapeOrientation
 
+    property int multiMonitorOrientation: Qt.InvertedLandscapeOrientation
     // Supported values so far:
     // "phone", "tablet" or "desktop"
     property string category: "phone"
@@ -86,6 +87,7 @@
             PropertyChanges {
                 target: root
                 category: "desktop"
+                multiMonitorOrientation: Qt.PortraitOrientation
             }
         }
     ]

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-06-12 16:07:43 +0000
+++ qml/Greeter/Greeter.qml	2015-08-14 11:40:06 +0000
@@ -212,7 +212,7 @@
 
     // event eater
     // Nothing should leak to items behind the greeter
-    MouseArea { anchors.fill: parent }
+    MouseArea { anchors.fill: parent; hoverEnabled: true }
 
     Loader {
         id: loader

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2015-07-23 07:30:25 +0000
+++ qml/Launcher/Launcher.qml	2015-08-14 11:40:06 +0000
@@ -187,6 +187,7 @@
             bottom: parent.bottom
         }
         enabled: root.shadeBackground && root.state == "visible"
+        visible: enabled // otherwise it will get in the way of cursor selection for some reason
         onPressed: {
             root.state = ""
         }

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2015-08-12 08:40:34 +0000
+++ qml/OrientedShell.qml	2015-08-14 11:40:06 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
+import Unity.Screens 0.1
 import Unity.Session 0.1
 import GSettings 1.0
 import "Components"
@@ -39,6 +40,9 @@
             deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
                    ? nativeOrientation : deviceConfiguration.primaryOrientation
 
+    Screens { id: screens }
+    readonly property bool multiMonitor: screens.count > 1
+
     DeviceConfiguration {
         id: deviceConfiguration
         name: applicationArguments.deviceName
@@ -91,6 +95,10 @@
     readonly property int supportedOrientations: shell.supportedOrientations
                                                & deviceConfiguration.supportedOrientations
     property int acceptedOrientationAngle: {
+        if (multiMonitor) {
+            return Screen.angleBetween(nativeOrientation, deviceConfiguration.multiMonitorOrientation);
+        }
+
         if (orientation & supportedOrientations) {
             return Screen.angleBetween(nativeOrientation, orientation);
         } else if (shell.orientation & supportedOrientations) {
@@ -159,11 +167,12 @@
         nativeWidth: root.width
         nativeHeight: root.height
         mode: applicationArguments.mode
+        cursorVisible: UnityInputInfo.mice > deviceConfiguration.ignoredMice
 
         // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen),
         //       what's the output device (eg: big TV, desktop monitor, phone display), etc.
         usageScenario: {
-            if (root.unity8Settings.usageMode === "Windowed") {
+            if (root.unity8Settings.usageMode === "Windowed" || multiMonitor) {
                 return "desktop";
             } else if (root.unity8Settings.usageMode === "Staged") {
                 if (deviceConfiguration.category === "phone") {

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-06-29 03:58:22 +0000
+++ qml/Panel/Panel.qml	2015-08-14 11:40:06 +0000
@@ -48,6 +48,7 @@
         MouseArea {
             anchors.fill: parent
             onClicked: if (indicators.fullyOpened) indicators.hide();
+            hoverEnabled: true // should also eat hover events, otherwise they will pass through
         }
     }
 

=== modified file 'qml/Rotation/RotationStates.qml'
--- qml/Rotation/RotationStates.qml	2015-05-11 14:36:03 +0000
+++ qml/Rotation/RotationStates.qml	2015-08-14 11:40:06 +0000
@@ -83,9 +83,11 @@
         }
 
         function tryUpdateState() {
-            if (d.transitioning || (!d.startingUp && !root.shell.orientationChangesEnabled)) {
+            if (d.transitioning || (!d.startingUp && !root.shell.orientationChangesEnabled
+                                    && d.cachedMultiMonitorState === root.orientedShell.multiMonitor)) {
                 return;
             }
+            d.cachedMultiMonitorState = root.orientedShell.multiMonitor
 
             var requestedState = d.requestedOrientationAngle.toString();
             if (requestedState !== root.state) {
@@ -110,6 +112,7 @@
         readonly property int fullAnimation: 0
         readonly property int indicatorsBarAnimation: 1
         readonly property int noAnimation: 2
+        property bool cachedMultiMonitorState: false
 
         property int animationType
 

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-08-03 13:47:44 +0000
+++ qml/Shell.qml	2015-08-14 11:40:06 +0000
@@ -56,6 +56,7 @@
     property bool beingResized
     property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop"
     property string mode: "full-greeter"
+    property bool cursorVisible: false
     function updateFocusedAppOrientation() {
         applicationsDisplayLoader.item.updateFocusedAppOrientation();
     }
@@ -188,7 +189,6 @@
 
     ScreenGrabber {
         id: screenGrabber
-        z: dialogs.z + 10
     }
 
     WindowKeysFilter {
@@ -397,25 +397,6 @@
     }
 
     Connections {
-        target: SurfaceManager
-        onSurfaceCreated: {
-            if (surface.type == MirSurfaceItem.InputMethod) {
-                inputMethod.surface = surface;
-            }
-        }
-
-        onSurfaceDestroyed: {
-            if (inputMethod.surface == surface) {
-                inputMethod.surface = null;
-                surface.parent = null;
-            }
-            if (!surface.parent) {
-                // there's no one displaying it. delete it right away
-                surface.release();
-            }
-        }
-    }
-    Connections {
         target: SessionManager
         onSessionStopping: {
             if (!session.parentSession && !session.application) {
@@ -691,9 +672,15 @@
         onShowHome: showHome()
     }
 
+    Cursor {
+        id: cursor
+        visible: shell.cursorVisible
+        z: dialogs.z + 1
+    }
+
     Rectangle {
         id: shutdownFadeOutRectangle
-        z: screenGrabber.z + 10
+        z: cursor.z + 1
         enabled: false
         visible: false
         color: "black"

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2015-07-14 08:09:58 +0000
+++ qml/Stages/ApplicationWindow.qml	2015-08-14 11:40:06 +0000
@@ -50,7 +50,8 @@
         property bool hadSurface: sessionContainer.surfaceContainer.hadSurface
 
         property bool needToTakeScreenshot:
-            sessionContainer.surface && d.surfaceInitialized && screenshotImage.status === Image.Null
+            ((sessionContainer.surface && d.surfaceInitialized) || d.hadSurface)
+            && screenshotImage.status === Image.Null
             && d.applicationState === ApplicationInfoInterface.Stopped
         onNeedToTakeScreenshotChanged: {
             if (needToTakeScreenshot) {

=== modified file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml	2015-06-11 09:50:55 +0000
+++ qml/Stages/DecoratedWindow.qml	2015-08-14 11:40:06 +0000
@@ -34,9 +34,10 @@
     property int windowWidth: width
     property int windowHeight: height
 
-    signal close();
-    signal maximize();
-    signal minimize();
+    signal close()
+    signal maximize()
+    signal minimize()
+    signal decorationPressed()
 
     state: "normal"
     states: [
@@ -88,6 +89,7 @@
 
     WindowDecoration {
         id: decoration
+        target: root.parent
         objectName: application ? "appWindowDecoration_" + application.appId : "appWindowDecoration_null"
         anchors { left: parent.left; top: parent.top; right: parent.right }
         height: units.gu(3)
@@ -95,6 +97,7 @@
         onClose: root.close();
         onMaximize: root.maximize();
         onMinimize: root.minimize();
+        onPressed: root.decorationPressed();
         visible: decorationShown
     }
 

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2015-08-03 13:47:44 +0000
+++ qml/Stages/DesktopStage.qml	2015-08-14 11:40:06 +0000
@@ -208,12 +208,6 @@
                 onFocusChanged: {
                     if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
                         ApplicationManager.requestFocusApplication(model.appId);
-                        decoratedWindow.forceActiveFocus();
-                    }
-                }
-                Component.onCompleted: {
-                    if (ApplicationManager.focusedApplicationId == model.appId) {
-                        decoratedWindow.forceActiveFocus();
                     }
                 }
 
@@ -292,7 +286,7 @@
                             enabled: true
                         }
                         PropertyChanges {
-                            target: windowMoveResizeArea
+                            target: windowResizeArea
                             enabled: false
                         }
                     }
@@ -318,12 +312,12 @@
                     itemHeight: appDelegate.height
                 }
 
-                WindowMoveResizeArea {
-                    id: windowMoveResizeArea
+                WindowResizeArea {
+                    id: windowResizeArea
                     target: appDelegate
                     minWidth: appDelegate.minWidth
                     minHeight: appDelegate.minHeight
-                    resizeHandleWidth: units.gu(2)
+                    borderThickness: units.gu(2)
                     windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
 
                     onPressed: appDelegate.focus = true;
@@ -338,11 +332,12 @@
                     windowHeight: appDelegate.height
                     application: ApplicationManager.get(index)
                     active: ApplicationManager.focusedApplicationId === model.appId
-                    focus: false
+                    focus: true
 
                     onClose: ApplicationManager.stopApplication(model.appId)
                     onMaximize: appDelegate.maximize()
                     onMinimize: appDelegate.minimize()
+                    onDecorationPressed: appDelegate.focus = true;
 
                     transform: [
                         Scale {

=== added file 'qml/Stages/ResizeArea.qml'
--- qml/Stages/ResizeArea.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/ResizeArea.qml	2015-08-14 11:40:06 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Unity.Application 0.1
+
+MouseArea {
+    id: root
+
+    // to be set from outside
+    property Item target
+    property bool leftBorder: false
+    property bool rightBorder: false
+    property bool topBorder: false
+    property bool bottomBorder: false
+
+    property bool dragging: false
+    property real startX
+    property real startY
+    property real startWidth
+    property real startHeight
+
+    hoverEnabled: true
+
+    property string cursorName: {
+        if (leftBorder && !topBorder && !bottomBorder) {
+            return "left_side";
+        } else if (rightBorder && !topBorder && !bottomBorder) {
+            return "right_side";
+        } else if (topBorder && !leftBorder && !rightBorder) {
+            return "top_side";
+        } else if (bottomBorder && !leftBorder && !rightBorder) {
+            return "bottom_side";
+        } else if (leftBorder && topBorder) {
+            return "top_left_corner";
+        } else if (leftBorder && bottomBorder) {
+            return "bottom_left_corner";
+        } else if (rightBorder && topBorder) {
+            return "top_right_corner";
+        } else if (rightBorder && bottomBorder) {
+            return "bottom_right_corner";
+        }
+    }
+
+    function updateCursorName() {
+        if (containsMouse || pressed) {
+            Mir.cursorName = root.cursorName;
+        } else {
+            Mir.cursorName = "";
+        }
+    }
+
+    onContainsMouseChanged: {
+        updateCursorName();
+    }
+
+    onPressedChanged: {
+        updateCursorName();
+        if (pressed) {
+            var pos = mapToItem(target.parent, mouseX, mouseY);
+            startX = pos.x;
+            startY = pos.y;
+            startWidth = target.width;
+            startHeight = target.height;
+            dragging = true;
+        } else {
+            dragging = false;
+        }
+    }
+
+    onMouseXChanged: {
+        if (!pressed || !dragging) {
+            return;
+        }
+
+        var pos = mapToItem(target.parent, mouseX, mouseY);
+
+        if (leftBorder) {
+            if (startX + startWidth > pos.x + target.minWidth) {
+                target.x = pos.x;
+                target.width = startX + startWidth - target.x;
+                startX = target.x;
+                startWidth = target.width;
+            } else if (startX + startWidth < pos.x + target.minWidth) {
+                // don't let it get thinner than minWidth
+                target.x = startX + startWidth - target.minWidth;
+                target.width = target.minWidth;
+            }
+
+        } else if (rightBorder) {
+            var deltaX = pos.x - startX;
+            if (startWidth + deltaX >= target.minWidth) {
+                target.width = startWidth + deltaX;
+            } else {
+                target.width = target.minWidth;
+            }
+        }
+    }
+
+    onMouseYChanged: {
+        if (!pressed || !dragging) {
+            return;
+        }
+
+        var pos = mapToItem(target.parent, mouseX, mouseY);
+
+        if (topBorder) {
+
+            if (startY + startHeight > pos.y + target.minHeight) {
+                target.y = pos.y;
+                target.height = startY + startHeight - target.y;
+                startY = target.y;
+                startHeight = target.height;
+            } else if (startY + startHeight < pos.y + target.minHeight) {
+                // don't let it get shorter than minHeight
+                target.y = startY + startHeight - target.minHeight;
+                target.height = target.minHeight;
+            }
+
+        } else if (bottomBorder) {
+            var deltaY = pos.y - startY;
+            if (startHeight + deltaY >= target.minHeight) {
+                target.height = startHeight + deltaY;
+            } else {
+                target.height = target.minHeight;
+            }
+        }
+    }
+}

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-04-15 11:37:00 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-08-14 11:40:06 +0000
@@ -18,34 +18,26 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Gestures 0.1 // For TouchGate
 import Utils 0.1 // for InputWatcher
+import Unity.Application 0.1 // for MirSurfaceItem
 
 FocusScope {
     id: root
     objectName: "surfaceContainer"
-    property Item surface: null
+
+    property var surface: null
     property bool hadSurface: false
     property bool interactive
     property int surfaceOrientationAngle: 0
 
     onSurfaceChanged: {
         if (surface) {
-            // Set the surface focus *after* it is added to the scene to
-            // ensure an update to the scene's active focus.
-            surface.focus = false;
-            surface.parent = root;
-            surface.focus = true;
-        } else {
-            hadSurface = true;
+            surfaceItem.surface = surface;
+            root.hadSurface = false;
         }
     }
-    Binding { target: surface; property: "anchors.fill"; value: root }
-    Binding { target: surface; property: "z"; value: 1 }
-    Binding { target: surface; property: "enabled"; value: root.interactive; when: surface }
-    Binding { target: surface; property: "antialiasing"; value: !root.interactive; when: surface }
-    Binding { target: surface; property: "orientationAngle"; value: root.surfaceOrientationAngle; when: surface }
 
     InputWatcher {
-        target: root.surface
+        target: surfaceItem
         onTargetPressedChanged: {
             if (targetPressed && root.interactive) {
                 root.focus = true;
@@ -54,28 +46,53 @@
         }
     }
 
+    MirSurfaceItem {
+        id: surfaceItem
+        objectName: "surfaceItem"
+
+        consumesInput: true
+
+        surfaceWidth: width
+        surfaceHeight: height
+
+        anchors.fill: root
+        enabled: root.interactive
+        focus: true
+        antialiasing: !root.interactive
+        orientationAngle: root.surfaceOrientationAngle
+    }
+
     TouchGate {
-        targetItem: surface
+        targetItem: surfaceItem
         anchors.fill: root
-        enabled: root.surface ? root.surface.enabled : false
-        z: 2
+        enabled: surfaceItem.enabled
     }
 
     states: [
         State {
             name: "zombie"
-            when: surface && !surface.live
+            when: surfaceItem.surface && !surfaceItem.live
         }
     ]
     transitions: [
         Transition {
             from: ""; to: "zombie"
             SequentialAnimation {
-                UbuntuNumberAnimation { target: surface; property: "opacity"; to: 0.0
+                UbuntuNumberAnimation { target: surfaceItem; property: "opacity"; to: 0.0
                                         duration: UbuntuAnimation.BriskDuration }
-                PropertyAction { target: surface; property: "visible"; value: false }
-                ScriptAction { script: { if (root.surface) { root.surface.release(); } } }
+                PropertyAction { target: surfaceItem; property: "visible"; value: false }
+                ScriptAction { script: {
+                    surfaceItem.surface = null;
+                    root.hadSurface = true;
+                } }
             }
+        },
+        Transition {
+            from: "zombie"; to: ""
+            ScriptAction { script: {
+                surfaceItem.opacity = 1.0;
+                surfaceItem.visible = true;
+            } }
         }
     ]
 }

=== modified file 'qml/Stages/WindowDecoration.qml'
--- qml/Stages/WindowDecoration.qml	2015-03-13 19:18:35 +0000
+++ qml/Stages/WindowDecoration.qml	2015-08-14 11:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,18 +12,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Michael Zanetti <[e-mail]>
  */
 
 import QtQuick 2.3
+import Unity.Application 0.1 // For Mir singleton
 import Ubuntu.Components 1.1
 import "../Components"
 
-Item {
+MouseArea {
     id: root
     clip: true
 
+    property Item target
     property alias title: titleLabel.text
     property bool active: false
 
@@ -31,6 +31,33 @@
     signal minimize()
     signal maximize()
 
+    QtObject {
+        id: priv
+        property real distanceX
+        property real distanceY
+        property bool dragging
+    }
+
+    onPressedChanged: {
+        if (pressed) {
+            var pos = mapToItem(root.target, mouseX, mouseY);
+            priv.distanceX = pos.x;
+            priv.distanceY = pos.y;
+            priv.dragging = true;
+            Mir.cursorName = "grabbing";
+        } else {
+            priv.dragging = false;
+            Mir.cursorName = "";
+        }
+    }
+    onMouseXChanged: {
+        if (priv.dragging) {
+            var pos = mapToItem(root.target.parent, mouseX, mouseY);
+            root.target.x = pos.x - priv.distanceX;
+            root.target.y = pos.y - priv.distanceY;
+        }
+    }
+
     Rectangle {
         anchors.fill: parent
         anchors.bottomMargin: -radius

=== renamed file 'qml/Stages/WindowMoveResizeArea.qml' => 'qml/Stages/WindowResizeArea.qml'
--- qml/Stages/WindowMoveResizeArea.qml	2015-03-13 19:01:32 +0000
+++ qml/Stages/WindowResizeArea.qml	2015-08-14 11:40:06 +0000
@@ -12,18 +12,18 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Michael Zanetti <[e-mail]>
  */
 
 import QtQuick 2.3
 import Ubuntu.Components 1.1
 import Utils 0.1
 
-MouseArea {
+Item {
     id: root
     anchors.fill: target
-    anchors.margins: -resizeHandleWidth
+    anchors.margins: -borderThickness
+
+    signal pressed()
 
     property var windowStateStorage: WindowStateStorage
 
@@ -31,24 +31,10 @@
     // The area will anchor to it and manage move and resize events
     property Item target: null
     property string windowId: ""
-    property int resizeHandleWidth: 0
+    property int borderThickness: 0
     property int minWidth: 0
     property int minHeight: 0
 
-    QtObject {
-        id: priv
-        readonly property int windowWidth: root.width - root.resizeHandleWidth * 2
-        readonly property int windowHeight: root.height - resizeHandleWidth * 2
-
-        property var startPoint
-
-        property bool resizeTop: false
-        property bool resizeBottom: false
-        property bool resizeLeft: false
-        property bool resizeRight: false
-
-    }
-
     Component.onCompleted: {
         var windowState = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
         if (windowState !== undefined) {
@@ -59,51 +45,98 @@
         }
     }
 
-    onPressed: {
-        priv.startPoint = Qt.point(mouse.x, mouse.y);
-        priv.resizeTop = mouseY < root.resizeHandleWidth;
-        priv.resizeBottom = mouseY > (root.height - root.resizeHandleWidth);
-        priv.resizeLeft = mouseX < root.resizeHandleWidth;
-        priv.resizeRight = mouseX > (root.width - root.resizeHandleWidth);
-    }
-
-    onPositionChanged: {
-        var currentPoint = Qt.point(mouse.x, mouse.y);
-        var mouseDiff = Qt.point(currentPoint.x - priv.startPoint.x, currentPoint.y - priv.startPoint.y);
-        var moveDiff = Qt.point(0, 0);
-        var sizeDiff = Qt.point(0, 0);
-        var maxSizeDiff = Qt.point(root.minWidth - root.target.width, root.minHeight - root.target.height)
-
-        if (priv.resizeTop || priv.resizeBottom || priv.resizeLeft || priv.resizeRight) {
-            if (priv.resizeTop) {
-                sizeDiff.y = Math.max(maxSizeDiff.y, -currentPoint.y + priv.startPoint.y)
-                moveDiff.y = -sizeDiff.y
-            }
-            if (priv.resizeBottom) {
-                sizeDiff.y = Math.max(maxSizeDiff.y, currentPoint.y - priv.startPoint.y)
-                priv.startPoint.y += sizeDiff.y
-            }
-            if (priv.resizeLeft) {
-                sizeDiff.x = Math.max(maxSizeDiff.x, -currentPoint.x + priv.startPoint.x)
-                moveDiff.x = -sizeDiff.x
-            }
-            if (priv.resizeRight) {
-                sizeDiff.x = Math.max(maxSizeDiff.x, currentPoint.x - priv.startPoint.x)
-                priv.startPoint.x += sizeDiff.x
-            }
-
-            target.x += moveDiff.x;
-            target.y += moveDiff.y;
-            target.width += sizeDiff.x;
-            target.height += sizeDiff.y;
-        } else {
-            target.x += mouseDiff.x;
-            target.y += mouseDiff.y;
-        }
-
-    }
-
     Component.onDestruction: {
         windowStateStorage.saveGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
     }
+
+    ResizeArea {
+        anchors.top: root.top
+        anchors.bottom: root.bottom
+        anchors.margins: root.borderThickness
+        width: root.borderThickness
+
+        leftBorder: true
+        target: root.target
+        onPressed: { root.pressed(); }
+    }
+    ResizeArea {
+        anchors.right: root.right
+        anchors.top: root.top
+        anchors.topMargin: root.borderThickness
+        anchors.bottom: root.bottom
+        anchors.bottomMargin: root.borderThickness
+        width: root.borderThickness
+
+        rightBorder: true
+        target: root.target
+        onPressed: { root.pressed(); }
+    }
+    ResizeArea {
+        anchors.left: root.left
+        anchors.leftMargin: root.borderThickness
+        anchors.right: root.right
+        anchors.rightMargin: root.borderThickness
+        anchors.top: root.top
+        height: root.borderThickness
+
+        topBorder: true
+        target: root.target
+        onPressed: { root.pressed(); }
+    }
+    ResizeArea {
+        anchors.left: root.left
+        anchors.leftMargin: root.borderThickness
+        anchors.right: root.right
+        anchors.rightMargin: root.borderThickness
+        anchors.bottom: root.bottom
+        height: root.borderThickness
+
+        bottomBorder: true
+        target: root.target
+        onPressed: { root.pressed(); }
+    }
+    ResizeArea {
+        anchors.left: root.left
+        anchors.top: root.top
+        width: root.borderThickness
+        height: root.borderThickness
+
+        topBorder: true
+        leftBorder: true
+        target: root.target
+        onPressed: { root.pressed(); }
+    }
+    ResizeArea {
+        anchors.left: root.left
+        anchors.bottom: root.bottom
+        width: root.borderThickness
+        height: root.borderThickness
+
+        bottomBorder: true
+        leftBorder: true
+        target: root.target
+        onPressed: { root.pressed(); }
+    }
+    ResizeArea {
+        anchors.right: root.right
+        anchors.top: root.top
+        width: root.borderThickness
+        height: root.borderThickness
+
+        topBorder: true
+        rightBorder: true
+        target: root.target
+        onPressed: { root.pressed(); }
+    }
+    ResizeArea {
+        anchors.right: root.right
+        anchors.bottom: root.bottom
+        width: root.borderThickness
+        height: root.borderThickness
+
+        bottomBorder: true
+        rightBorder: true
+        target: root.target
+        onPressed: { root.pressed(); }
+    }
 }

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-06-19 18:19:33 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-08-14 11:40:06 +0000
@@ -15,6 +15,7 @@
  */
 
 #include "ApplicationInfo.h"
+#include "MirSurface.h"
 #include "Session.h"
 #include "SessionManager.h"
 
@@ -74,6 +75,13 @@
     setSession(SessionManager::singleton()->createSession(appId(), screenshotUrl));
 }
 
+void ApplicationInfo::destroySession()
+{
+    Session *session = this->session();
+    setSession(nullptr);
+    delete session;
+}
+
 void ApplicationInfo::setSession(Session* session)
 {
     if (m_session == session)
@@ -92,8 +100,8 @@
         m_session->setApplication(this);
         m_session->setParent(this);
         SessionManager::singleton()->registerSession(m_session);
-        connect(m_session, &Session::surfaceChanged,
-                this, &ApplicationInfo::onSessionSurfaceChanged);
+        connect(m_session, &Session::surfaceAdded,
+                this, &ApplicationInfo::onSessionSurfaceAdded);
 
         if (!m_manualSurfaceCreation) {
             QTimer::singleShot(500, m_session, SLOT(createSurface()));
@@ -237,7 +245,7 @@
     }
 }
 
-void ApplicationInfo::onSessionSurfaceChanged(MirSurfaceItem* surface)
+void ApplicationInfo::onSessionSurfaceAdded(MirSurface* surface)
 {
     if (surface != nullptr && m_state == Starting) {
         if (m_requestedState == RequestedRunning) {

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2015-06-19 18:19:33 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2015-08-14 11:40:06 +0000
@@ -17,13 +17,10 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include "SurfaceManager.h"
-#include "MirSurfaceItemModel.h"
-
 #include <QObject>
 
-class QQuickItem;
-class MirSurfaceItem;
+class MirSurface;
+class Session;
 
 // unity-api
 #include <unity/shell/application/ApplicationInfoInterface.h>
@@ -103,9 +100,10 @@
 
 public Q_SLOTS:
     Q_INVOKABLE void createSession();
+    Q_INVOKABLE void destroySession();
 
 private Q_SLOTS:
-    void onSessionSurfaceChanged(MirSurfaceItem*);
+    void onSessionSurfaceAdded(MirSurface*);
 
 private:
     void setIcon(const QUrl &value);

=== modified file 'tests/mocks/Unity/Application/ApplicationTestInterface.cpp'
--- tests/mocks/Unity/Application/ApplicationTestInterface.cpp	2014-08-29 14:50:49 +0000
+++ tests/mocks/Unity/Application/ApplicationTestInterface.cpp	2015-08-14 11:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include "SessionManager.h"
 #include "SurfaceManager.h"
 #include "Session.h"
-#include "MirSurfaceItem.h"
+#include "MirSurface.h"
 
 #include <paths.h>
 
@@ -62,7 +62,7 @@
         existingSession->setLive(false);
 }
 
-void ApplicationTestInterface::removeSurface(MirSurfaceItem* existingSurface)
+void ApplicationTestInterface::removeSurface(MirSurface* existingSurface)
 {
     qDebug() << "ApplicationTestInterface::removeSurface - " << existingSurface;
 

=== modified file 'tests/mocks/Unity/Application/ApplicationTestInterface.h'
--- tests/mocks/Unity/Application/ApplicationTestInterface.h	2014-08-29 14:50:49 +0000
+++ tests/mocks/Unity/Application/ApplicationTestInterface.h	2015-08-14 11:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 
 class ApplicationManager;
 class Session;
-class MirSurfaceItem;
+class MirSurface;
 
 class ApplicationTestInterface : public QDBusAbstractAdaptor
 {
@@ -32,7 +32,7 @@
 
     Q_INVOKABLE Session* addChildSession(Session* existingSession, const QString& surfaceImage);
     Q_INVOKABLE void removeSession(Session* existingSession);
-    Q_INVOKABLE void removeSurface(MirSurfaceItem* existingSurface);
+    Q_INVOKABLE void removeSurface(MirSurface* existingSurface);
 
 public Q_SLOTS:
     quint32 addChildSession(const QString& appId, quint32 existingSessionId, const QString& surfaceImage);

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2015-06-12 16:07:43 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2015-08-14 11:40:06 +0000
@@ -4,8 +4,8 @@
     ApplicationManager.cpp
     ApplicationScreenshotProvider.cpp
     ApplicationTestInterface.cpp
+    MirSurface.cpp
     MirSurfaceItem.cpp
-    MirSurfaceItemModel.h
     ObjectListModel.h
     Session.cpp
     SessionManager.cpp
@@ -15,6 +15,9 @@
     VirtualKeyboard.cpp
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceItemInterface.h
 )
 
 add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})

=== added file 'tests/mocks/Unity/Application/Cursor.qml'
--- tests/mocks/Unity/Application/Cursor.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/Cursor.qml	2015-08-14 11:40:06 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+
+Item {
+}

=== added file 'tests/mocks/Unity/Application/MirSurface.cpp'
--- tests/mocks/Unity/Application/MirSurface.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/MirSurface.cpp	2015-08-14 11:40:06 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MirSurface.h"
+
+#include <QDebug>
+
+MirSurface::MirSurface(const QString& name,
+        Mir::Type type,
+        Mir::State state,
+        const QUrl& screenshot,
+        const QString &qmlFilePath)
+    : unity::shell::application::MirSurfaceInterface(nullptr)
+    , m_name(name)
+    , m_type(type)
+    , m_state(state)
+    , m_orientationAngle(Mir::Angle0)
+    , m_screenshotUrl(screenshot)
+    , m_qmlFilePath(qmlFilePath)
+    , m_live(true)
+    , m_viewCount(0)
+    , m_activeFocus(false)
+    , m_width(-1)
+    , m_height(-1)
+{
+    qDebug() << "MirSurface::MirSurface() " << name;
+}
+
+MirSurface::~MirSurface()
+{
+    qDebug() << "MirSurface::~MirSurface() " << name();
+}
+
+QString MirSurface::name() const
+{
+    return m_name;
+}
+
+Mir::Type MirSurface::type() const
+{
+    return m_type;
+}
+
+Mir::State MirSurface::state() const
+{
+    return m_state;
+}
+
+void MirSurface::setState(Mir::State state)
+{
+    if (state == m_state)
+        return;
+
+    m_state = state;
+    Q_EMIT stateChanged(state);
+}
+
+bool MirSurface::live() const
+{
+    return m_live;
+}
+
+void MirSurface::setLive(bool live)
+{
+    qDebug().nospace() << "MirSurface::setLive("<<live<<") " << name();
+    if (live == m_live)
+        return;
+
+    m_live = live;
+    Q_EMIT liveChanged(live);
+
+    if (!m_live && m_viewCount == 0) {
+        deleteLater();
+    }
+}
+
+QString MirSurface::qmlFilePath() const
+{
+    return m_qmlFilePath;
+}
+
+QUrl MirSurface::screenshotUrl() const
+{
+    return m_screenshotUrl;
+}
+
+void MirSurface::setScreenshotUrl(QUrl screenshotUrl)
+{
+    if (screenshotUrl == m_screenshotUrl)
+        return;
+
+    m_screenshotUrl = screenshotUrl;
+    Q_EMIT screenshotUrlChanged(screenshotUrl);
+}
+
+Mir::OrientationAngle MirSurface::orientationAngle() const
+{
+    return m_orientationAngle;
+}
+
+void MirSurface::setOrientationAngle(Mir::OrientationAngle angle)
+{
+    if (angle == m_orientationAngle)
+        return;
+
+    m_orientationAngle = angle;
+    Q_EMIT orientationAngleChanged(angle);
+}
+
+void MirSurface::incrementViewCount()
+{
+    ++m_viewCount;
+    qDebug().nospace() << "MirSurface::incrementViewCount() viewCount(after)=" << m_viewCount << " " << name();
+}
+
+void MirSurface::decrementViewCount()
+{
+    --m_viewCount;
+    qDebug().nospace() << "MirSurface::decrementViewCount() viewCount(after)=" << m_viewCount << " " << name();
+
+    Q_ASSERT(m_viewCount >= 0);
+
+    if (!m_live && m_viewCount == 0) {
+        deleteLater();
+    }
+}
+
+int MirSurface::viewCount() const
+{
+    return m_viewCount;
+}
+
+bool MirSurface::activeFocus() const
+{
+    return m_activeFocus;
+}
+
+void MirSurface::setActiveFocus(bool value)
+{
+    if (m_activeFocus == value)
+        return;
+
+    m_activeFocus = value;
+
+    Q_EMIT activeFocusChanged(value);
+}
+
+int MirSurface::width() const
+{
+    return m_width;
+}
+
+int MirSurface::height() const
+{
+    return m_height;
+}
+
+void MirSurface::resize(int width, int height)
+{
+    if (width != m_width) {
+        m_width = width;
+        Q_EMIT widthChanged();
+    }
+
+    if (m_height != height) {
+        m_height = height;
+        Q_EMIT heightChanged();
+    }
+}

=== added file 'tests/mocks/Unity/Application/MirSurface.h'
--- tests/mocks/Unity/Application/MirSurface.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/MirSurface.h	2015-08-14 11:40:06 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_MIR_SURFACE_H
+#define MOCK_MIR_SURFACE_H
+
+#include <QObject>
+#include <QUrl>
+
+// unity-api
+#include <unity/shell/application/MirSurfaceInterface.h>
+
+class MirSurface : public unity::shell::application::MirSurfaceInterface
+{
+    Q_OBJECT
+
+    ////
+    // for use in qml tests
+    Q_PROPERTY(int width READ width NOTIFY widthChanged)
+    Q_PROPERTY(int height READ height NOTIFY heightChanged)
+    Q_PROPERTY(bool activeFocus READ activeFocus NOTIFY activeFocusChanged)
+
+public:
+    MirSurface(const QString& name,
+            Mir::Type type,
+            Mir::State state,
+            const QUrl& screenshot,
+            const QString &qmlFilePath = QString());
+    virtual ~MirSurface();
+
+    ////
+    // unity.shell.application.MirSurface
+
+    Mir::Type type() const override;
+
+    QString name() const override;
+
+    QSize size() const override { return QSize(width(),height()); }
+    void resize(int width, int height) override;
+
+    Mir::State state() const override;
+    void setState(Mir::State) override;
+
+    bool live() const override;
+
+    Mir::OrientationAngle orientationAngle() const override;
+    void setOrientationAngle(Mir::OrientationAngle) override;
+
+    ////
+    // API for tests
+
+    Q_INVOKABLE void setLive(bool live);
+
+    void incrementViewCount();
+    void decrementViewCount();
+    int viewCount() const;
+
+    int width() const;
+    int height() const;
+
+    /////
+    // internal mock stuff
+
+    QString qmlFilePath() const;
+
+    QUrl screenshotUrl() const;
+    void setScreenshotUrl(QUrl);
+
+    bool activeFocus() const;
+    void setActiveFocus(bool);
+
+Q_SIGNALS:
+    void stateChanged(Mir::State);
+    void liveChanged(bool live);
+    void orientationAngleChanged(Mir::OrientationAngle angle);
+    void widthChanged();
+    void heightChanged();
+
+    ////
+    // internal mock stuff
+    void screenshotUrlChanged(QUrl);
+    void activeFocusChanged(bool);
+
+private:
+    const QString m_name;
+    const Mir::Type m_type;
+    Mir::State m_state;
+    Mir::OrientationAngle m_orientationAngle;
+    QUrl m_screenshotUrl;
+    QString m_qmlFilePath;
+    bool m_live;
+    int m_viewCount;
+    bool m_activeFocus;
+    int m_width;
+    int m_height;
+};
+
+#endif // MOCK_MIR_SURFACE_H

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-04-23 16:18:25 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-08-14 11:40:06 +0000
@@ -15,7 +15,6 @@
  */
 
 #include "MirSurfaceItem.h"
-#include "Session.h"
 
 #include <paths.h>
 
@@ -27,69 +26,30 @@
 
 #include <QDebug>
 
-MirSurfaceItem::MirSurfaceItem(const QString& name,
-                               MirSurfaceItem::Type type,
-                               MirSurfaceItem::State state,
-                               const QUrl& screenshot,
-                               const QString &qmlFilePath,
-                               QQuickItem *parent)
-    : QQuickItem(parent)
-    , m_session(nullptr)
-    , m_name(name)
-    , m_type(type)
-    , m_state(state)
-    , m_live(true)
-    , m_orientationAngle(Angle0)
+using namespace unity::shell::application;
+
+MirSurfaceItem::MirSurfaceItem(QQuickItem *parent)
+    : MirSurfaceItemInterface(parent)
+    , m_qmlSurface(nullptr)
     , m_qmlItem(nullptr)
-    , m_screenshotUrl(screenshot)
+    , m_consumesInput(false)
+    , m_surfaceWidth(0)
+    , m_surfaceHeight(0)
     , m_touchPressCount(0)
     , m_touchReleaseCount(0)
 {
+    qDebug() << "MirSurfaceItem::MirSurfaceItem() " << (void*)(this) << name();
     setAcceptedMouseButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton |
         Qt::ExtraButton1 | Qt::ExtraButton2 | Qt::ExtraButton3 | Qt::ExtraButton4 |
         Qt::ExtraButton5 | Qt::ExtraButton6 | Qt::ExtraButton7 | Qt::ExtraButton8 |
         Qt::ExtraButton9 | Qt::ExtraButton10 | Qt::ExtraButton11 |
         Qt::ExtraButton12 | Qt::ExtraButton13);
-
-    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
-
-    // 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()
 {
-    qDebug() << "MirSurfaceItem::~MirSurfaceItem() " << name();
-    if (m_session) {
-        m_session->setSurface(nullptr);
-    }
+    qDebug() << "MirSurfaceItem::~MirSurfaceItem() " << (void*)(this) << name();
+    setSurface(nullptr);
 }
 
 void MirSurfaceItem::printComponentErrors()
@@ -100,58 +60,70 @@
     }
 }
 
-void MirSurfaceItem::release()
-{
-    qDebug() << "MirSurfaceItem::release " << name();
-
-    if (m_session) {
-        m_session->setSurface(nullptr);
-    }
-    if (!parent()) {
-        deleteLater();
-    }
-}
-
-void MirSurfaceItem::setOrientationAngle(OrientationAngle angle)
-{
-    if (m_orientationAngle == angle)
-        return;
-
-    m_orientationAngle = angle;
+Mir::Type MirSurfaceItem::type() const
+{
+    if (m_qmlSurface) {
+        return m_qmlSurface->type();
+    } else {
+        return Mir::UnknownType;
+    }
+}
+
+Mir::State MirSurfaceItem::surfaceState() const
+{
+    if (m_qmlSurface) {
+        return m_qmlSurface->state();
+    } else {
+        return Mir::UnknownState;
+    }
+}
+
+QString MirSurfaceItem::name() const
+{
+    if (m_qmlSurface) {
+        return m_qmlSurface->name();
+    } else {
+        return QString();
+    }
+}
+
+bool MirSurfaceItem::live() const
+{
+    if (m_qmlSurface) {
+        return m_qmlSurface->live();
+    } else {
+        return false;
+    }
+}
+
+Mir::OrientationAngle MirSurfaceItem::orientationAngle() const
+{
+    if (m_qmlSurface) {
+        return m_qmlSurface->orientationAngle();
+    } else {
+        return Mir::Angle0;
+    }
+}
+
+void MirSurfaceItem::setOrientationAngle(Mir::OrientationAngle angle)
+{
+    if (!m_qmlSurface)
+        return;
+
+    if (m_qmlSurface->orientationAngle() == angle)
+        return;
+
+    m_qmlSurface->setOrientationAngle(angle);
 
     QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
-    orientationProp.write(QVariant::fromValue(m_orientationAngle));
-
-    Q_EMIT orientationAngleChanged(m_orientationAngle);
-}
-
-void MirSurfaceItem::setSession(Session* session)
-{
-    m_session = session;
-}
-
-void MirSurfaceItem::setScreenshot(const QUrl& screenshot)
-{
-    m_screenshotUrl = screenshot;
+    orientationProp.write(QVariant::fromValue(m_qmlSurface->orientationAngle()));
+}
+
+void MirSurfaceItem::updateScreenshot(QUrl screenshotUrl)
+{
     if (m_qmlItem) {
         QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
-        screenshotSource.write(QVariant::fromValue(m_screenshotUrl));
-    }
-}
-
-void MirSurfaceItem::setLive(bool live)
-{
-    if (m_live != live) {
-        m_live = live;
-        Q_EMIT liveChanged(m_live);
-    }
-}
-
-void MirSurfaceItem::setState(MirSurfaceItem::State newState)
-{
-    if (newState != m_state) {
-        m_state = newState;
-        Q_EMIT stateChanged(newState);
+        screenshotSource.write(QVariant::fromValue(screenshotUrl));
     }
 }
 
@@ -174,7 +146,7 @@
 
     {
         QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
-        screenshotSource.write(QVariant::fromValue(m_screenshotUrl));
+        screenshotSource.write(QVariant::fromValue(m_qmlSurface->screenshotUrl()));
     }
 }
 
@@ -188,3 +160,124 @@
         Q_EMIT touchReleaseCountChanged(m_touchReleaseCount);
     }
 }
+
+void MirSurfaceItem::setSurface(MirSurfaceInterface* surface)
+{
+    qDebug().nospace() << "MirSurfaceItem::setSurface() this=" << (void*)(this)
+                                                   << " name=" << name()
+                                                   << " surface=" << surface;
+
+    if (m_qmlSurface == surface) {
+        return;
+    }
+
+    if (m_qmlSurface) {
+        delete m_qmlItem;
+        m_qmlItem = nullptr;
+
+        delete m_qmlContentComponent;
+        m_qmlContentComponent = nullptr;
+
+        disconnect(m_qmlSurface, nullptr, this, nullptr);
+        m_qmlSurface->decrementViewCount();
+    }
+
+    m_qmlSurface = static_cast<MirSurface*>(surface);
+
+    if (m_qmlSurface) {
+        m_qmlSurface->incrementViewCount();
+
+        m_qmlSurface->setActiveFocus(hasActiveFocus());
+
+        updateSurfaceSize();
+
+        connect(m_qmlSurface, &MirSurface::orientationAngleChanged, this, &MirSurfaceItem::orientationAngleChanged);
+        connect(m_qmlSurface, &MirSurface::screenshotUrlChanged, this, &MirSurfaceItem::updateScreenshot);
+        connect(m_qmlSurface, &MirSurface::liveChanged, this, &MirSurfaceItem::liveChanged);
+        connect(m_qmlSurface, &MirSurface::stateChanged, this, &MirSurfaceItem::surfaceStateChanged);
+
+        // The assumptions I make here really should hold.
+        QQuickView *quickView =
+            qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
+
+        QString qmlComponentFilePath;
+        if (!m_qmlSurface->qmlFilePath().isEmpty()) {
+            qmlComponentFilePath.append(m_qmlSurface->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");
+        }
+    }
+
+    Q_EMIT surfaceChanged(m_qmlSurface);
+}
+
+void MirSurfaceItem::itemChange(ItemChange change, const ItemChangeData & value)
+{
+    if (change == QQuickItem::ItemActiveFocusHasChanged) {
+        if (m_qmlSurface) {
+            m_qmlSurface->setActiveFocus(value.boolValue);
+        }
+    }
+}
+
+void MirSurfaceItem::setConsumesInput(bool value)
+{
+    if (m_consumesInput != value) {
+        m_consumesInput = value;
+        Q_EMIT consumesInputChanged(value);
+    }
+}
+
+int MirSurfaceItem::surfaceWidth() const
+{
+    return m_surfaceWidth;
+}
+
+void MirSurfaceItem::setSurfaceWidth(int value)
+{
+    if (m_surfaceWidth != value) {
+        m_surfaceWidth = value;
+        Q_EMIT surfaceWidthChanged(m_surfaceWidth);
+        updateSurfaceSize();
+    }
+}
+
+int MirSurfaceItem::surfaceHeight() const
+{
+    return m_surfaceHeight;
+}
+
+void MirSurfaceItem::setSurfaceHeight(int value)
+{
+    if (m_surfaceHeight != value) {
+        m_surfaceHeight = value;
+        Q_EMIT surfaceHeightChanged(m_surfaceHeight);
+        updateSurfaceSize();
+    }
+}
+
+void MirSurfaceItem::updateSurfaceSize()
+{
+    if (m_qmlSurface && m_surfaceWidth > 0 && m_surfaceHeight > 0) {
+        m_qmlSurface->resize(m_surfaceWidth, m_surfaceHeight);
+    }
+}

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2015-04-23 16:18:25 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2015-08-14 11:40:06 +0000
@@ -17,73 +17,54 @@
 #ifndef MIRSURFACEITEM_H
 #define MIRSURFACEITEM_H
 
-#include "MirSurfaceItemModel.h"
+#include "MirSurface.h"
 
 #include <QQuickItem>
 #include <QUrl>
 
-class Session;
+// unity-api
+#include <unity/shell/application/MirSurfaceItemInterface.h>
 
-class MirSurfaceItem : public QQuickItem
+class MirSurfaceItem : public unity::shell::application::MirSurfaceItemInterface
 {
     Q_OBJECT
-    Q_ENUMS(Type)
-    Q_ENUMS(State)
-    Q_ENUMS(OrientationAngle)
 
-    Q_PROPERTY(Type type READ type NOTIFY typeChanged)
-    Q_PROPERTY(State state READ state NOTIFY stateChanged)
-    Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(bool live READ live NOTIFY liveChanged)
-    Q_PROPERTY(OrientationAngle orientationAngle READ orientationAngle WRITE setOrientationAngle
-               NOTIFY orientationAngleChanged DESIGNABLE false)
+    ////
+    // for use in qml tests
     Q_PROPERTY(int touchPressCount READ touchPressCount WRITE setTouchPressCount
                                    NOTIFY touchPressCountChanged DESIGNABLE false)
     Q_PROPERTY(int touchReleaseCount READ touchReleaseCount WRITE setTouchReleaseCount
                                      NOTIFY touchReleaseCountChanged DESIGNABLE false)
 
 public:
-    enum Type {
-        Normal,
-        Utility,
-        Dialog,
-        Overlay,
-        Freestyle,
-        Popover,
-        InputMethod,
-    };
-
-    enum State {
-        Unknown,
-        Restored,
-        Minimized,
-        Maximized,
-        VertMaximized,
-        /* SemiMaximized, */
-        Fullscreen,
-    };
-
-    enum OrientationAngle {
-        Angle0 = 0,
-        Angle90 = 90,
-        Angle180 = 180,
-        Angle270 = 270
-    };
-
+    explicit MirSurfaceItem(QQuickItem *parent = 0);
     ~MirSurfaceItem();
 
-    //getters
-    Session* session() const { return m_session; }
-    Type type() const { return m_type; }
-    State state() const { return m_state; }
-    QString name() const { return m_name; }
-    bool live() const { return m_live; }
-    OrientationAngle orientationAngle() const { return m_orientationAngle; }
-
-    void setOrientationAngle(OrientationAngle angle);
-
-    void setSession(Session* item);
-    void setScreenshot(const QUrl& screenshot);
+    Mir::Type type() const override;
+    QString name() const override;
+    bool live() const override;
+
+    Mir::State surfaceState() const override;
+    void setSurfaceState(Mir::State) override {}
+
+    Mir::OrientationAngle orientationAngle() const override;
+    void setOrientationAngle(Mir::OrientationAngle angle) override;
+
+    unity::shell::application::MirSurfaceInterface* surface() const override { return m_qmlSurface; }
+    void setSurface(unity::shell::application::MirSurfaceInterface*) override;
+
+    bool consumesInput() const override { return m_consumesInput; }
+    void setConsumesInput(bool value) override;
+
+    int surfaceWidth() const override;
+    void setSurfaceWidth(int value) override;
+
+    int surfaceHeight() const override;
+    void setSurfaceHeight(int value) override;
+
+    /////
+    // For use in qml tests
+
     void setLive(bool live);
 
     int touchPressCount() const { return m_touchPressCount; }
@@ -92,47 +73,32 @@
     int touchReleaseCount() const { return m_touchReleaseCount; }
     void setTouchReleaseCount(int count) { m_touchReleaseCount = count; Q_EMIT touchReleaseCountChanged(count); }
 
-    Q_INVOKABLE void setState(State newState);
-    Q_INVOKABLE void release();
-
 Q_SIGNALS:
-    void typeChanged(Type);
-    void stateChanged(State);
-    void liveChanged(bool live);
-    void orientationAngleChanged(OrientationAngle angle);
     void touchPressCountChanged(int count);
     void touchReleaseCountChanged(int count);
 
-    // internal mock use
-    void deregister();
-
 protected:
-    explicit MirSurfaceItem(const QString& name,
-                            Type type,
-                            State state,
-                            const QUrl& screenshot,
-                            const QString &qmlFilePath = QString(),
-                            QQuickItem *parent = 0);
-
     void touchEvent(QTouchEvent * event) override;
+    void itemChange(ItemChange change, const ItemChangeData & value) override;
 
 private Q_SLOTS:
     void onComponentStatusChanged(QQmlComponent::Status status);
+    void updateScreenshot(QUrl screenshot);
 
 private:
     void createQmlContentItem();
     void printComponentErrors();
+    void updateSurfaceSize();
 
-    Session* m_session;
-    const QString m_name;
-    const Type m_type;
-    State m_state;
-    bool m_live;
-    OrientationAngle  m_orientationAngle;
+    MirSurface* m_qmlSurface;
 
     QQmlComponent *m_qmlContentComponent;
     QQuickItem *m_qmlItem;
-    QUrl m_screenshotUrl;
+
+    bool m_consumesInput;
+
+    int m_surfaceWidth;
+    int m_surfaceHeight;
 
     int m_touchPressCount;
     int m_touchReleaseCount;
@@ -142,6 +108,5 @@
 
 Q_DECLARE_METATYPE(MirSurfaceItem*)
 Q_DECLARE_METATYPE(QList<MirSurfaceItem*>)
-Q_DECLARE_METATYPE(MirSurfaceItem::OrientationAngle)
 
 #endif // MIRSURFACEITEM_H

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.qml'
--- tests/mocks/Unity/Application/MirSurfaceItem.qml	2015-06-24 11:41:09 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.qml	2015-08-14 11:40:06 +0000
@@ -47,6 +47,7 @@
         y: surfaceText.y
         width: surfaceText.width
         height: surfaceText.height
+        clip: true
 
         transform: Translate { x: -2; y: -2 }
     }
@@ -58,6 +59,7 @@
         fontSizeMode: Text.Fit
         minimumPixelSize: 10; font.pixelSize: 200
         verticalAlignment: Text.AlignVCenter
+        clip: true
 
         rotation: root.orientationAngle
         x: (parent.width - width) / 2

=== removed file 'tests/mocks/Unity/Application/MirSurfaceItemModel.h'
--- tests/mocks/Unity/Application/MirSurfaceItemModel.h	2014-08-29 11:22:48 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItemModel.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 Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * 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/>.
- */
-
-#ifndef MIRSURFACEITEMMODEL_H
-#define MIRSURFACEITEMMODEL_H
-
-// Local
-#include "ObjectListModel.h"
-
-class MirSurfaceItem;
-class MirSurfaceItemModel: public ObjectListModel<MirSurfaceItem>
-{
-    Q_OBJECT
-public:
-    MirSurfaceItemModel(QObject *parent = 0): ObjectListModel(parent) {}
-
-    Q_INVOKABLE int count() const { return rowCount(); }
-};
-
-Q_DECLARE_METATYPE(MirSurfaceItemModel*)
-
-#endif // MIRSURFACEITEMMODEL_H

=== modified file 'tests/mocks/Unity/Application/Session.cpp'
--- tests/mocks/Unity/Application/Session.cpp	2014-09-01 16:07:55 +0000
+++ tests/mocks/Unity/Application/Session.cpp	2015-08-14 11:40:06 +0000
@@ -54,23 +54,21 @@
     if (m_application) {
         m_application->setSession(nullptr);
     }
-    delete m_surface;
     delete m_children;
+
+    if (m_surface) {
+        if (m_surface->viewCount() == 0) {
+            delete m_surface;
+        } else {
+            m_surface->setLive(false);
+        }
+    }
 }
 
 void Session::release()
 {
     qDebug() << "Session::release " << name();
-
-    if (m_parentSession) {
-        m_parentSession->removeChildSession(this);
-    }
-    if (m_application) {
-        m_application->setSession(nullptr);
-    }
-    if (!parent()) {
-        deleteLater();
-    }
+    deleteLater();
 }
 
 void Session::setApplication(ApplicationInfo* application)
@@ -82,27 +80,25 @@
     Q_EMIT applicationChanged(application);
 }
 
-void Session::setSurface(MirSurfaceItem* surface)
-{
-    qDebug() << "Session::setSurface - session=" << name() << "surface=" << surface;
-    if (m_surface == surface)
-        return;
-
-    if (m_surface) {
-        m_surface->setSession(nullptr);
-        m_surface->setParent(nullptr);
-        Q_EMIT m_surface->deregister();
-    }
-
-    m_surface = surface;
-
-    if (m_surface) {
-        m_surface->setSession(this);
-        m_surface->setParent(this);
-        SurfaceManager::singleton()->registerSurface(m_surface);
-    }
-
-    Q_EMIT surfaceChanged(m_surface);
+void Session::appendSurface(MirSurface* surface)
+{
+    qDebug() << "Session::appendSurface - session=" << name() << "surface=" << surface;
+
+    m_surfaces.insert(m_surfaces.rowCount(), surface);
+
+    connect(surface, &QObject::destroyed,
+            this, [this, surface]() { this->removeSurface(surface); });
+
+    Q_EMIT lastSurfaceChanged(surface);
+    Q_EMIT surfaceAdded(surface);
+}
+
+void Session::removeSurface(MirSurface* surface)
+{
+    disconnect(surface, nullptr, this, nullptr);
+    if (m_surfaces.contains(surface)) {
+        m_surfaces.remove(surface);
+    }
 }
 
 void Session::setScreenshot(const QUrl& screenshot)
@@ -110,7 +106,7 @@
     if (screenshot != m_screenshot) {
         m_screenshot = screenshot;
         if (m_surface) {
-            m_surface->setScreenshot(m_screenshot);
+            m_surface->setScreenshotUrl(m_screenshot);
         }
     }
 }
@@ -136,10 +132,10 @@
 {
     if (m_surface) return;
 
-    setSurface(SurfaceManager::singleton()->createSurface(name(),
-           MirSurfaceItem::Normal,
-           m_application && m_application->fullscreen() ? MirSurfaceItem::Fullscreen :
-                                                          MirSurfaceItem::Maximized,
+    appendSurface(SurfaceManager::singleton()->createSurface(name(),
+           Mir::NormalType,
+           m_application && m_application->fullscreen() ? Mir::FullscreenState :
+                                                          Mir::MaximizedState,
            m_screenshot));
 }
 
@@ -172,3 +168,17 @@
 {
     return m_children;
 }
+
+ObjectListModel<MirSurface>* Session::surfaces() const
+{
+    return const_cast<ObjectListModel<MirSurface>*>(&m_surfaces);
+}
+
+MirSurface *Session::lastSurface() const
+{
+    if (m_surfaces.rowCount() > 0) {
+        return m_surfaces.list().last();
+    } else {
+        return nullptr;
+    }
+}

=== modified file 'tests/mocks/Unity/Application/Session.h'
--- tests/mocks/Unity/Application/Session.h	2014-10-23 14:15:17 +0000
+++ tests/mocks/Unity/Application/Session.h	2015-08-14 11:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,18 +17,20 @@
 #ifndef SESSION_H
 #define SESSION_H
 
+#include "ObjectListModel.h"
 #include "SessionModel.h"
 
 #include <QQuickItem>
 
 class ApplicationInfo;
-class MirSurfaceItem;
+class MirSurface;
 
 class Session : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name CONSTANT)
-    Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
+    Q_PROPERTY(MirSurface* lastSurface READ lastSurface NOTIFY lastSurfaceChanged)
+    Q_PROPERTY(ObjectListModel<MirSurface>* surfaces READ surfaces CONSTANT)
     Q_PROPERTY(ApplicationInfo* application READ application NOTIFY applicationChanged)
     Q_PROPERTY(Session* parentSession READ parentSession NOTIFY parentSessionChanged DESIGNABLE false)
     Q_PROPERTY(SessionModel* childSessions READ childSessions DESIGNABLE false CONSTANT)
@@ -46,11 +48,13 @@
     QString name() const { return m_name; }
     bool live() const { return m_live; }
     ApplicationInfo* application() const { return m_application; }
-    MirSurfaceItem* surface() const { return m_surface; }
+    MirSurface *lastSurface() const;
+    ObjectListModel<MirSurface>* surfaces() const;
     Session* parentSession() const { return m_parentSession; }
 
     void setApplication(ApplicationInfo* item);
-    void setSurface(MirSurfaceItem* surface);
+    void appendSurface(MirSurface* surface);
+    void removeSurface(MirSurface* surface);
     void setScreenshot(const QUrl& m_screenshot);
     void setLive(bool live);
 
@@ -60,9 +64,10 @@
 
 Q_SIGNALS:
     void applicationChanged(ApplicationInfo*);
-    void surfaceChanged(MirSurfaceItem*);
     void parentSessionChanged(Session*);
     void liveChanged(bool live);
+    void surfaceAdded(MirSurface *surface);
+    void lastSurfaceChanged(MirSurface *surface);
 
     // internal mock use
     void deregister();
@@ -78,13 +83,15 @@
     bool m_live;
     QUrl m_screenshot;
     ApplicationInfo* m_application;
-    MirSurfaceItem* m_surface;
+    MirSurface* m_surface;
     Session* m_parentSession;
     SessionModel* m_children;
+    ObjectListModel<MirSurface> m_surfaces;
 
     friend class ApplicationTestInterface;
 };
 
 Q_DECLARE_METATYPE(Session*)
+Q_DECLARE_METATYPE(ObjectListModel<MirSurface>*)
 
 #endif // SESSION_H

=== modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
--- tests/mocks/Unity/Application/SurfaceManager.cpp	2015-03-19 15:18:45 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.cpp	2015-08-14 11:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,31 +36,28 @@
 {
 }
 
-MirSurfaceItem *SurfaceManager::createSurface(const QString& name,
-                                              MirSurfaceItem::Type type,
-                                              MirSurfaceItem::State state,
+MirSurface *SurfaceManager::createSurface(const QString& name,
+                                              Mir::Type type,
+                                              Mir::State state,
                                               const QUrl& screenshot)
 {
-    MirSurfaceItem* surface = new MirSurfaceItem(name, type, state, screenshot);
+    MirSurface* surface = new MirSurface(name, type, state, screenshot);
+    connect(surface, &QObject::destroyed, this, [this](QObject *obj) {
+        MirSurface* surface = qobject_cast<MirSurface*>(obj);
+        Q_EMIT surfaceDestroyed(surface);
+    });
     Q_EMIT surfaceCreated(surface);
     return surface;
 }
 
-void SurfaceManager::registerSurface(MirSurfaceItem *surface)
-{
-    connect(surface, &MirSurfaceItem::deregister, this, [this] {
-        MirSurfaceItem* surface = qobject_cast<MirSurfaceItem*>(sender());
-        disconnect(surface, 0, this, 0);
-
-        surface->setLive(false);
-        Q_EMIT surfaceDestroyed(surface);
-    });
-}
-
-MirSurfaceItem *SurfaceManager::inputMethodSurface()
+MirSurface *SurfaceManager::inputMethodSurface()
 {
     if (!m_virtualKeyboard) {
         m_virtualKeyboard = new VirtualKeyboard;
+        connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {
+            MirSurface* surface = qobject_cast<MirSurface*>(obj);
+            Q_EMIT surfaceDestroyed(surface);
+        });
         Q_EMIT surfaceCreated(m_virtualKeyboard);
     }
     return m_virtualKeyboard;

=== modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
--- tests/mocks/Unity/Application/SurfaceManager.h	2015-03-11 22:50:30 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.h	2015-08-14 11:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical, Ltd.
+ * Copyright (C) 2014-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <QObject>
 
-#include "MirSurfaceItem.h"
+#include "MirSurface.h"
 #include "VirtualKeyboard.h"
 
 class SurfaceManager : public QObject
@@ -30,21 +30,18 @@
 
     static SurfaceManager *singleton();
 
-    Q_INVOKABLE MirSurfaceItem *createSurface(const QString& name,
-                                  MirSurfaceItem::Type type,
-                                  MirSurfaceItem::State state,
+    Q_INVOKABLE MirSurface* createSurface(const QString& name,
+                                  Mir::Type type,
+                                  Mir::State state,
                                   const QUrl& screenshot);
 
-    // Internal mock use
-    void registerSurface(MirSurfaceItem *surface);
-
     // To be used in the tests
-    Q_INVOKABLE MirSurfaceItem *inputMethodSurface();
+    Q_INVOKABLE MirSurface* inputMethodSurface();
 
 Q_SIGNALS:
     void countChanged();
-    void surfaceCreated(MirSurfaceItem *surface);
-    void surfaceDestroyed(MirSurfaceItem *surface);
+    void surfaceCreated(MirSurface *surface);
+    void surfaceDestroyed(MirSurface*surface);
 
 private:
     static SurfaceManager *the_surface_manager;

=== modified file 'tests/mocks/Unity/Application/VirtualKeyboard.cpp'
--- tests/mocks/Unity/Application/VirtualKeyboard.cpp	2015-03-04 13:23:34 +0000
+++ tests/mocks/Unity/Application/VirtualKeyboard.cpp	2015-08-14 11:40:06 +0000
@@ -22,15 +22,14 @@
 
 #include <QDebug>
 
-VirtualKeyboard::VirtualKeyboard(QQuickItem *parent)
-    : MirSurfaceItem("input-method",
-                     MirSurfaceItem::InputMethod,
-                     MirSurfaceItem::Minimized,
+VirtualKeyboard::VirtualKeyboard()
+    : MirSurface("input-method",
+                     Mir::InputMethodType,
+                     Mir::MinimizedState,
                      QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")
                              .arg(qmlDirectory()),
                      QString("%1/Unity/Application/VirtualKeyboard.qml")
-                            .arg(mockPluginsDir()),
-                     parent)
+                            .arg(mockPluginsDir()))
 {
 }
 
@@ -38,7 +37,9 @@
 {
 }
 
+/*
 void VirtualKeyboard::touchEvent(QTouchEvent *event)
 {
     event->setAccepted(false);
 }
+*/

=== modified file 'tests/mocks/Unity/Application/VirtualKeyboard.h'
--- tests/mocks/Unity/Application/VirtualKeyboard.h	2015-03-04 13:23:34 +0000
+++ tests/mocks/Unity/Application/VirtualKeyboard.h	2015-08-14 11:40:06 +0000
@@ -17,26 +17,23 @@
 #ifndef VIRTUALKEYBOARD_H
 #define VIRTUALKEYBOARD_H
 
-#include "MirSurfaceItem.h"
-#include "MirSurfaceItemModel.h"
+#include "MirSurface.h"
 
 #include <QQuickItem>
-#include <QUrl>
-
-class Session;
-
-class VirtualKeyboard : public MirSurfaceItem
+
+class VirtualKeyboard : public MirSurface
 {
     Q_OBJECT
 public:
-    explicit VirtualKeyboard(QQuickItem *parent = 0);
+    explicit VirtualKeyboard();
     ~VirtualKeyboard();
 
+/*
 protected:
     void touchEvent(QTouchEvent * event) override;
+*/
 };
 
 Q_DECLARE_METATYPE(VirtualKeyboard*)
-Q_DECLARE_METATYPE(QList<VirtualKeyboard*>)
 
 #endif // VIRTUALKEYBOARD_H

=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
--- tests/mocks/Unity/Application/plugin.cpp	2014-10-02 08:50:52 +0000
+++ tests/mocks/Unity/Application/plugin.cpp	2015-08-14 11:40:06 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,12 +20,14 @@
 #include "ApplicationScreenshotProvider.h"
 #include "Session.h"
 #include "MirSurfaceItem.h"
-#include "MirSurfaceItemModel.h"
 #include "SurfaceManager.h"
 #include "SessionManager.h"
 #include "ApplicationTestInterface.h"
 #include "UbuntuKeyboardInfo.h"
 
+// unity-api
+#include <unity/shell/application/Mir.h>
+
 #include <qqml.h>
 #include <QQmlEngine>
 
@@ -67,14 +69,16 @@
 {
     qRegisterMetaType<Session*>("Session*");
     qRegisterMetaType<ApplicationInfo*>("ApplicationInfo*");
-    qRegisterMetaType<MirSurfaceItemModel*>("SessionModel*");
-    qRegisterMetaType<MirSurfaceItem*>("MirSurfaceItem*");
-    qRegisterMetaType<MirSurfaceItemModel*>("MirSurfaceItemModel*");
+    qRegisterMetaType<SessionModel*>("SessionModel*");
+    qRegisterMetaType<unity::shell::application::MirSurfaceInterface*>("unity::shell::application::MirSurfaceInterface*");
+    qRegisterMetaType<Mir::Type>("Mir::Type");
+    qRegisterMetaType<Mir::State>("Mir::State");
 
     qmlRegisterUncreatableType<unity::shell::application::ApplicationManagerInterface>(uri, 0, 1, "ApplicationManagerInterface", "Abstract interface. Cannot be created in QML");
     qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");
     qmlRegisterUncreatableType<Session>(uri, 0, 1, "Session", "Session can't be instantiated from QML");
-    qmlRegisterUncreatableType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem", "MirSurfaceItem can't be instantiated from QML");
+    qmlRegisterUncreatableType<MirSurface>(uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
+    qmlRegisterType<MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");
 
     qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");
 
@@ -84,8 +88,7 @@
     qmlRegisterSingletonType<ApplicationTestInterface>(uri, 0, 1, "ApplicationTest", applicationTestInterface);
     qmlRegisterSingletonType<UbuntuKeyboardInfo>(uri, 0, 1, "UbuntuKeyboardInfo", ubuntuKeyboardInfoSingleton);
 
-    qRegisterMetaType<MirSurfaceItem::Type>("MirSurfaceItem::Type");
-    qRegisterMetaType<MirSurfaceItem::State>("MirSurfaceItem::State");
+    qmlRegisterUncreatableType<Mir>(uri, 0, 1, "Mir", "Mir provides enum values, it can't be instantiated");
 }
 
 void FakeUnityApplicationQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'tests/mocks/Unity/Application/qmldir'
--- tests/mocks/Unity/Application/qmldir	2014-08-08 11:23:57 +0000
+++ tests/mocks/Unity/Application/qmldir	2015-08-14 11:40:06 +0000
@@ -1,3 +1,4 @@
 module Unity.Application
 plugin FakeUnityApplicationQml
 typeinfo Application.qmltypes
+Cursor 0.1 Cursor.qml

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-07-29 12:38:53 +0000
+++ tests/qmltests/CMakeLists.txt	2015-08-14 11:40:06 +0000
@@ -76,7 +76,7 @@
 add_unity8_qmltest(Stages SurfaceContainer)
 add_unity8_qmltest(Stages SessionContainer)
 add_unity8_qmltest(Stages TabletStage)
-add_unity8_qmltest(Stages WindowMoveResizeArea)
+add_unity8_qmltest(Stages WindowResizeArea)
 add_unity8_qmltest(Stages Splash)
 add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
 add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")

=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-07-10 15:55:50 +0000
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-08-14 11:40:06 +0000
@@ -45,16 +45,6 @@
         }
     }
 
-    Component {
-        id: applicationWindowComponent
-        ApplicationWindow {
-            anchors.fill: parent
-            application: fakeApplication
-            surfaceOrientationAngle: 0
-            interactive: true
-            focus: true
-        }
-    }
     Loader {
         id: applicationWindowLoader
         focus: true
@@ -64,7 +54,19 @@
             left: parent.left
         }
         width: units.gu(40)
-        sourceComponent: applicationWindowComponent
+        property bool itemDestroyed: false
+        sourceComponent: Component {
+            ApplicationWindow {
+                anchors.fill: parent
+                application: fakeApplication
+                surfaceOrientationAngle: 0
+                interactive: true
+                focus: true
+                Component.onDestruction: {
+                    applicationWindowLoader.itemDestroyed = true;
+                }
+            }
+        }
     }
 
     Rectangle {
@@ -87,13 +89,10 @@
                     id: sessionCheckbox; checked: false
                     activeFocusOnPress: false
                     onCheckedChanged: {
-                        if (applicationWindowLoader.status !== Loader.Ready)
-                            return;
-
                         if (checked && !fakeApplication.session) {
                             fakeApplication.createSession();
                         } else if (!checked && fakeApplication.session) {
-                            fakeApplication.session.release();
+                            fakeApplication.destroySession();
                         }
                     }
                 }
@@ -218,21 +217,29 @@
             sessionCheckbox.checked = true;
             sessionControl.surfaceCheckbox.checked = true;
         }
-        function cleanupSession() {
-            sessionCheckbox.checked = false;
-        }
 
         function cleanup() {
             forgetApplicationWindowChildren();
 
+            applicationWindowLoader.itemDestroyed = false;
+
             // reload our test subject to get it in a fresh state once again
             applicationWindowLoader.active = false;
 
+            tryCompare(applicationWindowLoader, "status", Loader.Null);
+            tryCompare(applicationWindowLoader, "item", null);
+            // Loader.status might be Loader.Null and Loader.item might be null but the Loader
+            // item might still be alive. So if we set Loader.active back to true
+            // again right now we will get the very same ApplicationWindow instance back. So no reload
+            // actually took place. Likely because Loader waits until the next event loop
+            // iteration to do its work. So to ensure the reload, we will wait until the
+            // ApplicationWindow instance gets destroyed.
+            // Another thing that happens is that we do get a new object but the old one doesn't get
+            // deleted, so you end up with two instances in memory.
+            tryCompare(applicationWindowLoader, "itemDestroyed", true);
+
             appStateSelector.selectedIndex = 0;
-            cleanupSession();
-
-            if (fakeApplication.session)
-                fakeApplication.session.release();
+            sessionCheckbox.checked = false;
 
             applicationWindowLoader.active = true;
         }
@@ -372,15 +379,18 @@
 
             waitUntilTransitionsEnd(stateGroup);
 
-            var fakeSurface = fakeSession.surface;
-            fakeSurface.touchPressCount = 0;
-            fakeSurface.touchReleaseCount = 0;
+            var surfaceItem = findChild(applicationWindowLoader.item, "surfaceItem");
+            verify(surfaceItem);
+            verify(surfaceItem.surface === fakeSession.surface);
+
+            surfaceItem.touchPressCount = 0;
+            surfaceItem.touchReleaseCount = 0;
 
             tap(applicationWindowLoader.item,
                 applicationWindowLoader.item.width / 2, applicationWindowLoader.item.height / 2);
 
-            verify(fakeSurface.touchPressCount === 1);
-            verify(fakeSurface.touchReleaseCount === 1);
+            verify(surfaceItem.touchPressCount === 1);
+            verify(surfaceItem.touchReleaseCount === 1);
         }
 
         function test_showNothingOnSuddenSurfaceLoss() {
@@ -389,9 +399,9 @@
             tryCompare(stateGroup, "state", "surface");
             waitUntilTransitionsEnd(stateGroup);
 
-            cleanupSession();
+            sessionControl.surfaceCheckbox.checked = false;
 
-            verify(stateGroup.state === "void");
+            tryCompare(stateGroup, "state", "void");
         }
 
         function test_surfaceActiveFocusFollowsAppWindowInterative() {

=== modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml'
--- tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-06-25 19:24:41 +0000
+++ tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-08-14 11:40:06 +0000
@@ -70,12 +70,12 @@
 
                         if (checked) {
                             var fakeSurface = SurfaceManager.createSurface("fake-surface",
-                                                                           MirSurfaceItem.Normal,
-                                                                           MirSurfaceItem.Restored,
+                                                                           Mir.NormalType,
+                                                                           Mir.RestoredState,
                                                                            Qt.resolvedUrl("../Dash/artwork/music-player-design.png"));
                             surfaceContainerLoader.item.surface = fakeSurface;
                         } else {
-                            ApplicationTest.removeSurface(surfaceContainerLoader.item.surface);
+                            surfaceContainerLoader.item.surface.setLive(false);
                         }
                     }
                 }
@@ -121,70 +121,64 @@
             interactiveCheckbox.checked = true;
         }
 
-        /*
-            Add a first surface. Then remove it. Then add a second surface.
-            That second surface should be properly sized.
-
-            Regression test for https://bugs.launchpad.net/ubuntu/+source/qtmir/+bug/1359819
-         */
-        function test_resetSurfaceGetsProperlySized() {
-            surfaceCheckbox.checked = true;
-            surfaceCheckbox.checked = false;
-            surfaceCheckbox.checked = true;
-            var fakeSurface = surfaceContainerLoader.item.surface;
-            compare(fakeSurface.width, surfaceContainerLoader.item.width);
-            compare(fakeSurface.height, surfaceContainerLoader.item.height);
-        }
-
         function test_animateRemoval() {
             surfaceCheckbox.checked = true;
 
             verify(surfaceContainer.surface !== null);
 
-            ApplicationTest.removeSurface(surfaceContainer.surface);
+            surfaceContainer.surface.setLive(false);
 
             compare(surfaceContainer.state, "zombie");
             tryCompare(surfaceContainer, "surface", null);
         }
 
-        function test_surfaceGetsNoTouchesWhenContainerNotInteractive() {
+        function test_surfaceItemGetsNoTouchesWhenContainerNotInteractive() {
             surfaceCheckbox.checked = true;
             verify(surfaceContainer.surface !== null);
 
-            surfaceContainer.surface.touchPressCount = 0;
-            surfaceContainer.surface.touchReleaseCount = 0;
+            var surfaceItem = findChild(surfaceContainer, "surfaceItem");
+            verify(surfaceItem !== null);
+
+            surfaceItem.touchPressCount = 0;
+            surfaceItem.touchReleaseCount = 0;
 
             tap(surfaceContainer, surfaceContainer.width / 2, surfaceContainer.height / 2);
 
             // surface got touches as the surfaceContainer is interactive
-            compare(surfaceContainer.surface.touchPressCount, 1)
-            compare(surfaceContainer.surface.touchReleaseCount, 1);
+            compare(surfaceItem.touchPressCount, 1)
+            compare(surfaceItem.touchReleaseCount, 1);
 
             interactiveCheckbox.checked = false;
             tap(surfaceContainer, surfaceContainer.width / 2, surfaceContainer.height / 2);
 
             // surface shouldn't get the touches from the second tap as the surfaceContainer
             // was *not* interactive when it happened.
-            compare(surfaceContainer.surface.touchPressCount, 1)
-            compare(surfaceContainer.surface.touchReleaseCount, 1);
+            compare(surfaceItem.touchPressCount, 1)
+            compare(surfaceItem.touchReleaseCount, 1);
         }
 
-        function test_surfaceGetsActiveFocusOnMousePress() {
+        function test_surfaceItemGetsActiveFocusOnMousePress() {
             surfaceCheckbox.checked = true;
             verify(surfaceContainer.surface !== null);
 
-            compare(surfaceContainer.surface.activeFocus, false);
+            var surfaceItem = findChild(surfaceContainer, "surfaceItem");
+            verify(surfaceItem !== null);
+
+            compare(surfaceItem.activeFocus, false);
             mouseClick(surfaceContainer);
-            compare(surfaceContainer.surface.activeFocus, true);
+            compare(surfaceItem.activeFocus, true);
         }
 
-        function test_surfaceGetsActiveFocusOnTap() {
+        function test_surfaceItemGetsActiveFocusOnTap() {
             surfaceCheckbox.checked = true;
             verify(surfaceContainer.surface !== null);
 
-            compare(surfaceContainer.surface.activeFocus, false);
+            var surfaceItem = findChild(surfaceContainer, "surfaceItem");
+            verify(surfaceItem !== null);
+
+            compare(surfaceItem.activeFocus, false);
             tap(surfaceContainer);
-            compare(surfaceContainer.surface.activeFocus, true);
+            compare(surfaceItem.activeFocus, true);
         }
     }
 }

=== renamed file 'tests/qmltests/Stages/tst_WindowMoveResizeArea.qml' => 'tests/qmltests/Stages/tst_WindowResizeArea.qml'
--- tests/qmltests/Stages/tst_WindowMoveResizeArea.qml	2015-05-01 10:24:08 +0000
+++ tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-08-14 11:40:06 +0000
@@ -36,24 +36,24 @@
 
         Item {
             id: fakeWindow
-            property alias minWidth: moveResizeArea.minWidth
-            property alias minHeight: moveResizeArea.minHeight
+            property alias minWidth: windowResizeArea.minWidth
+            property alias minHeight: windowResizeArea.minHeight
             x: units.gu(20)
             y: units.gu(20)
             height: units.gu(20)
             width: units.gu(20)
 
-            WindowMoveResizeArea {
-                id: moveResizeArea
+            WindowResizeArea {
+                id: windowResizeArea
                 target: fakeWindow
-                resizeHandleWidth: units.gu(0.5)
+                borderThickness: units.gu(0.5)
                 minWidth: units.gu(15)
                 minHeight: units.gu(10)
                 windowId: "test-window-id"
             }
 
             Rectangle {
-                anchors.fill: moveResizeArea
+                anchors.fill: windowResizeArea
                 color: "red"
             }
 
@@ -80,34 +80,6 @@
             fakeWindow.height = units.gu(20)
         }
 
-        function test_dragWindow_data() {
-            return [
-                { tag: "up", dx: 0, dy: units.gu(-10) },
-                { tag: "down", dx: 0, dy: units.gu(10) },
-                { tag: "left", dx: units.gu(-10), dy: 0 },
-                { tag: "right", dx: units.gu(10), dy: 0 },
-                { tag: "right/down", dx: units.gu(10), dy: units.gu(10) },
-                { tag: "left/down", dx: units.gu(-10), dy: units.gu(10) }
-            ]
-        }
-
-        function test_dragWindow(data) {
-            var initialWindowX = fakeWindow.x;
-            var initialWindowY = fakeWindow.y;
-            var initialWindowWidth = fakeWindow.width
-            var initialWindowHeight = fakeWindow.height
-
-            var startDragX = initialWindowX + fakeWindow.width / 2;
-            var startDragY = initialWindowY + fakeWindow.height / 2;
-            mouseFlick(root, startDragX, startDragY, startDragX + data.dx, startDragY + data.dy, true, true, units.gu(.5), 10)
-
-            tryCompare(fakeWindow, "x", initialWindowX + data.dx)
-            tryCompare(fakeWindow, "y", initialWindowX + data.dy)
-
-            compare(fakeWindow.height, initialWindowHeight);
-            compare(fakeWindow.width, initialWindowWidth);
-        }
-
         function test_resizeWindowRightBottom_data() {
             return [
                 { tag: "width", dx: units.gu(10), dy: 0 },

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2015-07-14 13:23:49 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2015-08-14 11:40:06 +0000
@@ -264,6 +264,10 @@
                 text: "Usage Mode"
                 model: ["Staged", "Windowed", "Automatic"]
             }
+            MouseTouchEmulationCheckbox {
+                checked: true
+                color: "white"
+            }
             Button {
                 text: "Switch fullscreen"
                 activeFocusOnPress: false
@@ -280,9 +284,9 @@
                     onCheckedChanged: {
                         var surface = SurfaceManager.inputMethodSurface();
                         if (checked) {
-                            surface.setState(MirSurfaceItem.Restored);
+                            surface.setState(Mir.RestoredState);
                         } else {
-                            surface.setState(MirSurfaceItem.Minimized);
+                            surface.setState(Mir.MinimizedState);
                         }
                     }
                 }
@@ -415,22 +419,22 @@
             compare(dashApp.stage, ApplicationInfoInterface.MainStage);
 
             tryCompareFunction(function(){return dashApp.session.surface != null;}, true);
-            verify(checkAppSurfaceOrientation(dashApp, root.primaryOrientationAngle));
+            verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
 
             compare(shell.transformRotationAngle, root.primaryOrientationAngle);
             rotateTo(90);
 
-            verify(checkAppSurfaceOrientation(dashApp, root.primaryOrientationAngle));
+            verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
             compare(shell.transformRotationAngle, root.primaryOrientationAngle);
 
             rotateTo(180);
 
-            verify(checkAppSurfaceOrientation(dashApp, root.primaryOrientationAngle));
+            verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
             compare(shell.transformRotationAngle, root.primaryOrientationAngle);
 
             rotateTo(270);
 
-            verify(checkAppSurfaceOrientation(dashApp, root.primaryOrientationAngle));
+            verify(checkAppSurfaceOrientation(dashAppWindow, dashApp, root.primaryOrientationAngle));
             compare(shell.transformRotationAngle, root.primaryOrientationAngle);
         }
 
@@ -1200,18 +1204,13 @@
         }
 
         // expectedAngle is in orientedShell's coordinate system
-        function checkAppSurfaceOrientation(app, expectedAngle) {
+        function checkAppSurfaceOrientation(item, app, expectedAngle) {
             var surface = app.session.surface;
             if (!surface) {
                 console.warn("no surface");
                 return false;
             }
 
-            if (!itemIsChildOfOrientedShell(surface)) {
-                console.warn("surface not a child of OrientedShell");
-                return false;
-            }
-
             var topMargin = 0.;
             if (!app.fullscreen) {
                 var appsDisplayLoader = findChild(shell, "applicationsDisplayLoader");
@@ -1221,7 +1220,12 @@
                 topMargin = appsDisplayLoader.item.maximizedAppTopMargin;
             }
 
-            var point = surface.mapToItem(orientedShell, 0, 0);
+            var surfaceItem = findSurfaceItem(item, surface);
+            if (!surfaceItem) {
+                console.warn("no surfaceItem rendering app surface");
+                return false;
+            }
+            var point = surfaceItem.mapToItem(orientedShell, 0, 0);
 
             switch (expectedAngle) {
             case 0:
@@ -1235,14 +1239,22 @@
             }
         }
 
-        function itemIsChildOfOrientedShell(item) {
-            var parent = item.parent;
-            var found = false;
-            while (parent && !found) {
-                found = parent === orientedShell;
-                parent = parent.parent;
+        function findSurfaceItem(obj, surface) {
+            var childs = new Array(0);
+            childs.push(obj)
+            while (childs.length > 0) {
+                console.log("Checking " + childs[0].objectName);
+                if (childs[0].objectName === "surfaceItem"
+                        && childs[0].surface !== undefined
+                        && childs[0].surface === surface) {
+                    return childs[0];
+                }
+                for (var i in childs[0].children) {
+                    childs.push(childs[0].children[i])
+                }
+                childs.splice(0, 1);
             }
-            return found;
+            return null;
         }
     }
 }

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-08-12 08:41:17 +0000
+++ tests/qmltests/tst_Shell.qml	2015-08-14 11:40:06 +0000
@@ -726,19 +726,19 @@
             var item = findChild(shell, "inputMethod");
             var surface = SurfaceManager.inputMethodSurface();
 
-            surface.setState(MirSurfaceItem.Minimized);
-            tryCompare(item, "visible", false);
-
-            surface.setState(MirSurfaceItem.Restored);
-            tryCompare(item, "visible", true);
-
-            surface.setState(MirSurfaceItem.Minimized);
-            tryCompare(item, "visible", false);
-
-            surface.setState(MirSurfaceItem.Maximized);
-            tryCompare(item, "visible", true);
-
-            surface.setState(MirSurfaceItem.Minimized);
+            surface.setState(Mir.MinimizedState);
+            tryCompare(item, "visible", false);
+
+            surface.setState(Mir.RestoredState);
+            tryCompare(item, "visible", true);
+
+            surface.setState(Mir.MinimizedState);
+            tryCompare(item, "visible", false);
+
+            surface.setState(Mir.MaximizedState);
+            tryCompare(item, "visible", true);
+
+            surface.setState(Mir.MinimizedState);
             tryCompare(item, "visible", false);
         }
 
@@ -1112,20 +1112,20 @@
 
             waitUntilFocusedApplicationIsShowingItsSurface();
 
-            var topmostSurface = findChild(topmostSpreadDelegate, "surfaceContainer").surface;
-            verify(topmostSurface);
+            var topmostSurfaceItem = findChild(topmostSpreadDelegate, "surfaceItem");
+            verify(topmostSurfaceItem);
 
             var rightEdgeDragArea = findChild(shell, "spreadDragArea");
-            topmostSurface.touchPressCount = 0;
-            topmostSurface.touchReleaseCount = 0;
+            topmostSurfaceItem.touchPressCount = 0;
+            topmostSurfaceItem.touchReleaseCount = 0;
 
             var tapPoint = rightEdgeDragArea.mapToItem(shell, rightEdgeDragArea.width / 2,
                     rightEdgeDragArea.height / 2);
 
             tap(shell, tapPoint.x, tapPoint.y);
 
-            tryCompare(topmostSurface, "touchPressCount", 1);
-            tryCompare(topmostSurface, "touchReleaseCount", 1);
+            tryCompare(topmostSurfaceItem, "touchPressCount", 1);
+            tryCompare(topmostSurfaceItem, "touchReleaseCount", 1);
         }
 
         /*
@@ -1137,11 +1137,11 @@
             loadShell("phone");
             swipeAwayGreeter();
             var topmostSpreadDelegate = findChild(shell, "appDelegate0");
-            var topmostSurface = findChild(topmostSpreadDelegate, "surfaceContainer").surface;
+            var topmostSurfaceItem = findChild(topmostSpreadDelegate, "surfaceItem");
             var rightEdgeDragArea = findChild(shell, "spreadDragArea");
 
-            topmostSurface.touchPressCount = 0;
-            topmostSurface.touchReleaseCount = 0;
+            topmostSurfaceItem.touchPressCount = 0;
+            topmostSurfaceItem.touchReleaseCount = 0;
 
             var gestureStartPoint = rightEdgeDragArea.mapToItem(shell, rightEdgeDragArea.width / 2,
                     rightEdgeDragArea.height / 2);
@@ -1150,8 +1150,8 @@
                     gestureStartPoint.x /* fromX */, gestureStartPoint.y /* fromY */,
                     units.gu(1) /* toX */, gestureStartPoint.y /* toY */);
 
-            tryCompare(topmostSurface, "touchPressCount", 0);
-            tryCompare(topmostSurface, "touchReleaseCount", 0);
+            tryCompare(topmostSurfaceItem, "touchPressCount", 0);
+            tryCompare(topmostSurfaceItem, "touchReleaseCount", 0);
         }
 
         function waitUntilFocusedApplicationIsShowingItsSurface()