Merge lp:~mzanetti/unity8/move-screenshots-to-tests into lp:unity8

[Michael Zanetti]

move screenshots out of the Dash dir

This was consuming 2.5 megs of installed size while they really are
only used for testing.

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

see prereq

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

yes

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

yes

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

n/a

 * If you changed the UI, has there been a design review?

n/a

[lp:~mzanetti/unity8/move-screenshots-to-tests]

2024. By Michael Zanetti on 2015-11-06

fix createSession

2025. By Michael Zanetti on 2015-11-06

merge prereq

2026. By Michael Zanetti on 2015-11-09

mege trunk

2027. By Michael Zanetti on 2015-11-19

merge prereq

2028. By Michael Zanetti on 2015-11-19

strip qrc to make QImage understand it

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-21 11:51:38 +0000
+++ CMakeLists.txt	2015-11-05 18:02:15 +0000
@@ -57,7 +57,7 @@
 find_package(Qt5Concurrent 5.2 REQUIRED)
 find_package(Qt5Sql 5.2 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=9)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=10)
 
 # Standard install paths
 include(GNUInstallDirs)

=== modified file 'debian/control'
--- debian/control	2015-10-21 11:51:11 +0000
+++ debian/control	2015-11-05 18:02:15 +0000
@@ -127,7 +127,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
-         unity-application-impl-9,
+         unity-application-impl-10,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-7,
@@ -173,7 +173,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-9,
+          unity-application-impl-10,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2015-09-29 14:46:24 +0000
+++ plugins/Utils/CMakeLists.txt	2015-11-05 18:02:15 +0000
@@ -10,6 +10,8 @@
 
 set(QMLPLUGIN_SRC
     activefocuslogger.cpp
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
+    applicationsfiltermodel.cpp
     constants.cpp
     HomeKeyWatcher.cpp
     inputwatcher.cpp

=== added file 'plugins/Utils/applicationsfiltermodel.cpp'
--- plugins/Utils/applicationsfiltermodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/applicationsfiltermodel.cpp	2015-11-05 18:02:15 +0000
@@ -0,0 +1,101 @@
+/*
+ * 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/>.
+ */
+
+// unity-api
+#include <unity/shell/application/ApplicationManagerInterface.h>
+#include <unity/shell/application/ApplicationInfoInterface.h>
+
+#include "applicationsfiltermodel.h"
+
+using namespace unity::shell::application;
+
+ApplicationsFilterModel::ApplicationsFilterModel(QObject *parent):
+    QSortFilterProxyModel(parent),
+    m_appModel(nullptr),
+    m_filterTouchApps(false),
+    m_filterLegacyApps(false)
+{
+}
+
+ApplicationManagerInterface *ApplicationsFilterModel::applicationsModel() const
+{
+    return m_appModel;
+}
+
+void ApplicationsFilterModel::setApplicationsModel(ApplicationManagerInterface *applicationsModel)
+{
+    if (m_appModel != applicationsModel) {
+        if (m_appModel) {
+            disconnect(m_appModel, &ApplicationManagerInterface::countChanged, this, &ApplicationsFilterModel::countChanged);
+        }
+        m_appModel = applicationsModel;
+        setSourceModel(m_appModel);
+        Q_EMIT applicationsModelChanged();
+        connect(m_appModel, &ApplicationManagerInterface::countChanged, this, &ApplicationsFilterModel::countChanged);
+    }
+}
+
+bool ApplicationsFilterModel::filterTouchApps() const
+{
+    return m_filterTouchApps;
+}
+
+void ApplicationsFilterModel::setFilterTouchApps(bool filterTouchApps)
+{
+    if (m_filterTouchApps != filterTouchApps) {
+        m_filterTouchApps = filterTouchApps;
+        Q_EMIT filterTouchAppsChanged();
+
+        invalidateFilter();
+        Q_EMIT countChanged();
+    }
+}
+
+bool ApplicationsFilterModel::filterLegacyApps() const
+{
+    return m_filterLegacyApps;
+}
+
+void ApplicationsFilterModel::setFilterLegacyApps(bool filterLegacyApps)
+{
+    if (m_filterLegacyApps != filterLegacyApps) {
+        m_filterLegacyApps = filterLegacyApps;
+        Q_EMIT filterLegacyAppsChanged();
+
+        invalidateFilter();
+        Q_EMIT countChanged();
+    }
+}
+
+bool ApplicationsFilterModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    Q_UNUSED(source_parent);
+
+    ApplicationInfoInterface *app = m_appModel->get(source_row);
+    Q_ASSERT(app);
+    if (m_filterLegacyApps && !app->isTouchApp()) {
+        return false;
+    }
+    if (m_filterTouchApps && app->isTouchApp()) {
+        return false;
+    }
+    return true;
+}
+
+ApplicationInfoInterface *ApplicationsFilterModel::get(int index) const
+{
+    return m_appModel->get(mapToSource(this->index(index, 0)).row());
+}

=== added file 'plugins/Utils/applicationsfiltermodel.h'
--- plugins/Utils/applicationsfiltermodel.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/applicationsfiltermodel.h	2015-11-05 18:02:15 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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 APPLICATIONSFILTERMODEL_H
+#define APPLICATIONSFILTERMODEL_H
+
+#include <QSortFilterProxyModel>
+
+namespace unity {
+namespace shell {
+namespace application {
+class ApplicationManagerInterface;
+class ApplicationInfoInterface;
+}
+}
+}
+using namespace unity::shell::application;
+
+class ApplicationsFilterModel: public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(unity::shell::application::ApplicationManagerInterface* applicationsModel READ applicationsModel WRITE setApplicationsModel NOTIFY applicationsModelChanged)
+    Q_PROPERTY(bool filterTouchApps READ filterTouchApps WRITE setFilterTouchApps NOTIFY filterTouchAppsChanged)
+    Q_PROPERTY(bool filterLegacyApps READ filterLegacyApps WRITE setFilterLegacyApps NOTIFY filterLegacyAppsChanged)
+
+    Q_PROPERTY(int count READ rowCount NOTIFY countChanged)
+public:
+    ApplicationsFilterModel(QObject *parent = 0);
+
+    ApplicationManagerInterface* applicationsModel() const;
+    void setApplicationsModel(ApplicationManagerInterface* applicationsModel);
+
+    bool filterTouchApps() const;
+    void setFilterTouchApps(bool filterTouchApps);
+
+    bool filterLegacyApps() const;
+    void setFilterLegacyApps(bool filterLegacyApps);
+
+    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
+
+    Q_INVOKABLE unity::shell::application::ApplicationInfoInterface* get(int index) const;
+
+Q_SIGNALS:
+    void applicationsModelChanged();
+    void filterTouchAppsChanged();
+    void filterLegacyAppsChanged();
+    void countChanged();
+
+private:
+    ApplicationManagerInterface* m_appModel;
+    bool m_filterTouchApps;
+    bool m_filterLegacyApps;
+};
+
+#endif

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2015-09-29 14:46:24 +0000
+++ plugins/Utils/plugin.cpp	2015-11-05 18:02:15 +0000
@@ -35,6 +35,7 @@
 #include "windowstatestorage.h"
 #include "constants.h"
 #include "timezoneFormatter.h"
+#include "applicationsfiltermodel.h"
 
 static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -66,6 +67,7 @@
     qmlRegisterSingletonType<TimezoneFormatter>(uri, 0, 1, "TimezoneFormatter",
                                                 [](QQmlEngine*, QJSEngine*) -> QObject* { return new TimezoneFormatter; });
     qmlRegisterType<ActiveFocusLogger>(uri, 0, 1, "ActiveFocusLogger");
+    qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
 }
 
 void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'plugins/Utils/windowstatestorage.cpp'
--- plugins/Utils/windowstatestorage.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Utils/windowstatestorage.cpp	2015-11-05 18:02:15 +0000
@@ -47,26 +47,38 @@
     m_db.close();
 }
 
+void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)
+{
+    const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")
+            .arg(windowId)
+            .arg((int)state);
+
+    saveValue(queryString);
+}
+
+WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const
+{
+    const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")
+            .arg(windowId);
+
+    QSqlQuery query = getValue(queryString);
+
+    if (!query.first()) {
+        return defaultValue;
+    }
+    return (WindowState)query.value("state").toInt();
+}
+
 void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)
 {
-    QMutexLocker mutexLocker(&s_mutex);
-
-    QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
+    const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")
             .arg(windowId)
             .arg(rect.x())
             .arg(rect.y())
             .arg(rect.width())
             .arg(rect.height());
 
-    QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);
-    m_asyncQueries.append(future);
-
-    QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();
-    futureWatcher->setFuture(future);
-    connect(futureWatcher, &QFutureWatcher<void>::finished,
-            this,
-            [=](){ m_asyncQueries.removeAll(futureWatcher->future());
-                   futureWatcher->deleteLater(); });
+    saveValue(queryString);
 }
 
 void WindowStateStorage::executeAsyncQuery(const QString &queryString)
@@ -82,20 +94,13 @@
     }
 }
 
-QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue)
+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const
 {
-    QMutexLocker l(&s_mutex);
     QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")
             .arg(windowId);
-    QSqlQuery query;
-
-    bool ok = query.exec(queryString);
-    if (!ok) {
-        qWarning() << "Error retrieving window state for" << windowId
-                   << "Driver error:" << query.lastError().driverText()
-                   << "Database error:" << query.lastError().databaseText();
-        return defaultValue;
-    }
+
+    QSqlQuery query = getValue(queryString);
+
     if (!query.first()) {
         return defaultValue;
     }
@@ -114,4 +119,38 @@
         QSqlQuery query;
         query.exec(QStringLiteral("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);"));
     }
+
+    if (!m_db.tables().contains("state")) {
+        QSqlQuery query;
+        query.exec("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);");
+    }
+}
+
+void WindowStateStorage::saveValue(const QString &queryString)
+{
+    QMutexLocker mutexLocker(&s_mutex);
+
+    QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);
+    m_asyncQueries.append(future);
+
+    QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();
+    futureWatcher->setFuture(future);
+    connect(futureWatcher, &QFutureWatcher<void>::finished,
+            this,
+            [=](){ m_asyncQueries.removeAll(futureWatcher->future());
+        futureWatcher->deleteLater(); });
+}
+
+QSqlQuery WindowStateStorage::getValue(const QString &queryString) const
+{
+    QMutexLocker l(&s_mutex);
+    QSqlQuery query;
+
+    bool ok = query.exec(queryString);
+    if (!ok) {
+        qWarning() << "Error retrieving database query:" << queryString
+                   << "Driver error:" << query.lastError().driverText()
+                   << "Database error:" << query.lastError().databaseText();
+    }
+    return query;
 }

=== modified file 'plugins/Utils/windowstatestorage.h'
--- plugins/Utils/windowstatestorage.h	2015-03-13 19:01:32 +0000
+++ plugins/Utils/windowstatestorage.h	2015-11-05 18:02:15 +0000
@@ -22,16 +22,28 @@
 class WindowStateStorage: public QObject
 {
     Q_OBJECT
+    Q_ENUMS(WindowState)
 public:
+    enum WindowState {
+        WindowStateNormal,
+        WindowStateMaximized
+    };
+
     WindowStateStorage(QObject *parent = 0);
     virtual ~WindowStateStorage();
 
+    Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
+    Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;
+
     Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
-    Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);
+    Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;
 
 private:
     void initdb();
 
+    void saveValue(const QString &queryString);
+    QSqlQuery getValue(const QString &queryString) const;
+
     static void executeAsyncQuery(const QString &queryString);
     static QMutex s_mutex;
 

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2015-10-09 12:36:14 +0000
+++ qml/Components/Dialogs.qml	2015-11-05 18:02:15 +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,6 +21,7 @@
 import Ubuntu.Components 1.1
 import GlobalShortcut 1.0
 import Unity.Platform 1.0
+import Utils 0.1
 import "../Greeter"
 
 Item {
@@ -45,6 +46,31 @@
         d.showPowerDialog();
     }
 
+    onUsageScenarioChanged: {
+        if (usageScenario != "desktop" && legacyAppsModel.count > 0 && !d.modeSwitchWarningPopup) {
+            var comp = Qt.createComponent(Qt.resolvedUrl("ModeSwitchWarningDialog.qml"))
+            d.modeSwitchWarningPopup = comp.createObject(root, {model: legacyAppsModel});
+            d.modeSwitchWarningPopup.forceClose.connect(function() {
+                while (legacyAppsModel.count > 0) {
+                    ApplicationManager.stopApplication(legacyAppsModel.get(0).appId);
+                }
+                d.modeSwitchWarningPopup.hide();
+                d.modeSwitchWarningPopup.destroy();
+                d.modeSwitchWarningPopup = null;
+            })
+        } else if (usageScenario == "desktop" && d.modeSwitchWarningPopup) {
+            d.modeSwitchWarningPopup.hide();
+            d.modeSwitchWarningPopup.destroy();
+            d.modeSwitchWarningPopup = null;
+        }
+    }
+
+    ApplicationsFilterModel {
+        id: legacyAppsModel
+        applicationsModel: ApplicationManager
+        filterTouchApps: true
+    }
+
     GlobalShortcut { // reboot/shutdown dialog
         shortcut: Qt.Key_PowerDown
         active: Platform.isPC
@@ -91,6 +117,8 @@
         id: d // private stuff
         objectName: "dialogsPrivate"
 
+        property var modeSwitchWarningPopup: null
+
         function showPowerDialog() {
             if (!dialogLoader.active) {
                 dialogLoader.sourceComponent = powerDialogComponent;
@@ -270,5 +298,4 @@
             unitySessionService.endSession();
         }
     }
-
 }

=== added file 'qml/Components/ModeSwitchWarningDialog.qml'
--- qml/Components/ModeSwitchWarningDialog.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/ModeSwitchWarningDialog.qml	2015-11-05 18:02:15 +0000
@@ -0,0 +1,95 @@
+/*
+ * 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 QtQuick.Layouts 1.1
+import Ubuntu.Components 1.2
+import Ubuntu.Components.ListItems 1.2
+import Ubuntu.Components.Popups 1.2
+
+ShellDialog {
+    id: root
+    objectName: "modeSwitchWarningDialog"
+
+    property alias model: appRepeater.model
+
+    signal forceClose();
+
+    Label {
+        text: i18n.tr("Apps may have unsaved data:")
+        fontSize: "large"
+        color: "#5D5D5D"
+    }
+
+    Repeater {
+        id: appRepeater
+        RowLayout {
+            spacing: units.gu(2)
+            Image {
+                Layout.preferredHeight: units.gu(2)
+                Layout.preferredWidth: units.gu(2)
+                source: model.icon
+                sourceSize.width: width
+                sourceSize.height: height
+            }
+            Label {
+                Layout.fillWidth: true
+                text: model.name
+                color: "#888888"
+            }
+        }
+    }
+
+    Label {
+        text: i18n.tr("Re-dock, save your work and close these apps to continue.")
+        wrapMode: Text.WordWrap
+        color: "#888888"
+    }
+
+    Label {
+        text: i18n.tr("Or force close now (unsaved data will be lost).")
+        wrapMode: Text.WordWrap
+        color: "#888888"
+    }
+
+    ThinDivider {}
+
+    RowLayout {
+        Label {
+            objectName: "reconnectLabel"
+            Layout.fillWidth: true
+            property bool clicked: false
+            property string notClickedText: i18n.tr("OK, I will reconnect")
+            property string clickedText: i18n.tr("Reconnect now!")
+            text: clicked ? clickedText : notClickedText
+            color: "#333333"
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: parent.clicked = true;
+            }
+        }
+
+        Button {
+            objectName: "forceCloseButton"
+            text: i18n.tr("Close all")
+            color: UbuntuColors.red
+            onClicked: {
+                root.forceClose();
+            }
+        }
+    }
+}

=== added file 'qml/Components/Orientations.qml'
--- qml/Components/Orientations.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/Orientations.qml	2015-11-05 18:02:15 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright 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
+
+QtObject {
+    // Just because "native" is a reserved keyword :(
+    property int native_: Qt.PortraitOrientation
+
+    property int primary: Qt.PortraitOrientation
+
+    property int landscape: Qt.LandscapeOrientation
+    property int invertedLandscape: Qt.InvertedLandscapeOrientation
+    property int portrait: Qt.PortraitOrientation
+    property int invertedPortrait: Qt.InvertedPortraitOrientation
+}

=== modified file 'qml/Components/ShellDialog.qml'
--- qml/Components/ShellDialog.qml	2015-08-24 15:39:53 +0000
+++ qml/Components/ShellDialog.qml	2015-11-05 18:02:15 +0000
@@ -31,7 +31,7 @@
     // NB: PopupBase, Dialog's superclass, will check for the existence of this property
     property bool reparentToRootItem: false
 
-    onVisibleChanged: { if (!visible) { dialogLoader.active = false; } }
+    onVisibleChanged: { if (!visible && dialogLoader) { dialogLoader.active = false; } }
 
     Keys.onEscapePressed: hide()
 

=== modified file 'qml/Components/WindowControlButtons.qml'
--- qml/Components/WindowControlButtons.qml	2014-11-24 11:21:38 +0000
+++ qml/Components/WindowControlButtons.qml	2015-11-05 18:02:15 +0000
@@ -28,6 +28,7 @@
     signal maximize()
 
     Rectangle {
+        objectName: "closeWindowButton"
         height: parent.height; width: height; radius: height / 2
         gradient: Gradient {
             GradientStop { color: "#F49073"; position: 0 }
@@ -38,6 +39,7 @@
         MouseArea { anchors.fill: parent; onClicked: root.close() }
     }
     Rectangle {
+        objectName: "minimizeWindowButton"
         height: parent.height; width: height; radius: height / 2
         gradient: Gradient {
             GradientStop { color: "#92918C"; position: 0 }
@@ -48,6 +50,7 @@
         MouseArea { anchors.fill: parent; onClicked: root.minimize() }
     }
     Rectangle {
+        objectName: "maximizeWindowButton"
         height: parent.height; width: height; radius: height / 2
         gradient: Gradient {
             GradientStop { color: "#92918C"; position: 0 }

=== modified file 'qml/DeviceConfiguration.qml'
--- qml/DeviceConfiguration.qml	2015-10-05 16:43:41 +0000
+++ qml/DeviceConfiguration.qml	2015-11-05 18:02:15 +0000
@@ -16,79 +16,99 @@
 
 import QtQuick 2.0
 
-StateGroup {
+QtObject {
     id: root
 
     readonly property int useNativeOrientation: -1
 
-    property int primaryOrientation: useNativeOrientation
-
-    property int supportedOrientations: Qt.PortraitOrientation
-                                      | Qt.InvertedPortraitOrientation
-                                      | Qt.LandscapeOrientation
-                                      | Qt.InvertedLandscapeOrientation
-
-    // Supported values so far:
-    // "phone", "tablet" or "desktop"
-    property string category: "phone"
-
-    property int ignoredMice: 0
-
-
-    property alias name: root.state
-
-    states: [
-        State {
-            name: "mako"
-            PropertyChanges {
-                target: root
-                supportedOrientations: Qt.PortraitOrientation
-                                     | Qt.LandscapeOrientation
-                                     | Qt.InvertedLandscapeOrientation
-            }
-        },
-        State {
-            name: "krillin"
-            PropertyChanges {
-                target: root
-                supportedOrientations: Qt.PortraitOrientation
-                                     | Qt.LandscapeOrientation
-                                     | Qt.InvertedLandscapeOrientation
-            }
-        },
-        State {
-            name: "arale"
-            PropertyChanges {
-                target: root
-                supportedOrientations: Qt.PortraitOrientation
-                                     | Qt.LandscapeOrientation
-                                     | Qt.InvertedLandscapeOrientation
-                ignoredMice: 1
-            }
-        },
-        State {
-            name: "manta"
-            PropertyChanges {
-                target: root
-                category: "tablet"
-            }
-        },
-        State {
-            name: "flo"
-            PropertyChanges {
-                target: root
-                primaryOrientation: Qt.InvertedLandscapeOrientation
-                category: "tablet"
-            }
-        },
-        State {
-            name: "desktop"
-            PropertyChanges {
-                target: root
-                category: "desktop"
-                supportedOrientations: root.useNativeOrientation
-            }
-        }
-    ]
-
+    // The only writable property in the API
+    // all other properties are set according to the device name
+    property alias name: priv.state
+
+    readonly property alias primaryOrientation: priv.primaryOrientation
+    readonly property alias supportedOrientations: priv.supportedOrientations
+    readonly property alias landscapeOrientation: priv.landscapeOrientation
+    readonly property alias invertedLandscapeOrientation: priv.invertedLandscapeOrientation
+    readonly property alias portraitOrientation: priv.portraitOrientation
+    readonly property alias invertedPortraitOrientation: priv.invertedPortraitOrientation
+
+    readonly property alias category: priv.category
+
+    readonly property alias ignoredMice: priv.ignoredMice
+
+    readonly property var priv: StateGroup {
+        id: priv
+
+        property int primaryOrientation: root.useNativeOrientation
+
+        property int supportedOrientations: Qt.PortraitOrientation
+                                          | Qt.InvertedPortraitOrientation
+                                          | Qt.LandscapeOrientation
+                                          | Qt.InvertedLandscapeOrientation
+
+        property int landscapeOrientation: Qt.LandscapeOrientation
+        property int invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
+        property int portraitOrientation: Qt.PortraitOrientation
+        property int invertedPortraitOrientation: Qt.InvertedPortraitOrientation
+
+        // Supported values so far:
+        // "phone", "tablet" or "desktop"
+        property string category: "phone"
+
+        property int ignoredMice: 0
+
+        states: [
+            State {
+                name: "mako"
+                PropertyChanges {
+                    target: priv
+                    supportedOrientations: Qt.PortraitOrientation
+                                         | Qt.LandscapeOrientation
+                                         | Qt.InvertedLandscapeOrientation
+                }
+            },
+            State {
+                name: "krillin"
+                PropertyChanges {
+                    target: priv
+                    supportedOrientations: Qt.PortraitOrientation
+                                         | Qt.LandscapeOrientation
+                                         | Qt.InvertedLandscapeOrientation
+                }
+            },
+            State {
+                name: "arale"
+                PropertyChanges {
+                    target: priv
+                    supportedOrientations: Qt.PortraitOrientation
+                                         | Qt.LandscapeOrientation
+                                         | Qt.InvertedLandscapeOrientation
+                    ignoredMice: 1
+                }
+            },
+            State {
+                name: "manta"
+                PropertyChanges {
+                    target: priv
+                    category: "tablet"
+                }
+            },
+            State {
+                name: "flo"
+                PropertyChanges {
+                    target: priv
+                    landscapeOrientation: Qt.InvertedLandscapeOrientation
+                    primaryOrientation: Qt.InvertedLandscapeOrientation
+                    category: "tablet"
+                }
+            },
+            State {
+                name: "desktop"
+                PropertyChanges {
+                    target: priv
+                    category: "desktop"
+                }
+            }
+        ]
+    }
 }

=== modified file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	2015-10-05 19:15:03 +0000
+++ qml/OrientedShell.qml	2015-11-05 18:02:15 +0000
@@ -32,20 +32,31 @@
     implicitWidth: units.gu(40)
     implicitHeight: units.gu(71)
 
-    // NB: native and primary orientations here don't map exactly to their QScreen counterparts
-    readonly property int nativeOrientation: width > height ? Qt.LandscapeOrientation : Qt.PortraitOrientation
-
-    readonly property int primaryOrientation:
-            deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
-                   ? nativeOrientation : deviceConfiguration.primaryOrientation
-
     DeviceConfiguration {
         id: deviceConfiguration
         name: applicationArguments.deviceName
     }
 
-
-    // to be overwritten by tests
+    property alias orientations: d.orientations
+
+    Item {
+        id: d
+
+        property Orientations orientations: Orientations {
+            id: orientations
+            // NB: native and primary orientations here don't map exactly to their QScreen counterparts
+            native_: root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation
+
+            primary: deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
+                ? native_ : deviceConfiguration.primaryOrientation
+
+            landscape: deviceConfiguration.landscapeOrientation
+            invertedLandscape: deviceConfiguration.invertedLandscapeOrientation
+            portrait: deviceConfiguration.portraitOrientation
+            invertedPortrait: deviceConfiguration.invertedPortraitOrientation
+        }
+    }
+        // to be overwritten by tests
     property var unity8Settings: Unity8Settings {}
     property var oskSettings: GSettings { schema.id: "com.canonical.keyboard.maliit" }
 
@@ -101,7 +112,7 @@
 
     property int acceptedOrientationAngle: {
         if (orientation & supportedOrientations) {
-            return Screen.angleBetween(nativeOrientation, orientation);
+            return Screen.angleBetween(orientations.native_, orientation);
         } else if (shell.orientation & supportedOrientations) {
             // stay where we are
             return shell.orientationAngle;
@@ -111,16 +122,16 @@
             // rotate to some supported orientation as we can't stay where we currently are
             // TODO: Choose the closest to the current one
             if (supportedOrientations & Qt.PortraitOrientation) {
-                return Screen.angleBetween(nativeOrientation, Qt.PortraitOrientation);
+                return Screen.angleBetween(orientations.native_, Qt.PortraitOrientation);
             } else if (supportedOrientations & Qt.LandscapeOrientation) {
-                return Screen.angleBetween(nativeOrientation, Qt.LandscapeOrientation);
+                return Screen.angleBetween(orientations.native_, Qt.LandscapeOrientation);
             } else if (supportedOrientations & Qt.InvertedPortraitOrientation) {
-                return Screen.angleBetween(nativeOrientation, Qt.InvertedPortraitOrientation);
+                return Screen.angleBetween(orientations.native_, Qt.InvertedPortraitOrientation);
             } else if (supportedOrientations & Qt.InvertedLandscapeOrientation) {
-                return Screen.angleBetween(nativeOrientation, Qt.InvertedLandscapeOrientation);
+                return Screen.angleBetween(orientations.native_, Qt.InvertedLandscapeOrientation);
             } else {
                 // if all fails, fallback to primary orientation
-                return Screen.angleBetween(nativeOrientation, primaryOrientation);
+                return Screen.angleBetween(orientations.native_, orientations.primary);
             }
         }
     }
@@ -128,19 +139,19 @@
     function angleToOrientation(angle) {
         switch (angle) {
         case 0:
-            return nativeOrientation;
+            return orientations.native_;
         case 90:
-            return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
+            return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
                                                                 : Qt.PortraitOrientation;
         case 180:
-            return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
+            return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
                                                                 : Qt.InvertedLandscapeOrientation;
         case 270:
-            return nativeOrientation === Qt.PortraitOrientation ? Qt.LandscapeOrientation
+            return orientations.native_ === Qt.PortraitOrientation ? Qt.LandscapeOrientation
                                                                 : Qt.InvertedPortraitOrientation;
         default:
             console.warn("angleToOrientation: Invalid orientation angle: " + angle);
-            return primaryOrientation;
+            return orientations.primary;
         }
     }
 
@@ -159,8 +170,7 @@
         width: root.width
         height: root.height
         orientation: root.angleToOrientation(orientationAngle)
-        primaryOrientation: root.primaryOrientation
-        nativeOrientation: root.nativeOrientation
+        orientations: root.orientations
         nativeWidth: root.width
         nativeHeight: root.height
         mode: applicationArguments.mode

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-09-29 12:48:46 +0000
+++ qml/Panel/Panel.qml	2015-11-05 18:02:15 +0000
@@ -28,6 +28,7 @@
     property alias callHint: __callHint
     property bool fullscreenMode: false
     property real indicatorAreaShowProgress: 1.0
+    property bool locked: false
 
     opacity: fullscreenMode && indicators.fullyClosed ? 0.0 : 1.0
 
@@ -136,7 +137,7 @@
             }
 
             shown: false
-            width: root.width - (PanelState.buttonsVisible ? windowControlButtons.width : 0)
+            width: root.width - (windowControlButtons.visible ? windowControlButtons.width : 0)
             minimizedPanelHeight: units.gu(3)
             expandedPanelHeight: units.gu(7)
             openedHeight: root.height - indicatorOrangeLine.height
@@ -164,13 +165,14 @@
 
         WindowControlButtons {
             id: windowControlButtons
+            objectName: "panelWindowControlButtons"
             anchors {
                 left: parent.left
                 top: parent.top
                 margins: units.gu(0.7)
             }
             height: indicators.minimizedPanelHeight - anchors.margins * 2
-            visible: PanelState.buttonsVisible
+            visible: PanelState.buttonsVisible && !root.locked
             onClose: PanelState.close()
             onMinimize: PanelState.minimize()
             onMaximize: PanelState.maximize()
@@ -189,7 +191,7 @@
             id: __callHint
             anchors {
                 top: parent.top
-                left: PanelState.buttonsVisible ? windowControlButtons.right : parent.left
+                left: windowControlButtons.visible ? windowControlButtons.right : parent.left
             }
             height: indicators.minimizedPanelHeight
             visible: active && indicators.state == "initial"

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-10-16 17:11:54 +0000
+++ qml/Shell.qml	2015-11-05 18:02:15 +0000
@@ -49,14 +49,14 @@
     // to be set from outside
     property int orientationAngle: 0
     property int orientation
-    property int primaryOrientation
-    property int nativeOrientation
+    property Orientations orientations
     property real nativeWidth
     property real nativeHeight
     property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress
     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();
     }
@@ -298,21 +298,16 @@
             }
             Binding {
                 target: applicationsDisplayLoader.item
+                property: "orientations"
+                value: shell.orientations
+            }
+            Binding {
+                target: applicationsDisplayLoader.item
                 property: "background"
                 value: wallpaperResolver.background
             }
             Binding {
                 target: applicationsDisplayLoader.item
-                property: "shellPrimaryOrientation"
-                value: shell.primaryOrientation
-            }
-            Binding {
-                target: applicationsDisplayLoader.item
-                property: "nativeOrientation"
-                value: shell.nativeOrientation
-            }
-            Binding {
-                target: applicationsDisplayLoader.item
                 property: "nativeWidth"
                 value: shell.nativeWidth
             }
@@ -536,6 +531,7 @@
 
             fullscreenMode: (topmostApplicationIsFullscreen && !lightDM.greeter.active && launcher.progress == 0)
                             || greeter.hasLockedApp
+            locked: greeter && greeter.active
         }
 
         Launcher {

=== added file 'qml/Stages/AbstractStage.qml'
--- qml/Stages/AbstractStage.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/AbstractStage.qml	2015-11-05 18:02:15 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import GSettings 1.0
+
+Rectangle {
+    id: root
+
+    color: "#111111"
+
+    // Controls to be set from outside
+    property bool altTabPressed
+    property url background
+    property bool beingResized
+    property int dragAreaWidth
+    property bool interactive
+    property real inverseProgress // This is the progress for left edge drags, in pixels.
+    property bool keepDashRunning: true
+    property real maximizedAppTopMargin
+    property real nativeHeight
+    property real nativeWidth
+    property QtObject orientations
+    property int shellOrientation
+    property int shellOrientationAngle
+    property bool spreadEnabled: true // If false, animations and right edge will be disabled
+    property bool suspended
+
+    // To be read from outside
+    property var mainApp: null
+    property int mainAppWindowOrientationAngle
+    property bool orientationChangesEnabled
+
+    // Shared code for use in stage implementations
+    GSettings {
+        id: lifecycleExceptions
+        schema.id: "com.canonical.qtmir"
+    }
+
+    function isExemptFromLifecycle(appId) {
+        var shortAppId = appId.split('_')[0];
+        for (var i = 0; i < lifecycleExceptions.lifecycleExemptAppids.length; i++) {
+            if (shortAppId === lifecycleExceptions.lifecycleExemptAppids[i]) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2015-10-19 14:27:57 +0000
+++ qml/Stages/DesktopStage.qml	2015-11-05 18:02:15 +0000
@@ -22,39 +22,21 @@
 import Unity.Application 0.1
 import "../Components"
 import "../Components/PanelState"
+import "../Components"
 import Utils 0.1
 import Ubuntu.Gestures 0.1
 
-Rectangle {
+AbstractStage {
     id: root
     anchors.fill: parent
 
-    // Controls to be set from outside
-    property int dragAreaWidth // just to comply with the interface shared between stages
-    property real maximizedAppTopMargin
-    property bool interactive
-    property bool spreadEnabled // just to comply with the interface shared between stages
-    property real inverseProgress: 0 // just to comply with the interface shared between stages
-    property int shellOrientationAngle: 0
-    property int shellOrientation
-    property int shellPrimaryOrientation
-    property int nativeOrientation
-    property bool beingResized: false
-    property bool keepDashRunning: true
-    property bool suspended: false
-    property alias background: wallpaper.source
-    property alias altTabPressed: spread.altTabPressed
-
     // functions to be called from outside
     function updateFocusedAppOrientation() { /* TODO */ }
     function updateFocusedAppOrientationAnimated() { /* TODO */}
 
-    // To be read from outside
-    readonly property var mainApp: ApplicationManager.focusedApplicationId
+    mainApp: ApplicationManager.focusedApplicationId
             ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
             : null
-    property int mainAppWindowOrientationAngle: 0
-    readonly property bool orientationChangesEnabled: false
 
     Connections {
         target: ApplicationManager
@@ -111,6 +93,7 @@
         property: "buttonsVisible"
         value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.state === "maximized"
     }
+    Component.onDestruction: PanelState.buttonsVisible = false;
 
     FocusScope {
         id: appContainer
@@ -121,6 +104,7 @@
         CrossFadeImage {
             id: wallpaper
             anchors.fill: parent
+            source: root.background
             sourceSize { height: root.height; width: root.width }
             fillMode: Image.PreserveAspectCrop
         }
@@ -140,6 +124,7 @@
 
                 property bool maximized: false
                 property bool minimized: false
+                property bool animationsEnabled: true
 
                 onFocusChanged: {
                     if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
@@ -158,15 +143,18 @@
                     value: ApplicationInfoInterface.RequestedRunning // Always running for now
                 }
 
-                function maximize() {
+                function maximize(animated) {
+                    animationsEnabled = (animated === undefined) || animated;
                     minimized = false;
                     maximized = true;
                 }
-                function minimize() {
+                function minimize(animated) {
+                    animationsEnabled = (animated === undefined) || animated;
                     maximized = false;
                     minimized = true;
                 }
-                function unmaximize() {
+                function unmaximize(animated) {
+                    animationsEnabled = (animated === undefined) || animated;
                     minimized = false;
                     maximized = false;
                 }
@@ -188,6 +176,7 @@
                     Transition {
                         from: "maximized,minimized,normal,"
                         to: "maximized,minimized,normal,"
+                        enabled: appDelegate.animationsEnabled
                         PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }
                     },
                     Transition {
@@ -269,5 +258,6 @@
         anchors.fill: parent
         workspace: appContainer
         focus: state == "altTab"
+        altTabPressed: root.altTabPressed
     }
 }

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-09-21 13:37:47 +0000
+++ qml/Stages/PhoneStage.qml	2015-11-05 18:02:15 +0000
@@ -22,29 +22,15 @@
 import Utils 0.1
 import "../Components"
 
-Rectangle {
+AbstractStage {
     id: root
 
-    // Controls to be set from outside
-    property int dragAreaWidth
-    property real maximizedAppTopMargin
-    property bool interactive
-    property bool spreadEnabled: true // If false, animations and right edge will be disabled
-    property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
     property QtObject applicationManager: ApplicationManager
     property bool focusFirstApp: true // If false, focused app will appear on right edge like other apps
     property bool altTabEnabled: true
     property real startScale: 1.1
     property real endScale: 0.7
-    property bool keepDashRunning: true
-    property bool suspended: false
-    property int shellOrientationAngle: 0
-    property int shellOrientation
-    property int shellPrimaryOrientation
-    property int nativeOrientation
-    property real nativeWidth
-    property real nativeHeight
-    property bool beingResized: false
+
     onBeingResizedChanged: {
         if (beingResized) {
             // Brace yourselves for impact!
@@ -56,6 +42,8 @@
             priv.reset();
         }
     }
+
+    // Functions to be called from outside
     function updateFocusedAppOrientation() {
         if (spreadRepeater.count > 0) {
             spreadRepeater.itemAt(0).matchShellOrientation();
@@ -71,7 +59,7 @@
 
             var supportedOrientations = spreadDelegate.application.supportedOrientations;
             if (supportedOrientations === Qt.PrimaryOrientation) {
-                supportedOrientations = spreadDelegate.shellPrimaryOrientation;
+                supportedOrientations = root.orientations.primary;
             }
 
             if (delta === 180 && (supportedOrientations & spreadDelegate.shellOrientation)) {
@@ -85,16 +73,14 @@
         }
     }
 
-    // To be read from outside
-    readonly property var mainApp: applicationManager.focusedApplicationId
+    mainApp: applicationManager.focusedApplicationId
             ? applicationManager.findApplication(applicationManager.focusedApplicationId)
             : null
 
-    property int mainAppWindowOrientationAngle: 0
-    readonly property bool orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
-                                                   && !priv.focusedAppDelegateIsDislocated
-                                                   && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)
-                                                   && spreadView.phase === 0
+    orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
+                               && !priv.focusedAppDelegateIsDislocated
+                               && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)
+                               && spreadView.phase === 0
 
     // How far left the stage has been dragged
     readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
@@ -106,8 +92,6 @@
 
     signal opened()
 
-    color: "#111111"
-
     function select(appId) {
         spreadView.snapTo(priv.indexOf(appId));
     }
@@ -438,16 +422,21 @@
                     dropShadow: spreadView.active || priv.focusedAppDelegateIsDislocated
                     focusFirstApp: root.focusFirstApp
 
+                    readonly property bool isDash: model.appId == "unity8-dash"
+
+                    readonly property bool canSuspend: model.isTouchApp
+                            && !isExemptFromLifecycle(model.appId)
+
                     Binding {
                         target: appDelegate.application
                         property: "requestedState"
-                        value: (isDash && root.keepDashRunning) || (!root.suspended && appDelegate.focus)
-                            ? ApplicationInfoInterface.RequestedRunning
-                            : ApplicationInfoInterface.RequestedSuspended
+                        value: !canSuspend
+                                   || (isDash && root.keepDashRunning)
+                                   || (!root.suspended && appDelegate.focus)
+                               ? ApplicationInfoInterface.RequestedRunning
+                               : ApplicationInfoInterface.RequestedSuspended
                     }
 
-                    readonly property bool isDash: model.appId == "unity8-dash"
-
                     z: isDash && !spreadView.active ? -1 : behavioredIndex
 
                     x: {
@@ -535,11 +524,9 @@
                     visible: (progress >= 0 && progress < 1.7)
                             || (isDash && priv.focusedAppDelegateIsDislocated)
 
-
                     shellOrientationAngle: root.shellOrientationAngle
                     shellOrientation: root.shellOrientation
-                    shellPrimaryOrientation: root.shellPrimaryOrientation
-                    nativeOrientation: root.nativeOrientation
+                    orientations: root.orientations
 
                     onClicked: {
                         if (root.altTabEnabled && spreadView.phase == 2) {

=== modified file 'qml/Stages/ShimStage.qml'
--- qml/Stages/ShimStage.qml	2015-04-21 19:43:25 +0000
+++ qml/Stages/ShimStage.qml	2015-11-05 18:02:15 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.3
 import Ubuntu.Components 0.1
 
-Rectangle {
+AbstractStage {
     id: shimStage
 
     anchors.fill: parent

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2015-09-21 13:10:02 +0000
+++ qml/Stages/SpreadDelegate.qml	2015-11-05 18:02:15 +0000
@@ -42,8 +42,7 @@
     property alias application: appWindow.application
     property int shellOrientationAngle
     property int shellOrientation
-    property int shellPrimaryOrientation
-    property int nativeOrientation
+    property QtObject orientations
 
     function matchShellOrientation() {
         if (!root.application)
@@ -157,7 +156,7 @@
                             var supportedOrientations = root.application.supportedOrientations;
 
                             if (supportedOrientations === Qt.PrimaryOrientation) {
-                                supportedOrientations = root.shellPrimaryOrientation;
+                                supportedOrientations = root.orientations.primary;
                             }
 
                             // If it doesn't support shell's current orientation
@@ -166,18 +165,18 @@
                             if (supportedOrientations & root.shellOrientation) {
                                 chosenOrientation = root.shellOrientation;
                             } else if (supportedOrientations & Qt.PortraitOrientation) {
-                                chosenOrientation = Qt.PortraitOrientation;
+                                chosenOrientation = root.orientations.portrait;
                             } else if (supportedOrientations & Qt.LandscapeOrientation) {
-                                chosenOrientation = Qt.LandscapeOrientation;
+                                chosenOrientation = root.orientations.landscape;
                             } else if (supportedOrientations & Qt.InvertedPortraitOrientation) {
-                                chosenOrientation = Qt.InvertedPortraitOrientation;
+                                chosenOrientation = root.orientations.invertedPortrait;
                             } else if (supportedOrientations & Qt.InvertedLandscapeOrientation) {
-                                chosenOrientation = Qt.InvertedLandscapeOrientation;
+                                chosenOrientation = root.orientations.invertedLandscape;
                             } else {
-                                chosenOrientation = root.shellPrimaryOrientation;
+                                chosenOrientation = root.orientations.primary;
                             }
 
-                            return Screen.angleBetween(root.nativeOrientation, chosenOrientation);
+                            return Screen.angleBetween(root.orientations.native_, chosenOrientation);
                         }
 
                         rotation: normalizeAngle(appWindowWithShadow.orientationAngle - root.shellOrientationAngle)

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-08-03 13:47:44 +0000
+++ qml/Stages/TabletStage.qml	2015-11-05 18:02:15 +0000
@@ -21,29 +21,12 @@
 import Utils 0.1
 import "../Components"
 
-Rectangle {
+AbstractStage {
     id: root
     objectName: "stages"
     anchors.fill: parent
-    color: "#111111"
-
-    // Controls to be set from outside
-    property int dragAreaWidth
-    property real maximizedAppTopMargin
-    property bool interactive
-    property alias beingResized: spreadView.beingResized
-
-    property bool spreadEnabled: true // If false, animations and right edge will be disabled
-
-    property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
-    property bool keepDashRunning: true
-    property bool suspended: false
-    property int shellOrientationAngle: 0
-    property int shellOrientation
-    property int shellPrimaryOrientation
-    property int nativeOrientation
-    property real nativeWidth
-    property real nativeHeight
+
+    // Functions to be called from outside
     function updateFocusedAppOrientation() {
         var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
         if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {
@@ -64,7 +47,7 @@
 
             var supportedOrientations = spreadDelegate.application.supportedOrientations;
             if (supportedOrientations === Qt.PrimaryOrientation) {
-                supportedOrientations = spreadDelegate.shellPrimaryOrientation;
+                supportedOrientations = spreadDelegate.orientations.primary;
             }
 
             if (delta === 180 && (supportedOrientations & spreadDelegate.shellOrientation)) {
@@ -86,10 +69,7 @@
         }
     }
 
-    // To be read from outside
-    property var mainApp: null
-    property int mainAppWindowOrientationAngle: 0
-    readonly property bool orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
+    orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
 
     onWidthChanged: {
         spreadView.selectedIndex = -1;
@@ -130,7 +110,7 @@
         property string oldFocusedAppId: ""
         property bool mainAppOrientationChangesEnabled: false
 
-        property real landscapeHeight: root.nativeOrientation == Qt.LandscapeOrientation ?
+        property real landscapeHeight: root.orientations.native_ == Qt.LandscapeOrientation ?
                 root.nativeHeight : root.nativeWidth
 
         property bool shellIsLandscape: root.shellOrientation === Qt.LandscapeOrientation
@@ -302,7 +282,7 @@
         }
 
         property bool animateX: true
-        property bool beingResized: false
+        property bool beingResized: root.beingResized
         onBeingResizedChanged: {
             if (beingResized) {
                 // Brace yourselves for impact!
@@ -629,15 +609,18 @@
 
                     readonly property bool isDash: model.appId == "unity8-dash"
 
+                    readonly property bool canSuspend: model.isTouchApp
+                            && !isExemptFromLifecycle(model.appId)
+
                     Binding {
                         target: spreadTile.application
                         property: "requestedState"
-                        value: (spreadTile.isDash && root.keepDashRunning)
-                            ||
-                            (!root.suspended && (model.appId == priv.mainStageAppId
-                                                 || model.appId == priv.sideStageAppId))
-                            ? ApplicationInfoInterface.RequestedRunning
-                            : ApplicationInfoInterface.RequestedSuspended
+                        value: !canSuspend
+                                   || (isDash && root.keepDashRunning)
+                                   || (!root.suspended && (model.appId == priv.mainStageAppId
+                                                           || model.appId == priv.sideStageAppId))
+                               ? ApplicationInfoInterface.RequestedRunning
+                               : ApplicationInfoInterface.RequestedSuspended
                     }
 
                     // FIXME: A regular binding doesn't update any more after closing an app.
@@ -691,9 +674,14 @@
 
                     shellOrientationAngle: wantsMainStage ? root.shellOrientationAngle : 0
                     shellOrientation: wantsMainStage ? root.shellOrientation : Qt.PortraitOrientation
-                    shellPrimaryOrientation: wantsMainStage ? root.shellPrimaryOrientation : Qt.PortraitOrientation
-                    nativeOrientation: wantsMainStage ? root.nativeOrientation : Qt.PortraitOrientation
-
+                    orientations: Orientations {
+                        primary: spreadTile.wantsMainStage ? root.orientations.primary : Qt.PortraitOrientation
+                        native_: spreadTile.wantsMainStage ? root.orientations.native_ : Qt.PortraitOrientation
+                        portrait: root.orientations.portrait
+                        invertedPortrait: root.orientations.invertedPortrait
+                        landscape: root.orientations.landscape
+                        invertedLandscape: root.orientations.invertedLandscape
+                    }
 
                     onClicked: {
                         if (spreadView.phase == 2) {

=== modified file 'qml/Stages/WindowResizeArea.qml'
--- qml/Stages/WindowResizeArea.qml	2015-09-29 12:48:46 +0000
+++ qml/Stages/WindowResizeArea.qml	2015-11-05 18:02:15 +0000
@@ -36,18 +36,49 @@
     property int minWidth: 0
     property int minHeight: 0
 
+    QtObject {
+        id: priv
+
+        property int normalX: 0
+        property int normalY: 0
+        property int normalWidth: 0
+        property int normalHeight: 0
+
+        function updateNormalGeometry() {
+            if (root.target.state == "normal") {
+                normalX = root.target.x
+                normalY = root.target.y
+                normalWidth = root.target.width
+                normalHeight = root.target.height
+            }
+        }
+    }
+
+    Connections {
+        target: root.target
+        onXChanged: priv.updateNormalGeometry();
+        onYChanged: priv.updateNormalGeometry();
+        onWidthChanged: priv.updateNormalGeometry();
+        onHeightChanged: priv.updateNormalGeometry();
+    }
+
     Component.onCompleted: {
-        var windowState = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
-        if (windowState !== undefined) {
-            target.x = windowState.x
-            target.y = windowState.y
-            target.width = windowState.width
-            target.height = windowState.height
+        var windowGeometry = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
+        if (windowGeometry !== undefined) {
+            target.x = windowGeometry.x
+            target.y = windowGeometry.y
+            target.width = windowGeometry.width
+            target.height = windowGeometry.height
+        }
+        var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)
+        if (windowState === WindowStateStorage.WindowStateMaximized) {
+            target.maximize(false)
         }
     }
 
     Component.onDestruction: {
-        windowStateStorage.saveGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))
+        windowStateStorage.saveState(root.windowId, target.state == "maximized" ? WindowStateStorage.WindowStateMaximized : WindowStateStorage.WindowStateNormal)
+        windowStateStorage.saveGeometry(root.windowId, Qt.rect(priv.normalX, priv.normalY, priv.normalWidth, priv.normalHeight))
     }
 
     QtObject {

=== added file 'qml/graphics/applicationIcons/[e-mail]'
Binary files qml/graphics/applicationIcons/[e-mail]	1970-01-01 00:00:00 +0000 and qml/graphics/applicationIcons/[e-mail]	2015-11-05 18:02:15 +0000 differ
=== modified file 'tests/mocks/GSettings.1.0/fake_gsettings.cpp'
--- tests/mocks/GSettings.1.0/fake_gsettings.cpp	2015-09-02 13:06:56 +0000
+++ tests/mocks/GSettings.1.0/fake_gsettings.cpp	2015-11-05 18:02:15 +0000
@@ -75,6 +75,19 @@
     }
 }
 
+QStringList GSettingsControllerQml::lifecycleExemptAppids() const
+{
+    return m_lifecycleExemptAppids;
+}
+
+void GSettingsControllerQml::setLifecycleExemptAppids(const QStringList &appIds)
+{
+    if (m_lifecycleExemptAppids != appIds) {
+        m_lifecycleExemptAppids = appIds;
+        Q_EMIT lifecycleExemptAppidsChanged(m_lifecycleExemptAppids);
+    }
+}
+
 GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
 }
 
@@ -114,6 +127,8 @@
             this, &GSettingsQml::usageModeChanged);
     connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::lockedOutTimeChanged,
             this, &GSettingsQml::lockedOutTimeChanged);
+    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::lifecycleExemptAppidsChanged,
+            this, &GSettingsQml::lifecycleExemptAppidsChanged);
 }
 
 GSettingsSchemaQml * GSettingsQml::schema() const {
@@ -167,3 +182,19 @@
         GSettingsControllerQml::instance()->setLockedOutTime(timestamp);
     }
 }
+
+QStringList GSettingsQml::lifecycleExemptAppids() const
+{
+    if (m_schema->id() == "com.canonical.qtmir") {
+        return GSettingsControllerQml::instance()->lifecycleExemptAppids();
+    } else {
+        return QStringList();
+    }
+}
+
+void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)
+{
+    if (m_schema->id() == "com.canonical.qtmir") {
+        GSettingsControllerQml::instance()->setLifecycleExemptAppids(appIds);
+    }
+}

=== modified file 'tests/mocks/GSettings.1.0/fake_gsettings.h'
--- tests/mocks/GSettings.1.0/fake_gsettings.h	2015-08-19 23:41:18 +0000
+++ tests/mocks/GSettings.1.0/fake_gsettings.h	2015-11-05 18:02:15 +0000
@@ -19,6 +19,7 @@
 
 #include <QList>
 #include <QObject>
+#include <QStringList>
 
 class GSettingsSchemaQml: public QObject
 {
@@ -48,6 +49,7 @@
     Q_PROPERTY(QString pictureUri READ pictureUri WRITE setPictureUri NOTIFY pictureUriChanged)
     Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)
     Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)
+    Q_PROPERTY(QStringList lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)
 
 public:
     GSettingsQml(QObject *parent = nullptr);
@@ -56,16 +58,19 @@
     QString pictureUri() const;
     QString usageMode() const;
     qint64 lockedOutTime() const;
+    QStringList lifecycleExemptAppids() const;
 
     void setPictureUri(const QString &str);
     void setUsageMode(const QString &usageMode);
     void setLockedOutTime(qint64 timestamp);
+    void setLifecycleExemptAppids(const QStringList &appIds);
 
 Q_SIGNALS:
     void schemaChanged();
     void pictureUriChanged(const QString&);
     void usageModeChanged(const QString&);
     void lockedOutTimeChanged(qint64);
+    void lifecycleExemptAppidsChanged(const QStringList &);
 
 private:
     GSettingsSchemaQml* m_schema;
@@ -90,10 +95,14 @@
     qint64 lockedOutTime() const;
     Q_INVOKABLE void setLockedOutTime(qint64 timestamp);
 
+    QStringList lifecycleExemptAppids() const;
+    Q_INVOKABLE void setLifecycleExemptAppids(const QStringList &appIds);
+
 Q_SIGNALS:
     void pictureUriChanged(const QString&);
     void usageModeChanged(const QString&);
     void lockedOutTimeChanged(qint64 timestamp);
+    void lifecycleExemptAppidsChanged(const QStringList&);
 
 private:
     GSettingsControllerQml();
@@ -101,6 +110,7 @@
     QString m_pictureUri;
     QString m_usageMode;
     qint64 m_lockedOutTime;
+    QStringList m_lifecycleExemptAppids;
 
     static GSettingsControllerQml* s_controllerInstance;
     QList<GSettingsQml *> m_registeredGSettings;

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-08-31 10:25:07 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-11-05 18:02:15 +0000
@@ -41,6 +41,7 @@
             Qt::InvertedLandscapeOrientation)
     , m_rotatesWindowContents(false)
     , m_requestedState(RequestedRunning)
+    , m_isTouchApp(true)
     , m_manualSurfaceCreation(false)
 {
 }
@@ -58,6 +59,7 @@
             Qt::InvertedLandscapeOrientation)
     , m_rotatesWindowContents(false)
     , m_requestedState(RequestedRunning)
+    , m_isTouchApp(true)
     , m_manualSurfaceCreation(false)
 {
 }
@@ -99,6 +101,7 @@
     if (m_session) {
         m_session->setApplication(this);
         m_session->setParent(this);
+        m_session->setScreenshot(m_screenshotFileName);
         SessionManager::singleton()->registerSession(m_session);
         connect(m_session, &Session::surfaceChanged,
                 this, &ApplicationInfo::onSessionSurfaceChanged);
@@ -123,21 +126,18 @@
     QString screenshotFileName;
 
     if (screenshotId.endsWith(".svg")) {
-        screenshotFileName = QString("%1/Dash/graphics/phone/screenshots/%2")
-            .arg(qmlDirectory())
+        screenshotFileName = QString("qrc:///Unity/Application/screenshots/%2")
             .arg(screenshotId);
     } else {
-        screenshotFileName = QString("%1/Dash/graphics/phone/screenshots/[e-mail]")
-            .arg(qmlDirectory())
+        screenshotFileName = QString("qrc:///Unity/Application/screenshots/[e-mail]")
             .arg(screenshotId);
     }
 
     if (screenshotFileName != m_screenshotFileName) {
         m_screenshotFileName = screenshotFileName;
 
-        QUrl screenshotUrl = QString("file://%1").arg(m_screenshotFileName);
         if (m_session) {
-            m_session->setScreenshot(screenshotUrl);
+            m_session->setScreenshot(screenshotFileName);
         }
     }
 }
@@ -245,6 +245,16 @@
     }
 }
 
+bool ApplicationInfo::isTouchApp() const
+{
+    return m_isTouchApp;
+}
+
+void ApplicationInfo::setIsTouchApp(bool isTouchApp)
+{
+    m_isTouchApp = isTouchApp;
+}
+
 void ApplicationInfo::onSessionSurfaceChanged(MirSurface* surface)
 {
     if (surface != nullptr && m_state == Starting) {

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2015-08-03 15:00:47 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2015-11-05 18:02:15 +0000
@@ -89,6 +89,9 @@
     bool manualSurfaceCreation() const { return m_manualSurfaceCreation; }
     void setManualSurfaceCreation(bool value);
 
+    bool isTouchApp() const override;
+    void setIsTouchApp(bool isTouchApp); // only in mock
+
 public:
     void setSession(Session* session);
     Session* session() const { return m_session; }
@@ -121,6 +124,7 @@
     Qt::ScreenOrientations m_supportedOrientations;
     bool m_rotatesWindowContents;
     RequestedState m_requestedState;
+    bool m_isTouchApp;
 
     bool m_manualSurfaceCreation;
 };

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2015-08-03 13:47:44 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2015-11-05 18:02:15 +0000
@@ -105,6 +105,8 @@
         return app->state();
     case RoleFocused:
         return app->focused();
+    case RoleIsTouchApp:
+        return app->isTouchApp();
     case RoleSession:
         return QVariant::fromValue(app->session());
     case RoleFullscreen:
@@ -458,6 +460,14 @@
     application->setName("YouTube");
     application->setIconId("youtube");
     m_availableApplications.append(application);
+
+    application = new ApplicationInfo(this);
+    application->setAppId("libreoffice");
+    application->setName("LibreOffice");
+    application->setIconId("libreoffice");
+    application->setScreenshotId("libreoffice");
+    application->setIsTouchApp(false);
+    m_availableApplications.append(application);
 }
 
 

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
--- tests/mocks/Unity/Application/ApplicationManager.h	2015-06-19 18:19:33 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.h	2015-11-05 18:02:15 +0000
@@ -43,7 +43,7 @@
     static ApplicationManager *singleton();
 
     enum MoreRoles {
-        RoleSession = RoleFocused+1,
+        RoleSession = RoleIsTouchApp+1,
         RoleFullscreen,
     };
     enum Flag {

=== modified file 'tests/mocks/Unity/Application/ApplicationTestInterface.cpp'
--- tests/mocks/Unity/Application/ApplicationTestInterface.cpp	2015-08-03 15:00:47 +0000
+++ tests/mocks/Unity/Application/ApplicationTestInterface.cpp	2015-11-05 18:02:15 +0000
@@ -40,7 +40,7 @@
 {
     if (!existingSession) return nullptr;
 
-    QUrl screenshotUrl = QString("file://%1/Dash/graphics/phone/screenshots/[e-mail]")
+    QUrl screenshotUrl = QString("qrc:///Unity/Application/screenshots/[e-mail]")
             .arg(qmlDirectory())
             .arg(surfaceImage);
 
@@ -90,7 +90,7 @@
         return 0;
     }
 
-    QUrl screenshotUrl = QString("file://%1/Dash/graphics/phone/screenshots/[e-mail]")
+    QUrl screenshotUrl = QString("qrc:///Unity/Application/screenshots/[e-mail]")
             .arg(qmlDirectory())
             .arg(surfaceImage);
 

=== renamed directory 'qml/Dash/graphics/phone/screenshots' => 'tests/mocks/Unity/Application/resources/screenshots'
=== added file 'tests/mocks/Unity/Application/resources/screenshots/[e-mail]'
Binary files tests/mocks/Unity/Application/resources/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 and tests/mocks/Unity/Application/resources/screenshots/[e-mail]	2015-11-05 18:02:15 +0000 differ
=== modified file 'tests/mocks/Unity/Application/resources/surfaces.qrc'
--- tests/mocks/Unity/Application/resources/surfaces.qrc	2015-04-30 20:46:41 +0000
+++ tests/mocks/Unity/Application/resources/surfaces.qrc	2015-11-05 18:02:15 +0000
@@ -3,5 +3,18 @@
         <file>VirtualKeyboard.qml</file>
         <file>MirSurfaceItem.qml</file>
         <file>vkb_portrait.png</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/gmail-webapp.svg</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/ubuntu-weather-app.svg</file>
+        <file>screenshots/[e-mail]</file>
+        <file>screenshots/vkb_portrait.png</file>
+        <file>screenshots/[e-mail]</file>
     </qresource>
 </RCC>

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-08-12 08:40:47 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-11-05 18:02:15 +0000
@@ -75,6 +75,9 @@
     item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);
     item->setPinned(true);
     m_list.append(item);
+    item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office", "libreoffice", this);
+    item->setPinned(true);
+    m_list.append(item);
 }
 
 MockLauncherModel::~MockLauncherModel()

=== modified file 'tests/mocks/Utils/CMakeLists.txt'
--- tests/mocks/Utils/CMakeLists.txt	2015-09-29 14:46:24 +0000
+++ tests/mocks/Utils/CMakeLists.txt	2015-11-05 18:02:15 +0000
@@ -18,6 +18,8 @@
     ${CMAKE_SOURCE_DIR}/plugins/Utils/windowscreenshotprovider.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/easingcurve.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Utils/inputwatcher.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Utils/applicationsfiltermodel.cpp
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
     constants.cpp
     plugin.cpp
     windowstatestorage.cpp

=== modified file 'tests/mocks/Utils/plugin.cpp'
--- tests/mocks/Utils/plugin.cpp	2015-09-29 14:46:24 +0000
+++ tests/mocks/Utils/plugin.cpp	2015-11-05 18:02:15 +0000
@@ -35,6 +35,7 @@
 #include <windowkeysfilter.h>
 #include <windowscreenshotprovider.h>
 #include <easingcurve.h>
+#include <applicationsfiltermodel.h>
 
 static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -63,6 +64,7 @@
     qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
     qmlRegisterSingletonType<Constants>(uri, 0, 1, "Constants", createConstants);
     qmlRegisterType<ActiveFocusLogger>(uri, 0, 1, "ActiveFocusLogger");
+    qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
 }
 
 void FakeUtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'tests/mocks/Utils/windowstatestorage.cpp'
--- tests/mocks/Utils/windowstatestorage.cpp	2015-08-24 15:39:53 +0000
+++ tests/mocks/Utils/windowstatestorage.cpp	2015-11-05 18:02:15 +0000
@@ -44,3 +44,20 @@
     if (!m_geometry.contains(windowId)) return defaultValue;
     return m_geometry.value(windowId).toRect();
 }
+
+void WindowStateStorage::clear()
+{
+    m_state.clear();
+    m_geometry.clear();
+}
+
+void WindowStateStorage::saveState(const QString &windowId, WindowState state)
+{
+    m_state[windowId] = state;
+}
+
+WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue)
+{
+    if (!m_state.contains(windowId)) return defaultValue;
+    return m_state.value(windowId);
+}

=== modified file 'tests/mocks/Utils/windowstatestorage.h'
--- tests/mocks/Utils/windowstatestorage.h	2015-08-24 15:39:53 +0000
+++ tests/mocks/Utils/windowstatestorage.h	2015-11-05 18:02:15 +0000
@@ -22,12 +22,23 @@
 {
     Q_OBJECT
     Q_PROPERTY(QVariantMap geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)
+    Q_ENUMS(WindowState)
 public:
+    enum WindowState {
+        WindowStateNormal,
+        WindowStateMaximized
+    };
     WindowStateStorage(QObject *parent = 0);
 
+    Q_INVOKABLE void saveState(const QString &windowId, WindowState state);
+    Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue);
+
     Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);
     Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);
 
+    // Only in the mock, to easily restore a fresh state
+    Q_INVOKABLE void clear();
+
 Q_SIGNALS:
     void geometryChanged(const QVariantMap& geometry);
 
@@ -35,5 +46,6 @@
     void setGeometry(const QVariantMap& geometry);
     QVariantMap geometry() const;
 
+    QHash<QString, WindowState> m_state;
     QVariantMap m_geometry;
 };

=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-08-19 14:24:07 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-11-05 18:02:15 +0000
@@ -57,6 +57,7 @@
     QColor splashColorFooter() const override { return QColor(0,0,0,0); }
     Qt::ScreenOrientations supportedOrientations() const override { return Qt::PortraitOrientation; }
     bool rotatesWindowContents() const override { return false; }
+    bool isTouchApp() const override { return true; }
 
     // Methods used for mocking (not in the interface)
     void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-10-20 08:10:03 +0000
+++ tests/qmltests/CMakeLists.txt	2015-11-05 18:02:15 +0000
@@ -11,6 +11,7 @@
 add_unity8_qmltest(Components DraggingArea)
 add_unity8_qmltest(Components LazyImage)
 add_unity8_qmltest(Components Lockscreen)
+add_unity8_qmltest(Components ModeSwitchWarningDialog)
 add_unity8_qmlunittest(Components PhysicalKeysMapper)
 add_unity8_qmltest(Components Rating)
 add_unity8_qmltest(Components ResponsiveGridView)

=== added file 'tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml'
--- tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Components/tst_ModeSwitchWarningDialog.qml	2015-11-05 18:02:15 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import "../../../qml/Components"
+import Unity.Test 0.1 as UT
+import Ubuntu.Components 1.2
+import Ubuntu.Components.Popups 1.2
+
+Rectangle {
+    id: root
+    width: units.gu(40)
+    height: units.gu(70)
+    color: "lightgrey"
+
+    ListModel {
+        id: fakeModel
+        ListElement { icon: "../graphics/applicationIcons/facebook.png"; name: "Facebook" }
+        ListElement { icon: "../graphics/applicationIcons/gmail.png"; name: "Mail" }
+    }
+
+    function openWarning() {
+        return PopupUtils.open(Qt.resolvedUrl("../../../qml/Components/ModeSwitchWarningDialog.qml"), root, { model: fakeModel });
+    }
+
+    Button {
+        anchors.centerIn: parent
+        text: "trigger warning"
+        onClicked: {
+            openWarning();
+        }
+    }
+
+    SignalSpy {
+        id: spy
+        signalName: "forceClose"
+    }
+
+    UT.UnityTestCase {
+        name: "ModeSwitchWarning"
+        when: windowShown
+
+        function test_labelChangesOnClick() {
+            var popup = openWarning();
+            var reconnectLabel = findChild(popup, "reconnectLabel");
+            tryCompare(reconnectLabel, "text", reconnectLabel.notClickedText)
+            mouseClick(reconnectLabel, reconnectLabel.width / 2, reconnectLabel.height / 2)
+            tryCompare(reconnectLabel, "text", reconnectLabel.clickedText)
+        }
+
+        function test_closeButtonEmitsSignal() {
+            var popup = openWarning();
+            spy.target = popup;
+            spy.clear();
+            var closeButton = findChild(popup, "forceCloseButton");
+            mouseClick(closeButton, closeButton.width / 2, closeButton.height / 2)
+            tryCompare(spy, "count", 1)
+
+        }
+    }
+}

=== modified file 'tests/qmltests/Components/tst_ZoomableImage.qml'
--- tests/qmltests/Components/tst_ZoomableImage.qml	2015-03-18 14:34:18 +0000
+++ tests/qmltests/Components/tst_ZoomableImage.qml	2015-11-05 18:02:15 +0000
@@ -36,7 +36,7 @@
     }
 
     property var widgetData2: {
-        "source": "../../../qml/Dash/graphics/phone/screenshots/[e-mail]",
+        "source": "../../mocks/Unity/Application/resources/screenshots/[e-mail]",
         "zoomable": true
     }
 

=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
--- tests/qmltests/Stages/tst_PhoneStage.qml	2015-08-12 15:08:09 +0000
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-11-05 18:02:15 +0000
@@ -34,8 +34,6 @@
         maximizedAppTopMargin: units.gu(3) + units.dp(2)
         interactive: true
         shellOrientation: Qt.PortraitOrientation
-        shellPrimaryOrientation: Qt.PortraitOrientation
-        nativeOrientation: Qt.PortraitOrientation
     }
 
     Binding {

=== modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
--- tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-03-06 04:44:11 +0000
+++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-11-05 18:02:15 +0000
@@ -18,6 +18,7 @@
 import QtTest 1.0
 import Unity.Test 0.1 as UT
 import ".."
+import "../../../qml/Components"
 import "../../../qml/Stages"
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
@@ -73,8 +74,11 @@
                         return Qt.LandscapeOrientation;
                     }
                 }
-                shellPrimaryOrientation: Qt.PortraitOrientation
-                nativeOrientation: Qt.PortraitOrientation
+
+                orientations: Orientations {
+                    // the default values will do
+                }
+
                 maximizedAppTopMargin: units.gu(3)
                 Component.onDestruction: {
                     spreadDelegateLoader.itemDestroyed = true;

=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
--- tests/qmltests/Stages/tst_TabletStage.qml	2015-09-02 14:26:43 +0000
+++ tests/qmltests/Stages/tst_TabletStage.qml	2015-11-05 18:02:15 +0000
@@ -22,6 +22,7 @@
 import Unity.Test 0.1
 
 import "../../../qml/Stages"
+import "../../../qml/Components"
 
 Rectangle {
     id: root
@@ -50,10 +51,9 @@
                 maximizedAppTopMargin: units.gu(3) + units.dp(2)
                 interactive: true
                 shellOrientation: Qt.LandscapeOrientation
-                shellPrimaryOrientation: Qt.LandscapeOrientation
-                nativeOrientation: Qt.LandscapeOrientation
                 nativeWidth: width
                 nativeHeight: height
+                orientations: Orientations{} // Defaults are fine for testing
                 focus: true
             }
         }

=== modified file 'tests/qmltests/Stages/tst_WindowResizeArea.qml'
--- tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-10-08 14:27:12 +0000
+++ tests/qmltests/Stages/tst_WindowResizeArea.qml	2015-11-05 18:02:15 +0000
@@ -44,8 +44,11 @@
             width: units.gu(20)
             property int windowHeight: height
             property int windowWidth: width
-            onWindowHeightChanged: height = windowHeight
-            onWindowWidthChanged: width = windowWidth
+            state: "normal"
+
+            function maximize() {
+                state = "maximized"
+            }
 
             WindowResizeArea {
                 id: windowResizeArea
@@ -195,5 +198,35 @@
             tryCompare(fakeWindow, "width", initialWindowWidth);
             tryCompare(fakeWindow, "height", initialWindowHeight);
         }
+
+        function test_saveRestoreMaximized() {
+            var initialWindowX = fakeWindow.x;
+            var initialWindowY = fakeWindow.y;
+
+            var moveDelta = units.gu(5);
+
+            fakeWindow.x = initialWindowX + moveDelta
+            fakeWindow.y = initialWindowY + moveDelta
+
+            // Now change the state to maximized. The window should not keep updating the stored values
+            fakeWindow.state = "maximized"
+            fakeWindow.x = 31415 // 0 is too risky to pass the test even when broken
+            fakeWindow.y = 31415
+
+            // This will destroy the window and recreate it
+            windowLoader.active = false;
+            waitForRendering(root);
+            windowLoader.active = true;
+
+            // Make sure it's again where we left it in normal state before destroying
+            tryCompare(fakeWindow, "x", initialWindowX + moveDelta)
+            tryCompare(fakeWindow, "y", initialWindowX + moveDelta)
+
+            // Make sure maximize() has been called after restoring
+            tryCompare(fakeWindow, "state", "maximized")
+
+            // clean up
+            fakeWindow.state = "normal"
+        }
     }
 }

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2015-10-05 22:04:32 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2015-11-05 18:02:15 +0000
@@ -840,7 +840,7 @@
             // shell should remain in its primery orientation as the app in the main stage
             // is the one that dictates its orientation. In this case it's unity8-dash
             // which supports only primary orientation
-            compare(shell.orientation, orientedShell.primaryOrientation);
+            compare(shell.orientation, orientedShell.orientations.primary);
         }
 
         function test_sideStageAppsRemainPortraitInSpread_data() {

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2015-10-20 08:10:03 +0000
+++ tests/qmltests/tst_Shell.qml	2015-11-05 18:02:15 +0000
@@ -29,8 +29,11 @@
 import Unity.Test 0.1
 import Powerd 0.1
 import Wizard 0.1 as Wizard
+import Utils 0.1
 
 import "../../qml"
+import "../../qml/Components"
+import "../../qml/Components/PanelState"
 import "Stages"
 
 Rectangle {
@@ -97,8 +100,7 @@
                     id: __shell
                     usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
                     orientation: Qt.PortraitOrientation
-                    primaryOrientation: Qt.PortraitOrientation
-                    nativeOrientation: Qt.PortraitOrientation
+                    orientations: Orientations{} // Defaults are fine for testing
                     Component.onDestruction: {
                         shellLoader.itemDestroyed = true;
                     }
@@ -302,6 +304,7 @@
             mouseEmulation.checked = true;
             tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state
             tearDown();
+            WindowStateStorage.clear();
         }
 
         function loadShell(formFactor) {
@@ -377,6 +380,8 @@
             LightDM.Greeter.authenticate(""); // reset greeter
 
             sessionSpy.clear();
+
+            GSettingsController.setLifecycleExemptAppids([]);
         }
 
         function killApps() {
@@ -1707,5 +1712,177 @@
 
             keyRelease(Qt.Key_Control);
         }
+
+        // regression test for http://pad.lv/1443319
+        function test_closeMaximizedAndRestart() {
+            loadDesktopShellWithApps();
+
+            var appRepeater = findChild(shell, "appRepeater")
+            var appId = ApplicationManager.get(0).appId;
+            var appDelegate = appRepeater.itemAt(0);
+            var maximizeButton = findChild(appDelegate, "maximizeWindowButton");
+
+            wait(5000)
+            tryCompare(appDelegate, "state", "normal");
+            tryCompare(PanelState, "buttonsVisible", false)
+
+            wait(5000)
+            mouseClick(maximizeButton, maximizeButton.width / 2, maximizeButton.height / 2);
+            tryCompare(appDelegate, "state", "maximized");
+            tryCompare(PanelState, "buttonsVisible", true)
+
+            ApplicationManager.stopApplication(appId);
+            tryCompare(PanelState, "buttonsVisible", false)
+
+            ApplicationManager.startApplication(appId);
+            tryCompare(PanelState, "buttonsVisible", true)
+        }
+
+        // bug http://pad.lv/1431566
+        function test_switchToStagedHidesPanelButtons() {
+            loadDesktopShellWithApps();
+            var appRepeater = findChild(shell, "appRepeater")
+            var appId = ApplicationManager.get(0).appId;
+            var appDelegate = appRepeater.itemAt(0);
+            var panelButtons = findChild(shell, "panelWindowControlButtons")
+
+            tryCompare(appDelegate, "state", "normal");
+            tryCompare(panelButtons, "visible", false);
+
+            appDelegate.maximize(false);
+            tryCompare(panelButtons, "visible", true);
+
+            shell.usageScenario = "phone";
+            waitForRendering(shell);
+            tryCompare(panelButtons, "visible", false);
+
+            shell.usageScenario = "desktop";
+            waitForRendering(shell);
+            tryCompare(panelButtons, "visible", true);
+        }
+
+        function test_lockingGreeterHidesPanelButtons() {
+            loadDesktopShellWithApps();
+            var appRepeater = findChild(shell, "appRepeater")
+            var appId = ApplicationManager.get(0).appId;
+            var appDelegate = appRepeater.itemAt(0);
+            var panelButtons = findChild(shell, "panelWindowControlButtons")
+
+            tryCompare(appDelegate, "state", "normal");
+            tryCompare(panelButtons, "visible", false);
+
+            appDelegate.maximize(false);
+            tryCompare(panelButtons, "visible", true);
+
+            LightDM.Greeter.showGreeter();
+            waitForRendering(shell);
+            tryCompare(panelButtons, "visible", false);
+
+            LightDM.Greeter.hideGreeter();
+            waitForRendering(shell);
+            tryCompare(panelButtons, "visible", true);
+        }
+
+        function test_lifecyclePolicyForNonTouchApp_data() {
+            return [
+                {tag: "phone", formFactor: "phone", usageScenario: "phone"},
+                {tag: "tablet", formFactor: "tablet", usageScenario: "tablet"}
+            ]
+        }
+
+        function test_lifecyclePolicyForNonTouchApp(data) {
+            loadShell(data.formFactor);
+            shell.usageScenario = data.usageScenario;
+
+            var app1 = ApplicationManager.startApplication("libreoffice");
+            waitUntilAppWindowIsFullyLoaded(app1);
+            var app2 = ApplicationManager.startApplication("dialer-app");
+            waitUntilAppWindowIsFullyLoaded(app2);
+
+            // Make sure app1 is unfocused but still running
+            compare(app1.session.surface.activeFocus, false);
+            compare(app1.isTouchApp, false); // sanity check our mock, which sets this for us
+            compare(app1.requestedState, ApplicationInfoInterface.RequestedRunning);
+        }
+
+        function test_lifecyclePolicyExemption_data() {
+            return [
+                {tag: "phone", formFactor: "phone", usageScenario: "phone", suspendsApps: true},
+                {tag: "tablet", formFactor: "tablet", usageScenario: "tablet", suspendsApps: true}
+            ]
+        }
+
+        function test_lifecyclePolicyExemption(data) {
+            loadShell(data.formFactor);
+            shell.usageScenario = data.usageScenario;
+
+            GSettingsController.setLifecycleExemptAppids(["webbrowser-app"]);
+
+            var app1 = ApplicationManager.startApplication("webbrowser-app");
+            waitUntilAppWindowIsFullyLoaded(app1);
+            var app2 = ApplicationManager.startApplication("dialer-app");
+            waitUntilAppWindowIsFullyLoaded(app2);
+
+            // Make sure app1 is unfocused but still running
+            compare(app1.session.surface.activeFocus, false);
+            compare(app1.requestedState, ApplicationInfoInterface.RequestedRunning);
+        }
+
+        function test_switchToStagedForcesLegacyAppClosing_data() {
+            return [
+                {tag: "forceClose", replug: false },
+                {tag: "replug", replug: true }
+            ];
+        }
+
+        function test_switchToStagedForcesLegacyAppClosing(data) {
+            loadShell("desktop")
+            shell.usageScenario = "desktop"
+            waitForRendering(shell);
+
+            ApplicationManager.startApplication("camera-app")
+
+            shell.usageScenario = "phone"
+            waitForRendering(shell);
+
+            // No legacy app running yet... Popup must *not* show.
+            var popup = findChild(root, "modeSwitchWarningDialog");
+            compare(popup, null);
+
+            shell.usageScenario = "desktop"
+            waitForRendering(shell);
+
+            // Now start a legacy app
+            ApplicationManager.startApplication("libreoffice")
+
+            shell.usageScenario = "phone"
+            waitForRendering(shell);
+
+            // The popup must appear now
+            popup = findChild(root, "modeSwitchWarningDialog");
+            compare(popup !== null, true);
+
+            if (data.replug) {
+                shell.usageScenario = "desktop"
+                waitForRendering(shell);
+
+            } else {
+                var forceCloseButton = findChild(popup, "forceCloseButton");
+                mouseClick(forceCloseButton, forceCloseButton.width / 2, forceCloseButton.height / 2);
+                waitForRendering(root);
+            }
+
+            // Popup must be gone now
+            popup = findChild(root, "modeSwitchWarningDialog");
+            compare(popup === null, true);
+
+            if (data.replug) {
+                // Libreoffice must still be running
+                compare(ApplicationManager.findApplication("libreoffice") !== null, true);
+            } else {
+                // Libreoffice must be gone now
+                compare(ApplicationManager.findApplication("libreoffice") === null, true);
+            }
+        }
     }
 }