Merge lp:~macslow/unity8/shellRotation into lp:unity8

[Michał Sawicz]

Implemented autopilot-test and fake-sensors for shell-rotation.

Implemented autopilot-test and fake-sensors for shell-rotation.

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

The branch lp:~dandrader/qtmir/supportedOrientations needs to be merged to lp:qtmir first before this can work properly.

For testing/reviewer convenience use ppa:unity-team/demo-stuff to get the needed package dependencies in place. In addition to that, wipe your ~/.cache/QML directory on the device before running shell-rotation autopilot-test (see https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1444937).

* 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?
Not applicable.

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1594
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~macslow/unity8/shellRotation/+merge/255667/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5526/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2164/console
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/689/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/691/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/691/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2162/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

I aborted the CI run as it was bound to fail without the dependencies anyway...

[lp:~macslow/unity8/shellRotation]

1597. By Mirco Müller on 2015-04-10

Removed sneaky bzr-cruft.

1598. By Mirco Müller on 2015-04-10

Merged with ~unity-team/unity8/shellRotation and fixed conflicts.

1599. By Mirco Müller on 2015-04-15

Merged with unity-team's shellRotation branch and fixed conflicts.

1600. By Mirco Müller on 2015-04-16

Use the logger-facility for spitting out runtime-info about the test.

1601. By Mirco Müller on 2015-04-16

Make code a bit more tight.

1602. By Mirco Müller on 2015-04-16

Removed tst_TabletShell.qml added by mistake earlier.

1603. By Mirco Müller on 2015-04-21

Fix some issues from MP-comments... use scenarios as much as possible to make ap-test more compact.

1604. By Mirco Müller on 2015-04-21

More Python3-ification according to MP-comments.

1605. By Mirco Müller on 2015-04-21

Forgot import

1606. By Mirco Müller on 2015-04-21

flake8-ify shell-rotation ap-test.

1607. By Mirco Müller on 2015-04-22

Merged with unity8 trunk.

1608. By Mirco Müller on 2015-04-22

Build-dependency on libunity-api-dev >= 7.97 is wrong 7.96 is sufficient.

1609. By Mirco Müller on 2015-04-22

Argl

1610. By Mirco Müller on 2015-04-22

Removed to lines that must have been added by a bogus branch-merge. The display-indicator ap-tests were never meant to be touched.

1611. By Mirco Müller on 2015-04-22

Make test skip earlier and save execution-time, if device does not support a certain orientation.

1612. By Mirco Müller on 2015-04-24

Merge with parent

1613. By Mirco Müller on 2015-04-27

Fix more flake8 errors.

1614. By Mirco Müller on 2015-04-30

Made get_unity_pid() available across ap-tests.

1615. By Mirco Müller on 2015-05-05

This should solve the too early skipping of the rotation ap-test.

1616. By Mirco Müller on 2015-05-08

To make the faked 'right-up'-orientation be recognized more consistently by qtubuntu-sensors, more granularity steps were needed.

1617. By Mirco Müller on 2015-05-11

Merged with parent branch again and fixed conflicts.

1618. By Mirco Müller on 2015-05-12

Make sure to unset QV4_ENABLE_JIT_CACHE environment-variable for autopilot-test runs, due to LP: #1444937.

1619. By Mirco Müller on 2015-05-13

Revert changes from r1618 since the qml-cache-related issue can't be reproduced on other setups.

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-12 13:59:07 +0000
+++ CMakeLists.txt	2015-04-16 12:11:39 +0000
@@ -56,6 +56,8 @@
 find_package(Qt5Concurrent 5.2 REQUIRED)
 find_package(Qt5Sql 5.2 REQUIRED)
 
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
+
 # Standard install paths
 include(GNUInstallDirs)
 

=== modified file 'data/unity8-dash.desktop.in'
--- data/unity8-dash.desktop.in	2014-09-04 13:23:09 +0000
+++ data/unity8-dash.desktop.in	2015-04-16 12:11:39 +0000
@@ -7,3 +7,4 @@
 Icon=
 NoDisplay=true
 X-Ubuntu-Touch=true
+X-Ubuntu-Supported-Orientations=primary

=== modified file 'debian/control'
--- debian/control	2015-04-02 13:09:18 +0000
+++ debian/control	2015-04-16 12:11:39 +0000
@@ -14,6 +14,7 @@
 # append :native to g++-4.9 so we don't try to run armhf g++
 # on an x86 CPU for eaxmple, when cross-compiling.
                g++-4.9:native,
+               libandroid-properties-dev,
                libconnectivity-qt1-dev,
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
@@ -27,7 +28,7 @@
                libqmenumodel-dev (>= 0.2.9),
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
-               libunity-api-dev (>= 7.96),
+               libunity-api-dev (>= 7.97),
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,
@@ -94,7 +95,7 @@
          qml-module-qtquick-xmllistmodel,
          qml-module-qtsysteminfo,
          qtdeclarative5-gsettings1.0,
-         qtdeclarative5-qtmir-plugin (>= 0.4.4),
+         qtdeclarative5-qtmir-plugin (>= 0.4.5),
          qtdeclarative5-ubuntu-telephony0.1,
          qtdeclarative5-ubuntu-web-plugin,
          ubuntu-system-settings,
@@ -124,7 +125,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.1.1239) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.1.1239),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
-         unity-application-impl-4,
+         unity-application-impl-6,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-6,
@@ -168,7 +169,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-4,
+          unity-application-impl-6,
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell
  (e.g Ubuntu.Application) so that you can run it in a sandboxed environment.

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2014-12-16 16:49:49 +0000
+++ debian/unity8.install	2015-04-16 12:11:39 +0000
@@ -8,6 +8,9 @@
 usr/share/unity8/Greeter
 usr/share/unity8/Launcher
 usr/share/unity8/Panel
+usr/share/unity8/Rotation
+usr/share/unity8/DeviceConfiguration.qml
+usr/share/unity8/OrientedShell.qml
 usr/share/unity8/Shell.qml
 usr/share/unity8/Stages
 usr/share/unity8/Tutorial

=== modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
--- plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-03-31 01:03:55 +0000
+++ plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 
 add_definitions(-DSM_BUSNAME=systemBus)

=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
--- plugins/Unity/Launcher/CMakeLists.txt	2015-02-11 14:02:16 +0000
+++ plugins/Unity/Launcher/CMakeLists.txt	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=6)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=6)
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 
 add_definitions(-DSM_BUSNAME=systemBus)

=== modified file 'plugins/Utils/CMakeLists.txt'
--- plugins/Utils/CMakeLists.txt	2015-04-02 10:32:43 +0000
+++ plugins/Utils/CMakeLists.txt	2015-04-16 12:11:39 +0000
@@ -16,6 +16,7 @@
     timeformatter.cpp
     unitymenumodelpaths.cpp
     windowkeysfilter.cpp
+    windowscreenshotprovider.cpp
     easingcurve.cpp
     windowstatestorage.cpp
     plugin.cpp

=== modified file 'plugins/Utils/plugin.cpp'
--- plugins/Utils/plugin.cpp	2015-04-07 11:50:48 +0000
+++ plugins/Utils/plugin.cpp	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Canonical, Ltd.
+ * Copyright (C) 2012-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
@@ -26,6 +26,7 @@
 #include "plugin.h"
 
 // local
+#include "easingcurve.h"
 #include "inputwatcher.h"
 #include "qlimitproxymodelqml.h"
 #include "unitysortfilterproxymodelqml.h"
@@ -33,7 +34,7 @@
 #include "timeformatter.h"
 #include "unitymenumodelpaths.h"
 #include "windowkeysfilter.h"
-#include "easingcurve.h"
+#include "windowscreenshotprovider.h"
 #include "windowstatestorage.h"
 #include "constants.h"
 
@@ -71,4 +72,6 @@
 void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     QQmlExtensionPlugin::initializeEngine(engine, uri);
+
+    engine->addImageProvider(QLatin1String("window"), new WindowScreenshotProvider);
 }

=== added file 'plugins/Utils/windowscreenshotprovider.cpp'
--- plugins/Utils/windowscreenshotprovider.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Utils/windowscreenshotprovider.cpp	2015-04-16 12:11:39 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "windowscreenshotprovider.h"
+
+#include <QGuiApplication>
+#include <QQuickWindow>
+
+WindowScreenshotProvider::WindowScreenshotProvider()
+    : QQuickImageProvider(QQmlImageProviderBase::Image, 0)
+{
+}
+
+// A very simple implementation where we assume that there's only one window and that it's a
+// QQuickWindow. Thus the id parameter is irrelevant.
+//
+// Idea: Make the id contain the objectName of the QQuickWindow once we care about a multi-display
+//       compositor?
+//       Strictly speaking that could be the actual QWindow::winId(), but that's mostly a
+//       meaningless arbitrary number.
+QImage WindowScreenshotProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
+{
+    Q_UNUSED(id);
+    Q_UNUSED(requestedSize);
+
+    QWindowList windows = QGuiApplication::topLevelWindows();
+
+    if (windows.count() != 1) {
+        size->rwidth() = 0;
+        size->rheight() = 0;
+        return QImage();
+    }
+
+    QQuickWindow *quickWindow = qobject_cast<QQuickWindow *>(windows[0]);
+
+    if (!quickWindow) {
+        size->rwidth() = 0;
+        size->rheight() = 0;
+        return QImage();
+    }
+
+    QImage image = quickWindow->grabWindow();
+    size->rwidth() = image.width();
+    size->rheight() = image.height();
+    return image;
+}

=== added file 'plugins/Utils/windowscreenshotprovider.h'
--- plugins/Utils/windowscreenshotprovider.h	1970-01-01 00:00:00 +0000
+++ plugins/Utils/windowscreenshotprovider.h	2015-04-16 12:11:39 +0000
@@ -0,0 +1,31 @@
+/*
+ * 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 WINDOW_SCREENSHOT_PROVIDER_H_
+#define WINDOW_SCREENSHOT_PROVIDER_H_
+
+#include <QQuickImageProvider>
+
+class WindowScreenshotProvider : public QQuickImageProvider
+{
+public:
+    WindowScreenshotProvider();
+
+    // id is ignored for now
+    QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) override;
+};
+
+#endif // WINDOW_SCREENSHOT_PROVIDER_H_

=== modified file 'qml/CMakeLists.txt'
--- qml/CMakeLists.txt	2014-12-16 16:49:49 +0000
+++ qml/CMakeLists.txt	2015-04-16 12:11:39 +0000
@@ -13,6 +13,7 @@
     Notifications
     Panel
     Stages
+    Rotation
     Tutorial
     Wizard
     )

=== added file 'qml/Components/WindowScreenshot.qml'
--- qml/Components/WindowScreenshot.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/WindowScreenshot.qml	2015-04-16 12:11:39 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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.2
+
+Item {
+    id: root
+
+    function take() {
+        var timeNow = new Date().getTime();
+        image.source = "image://window/" + timeNow;
+    }
+
+    // Unload the image to free up memory
+    function discard() {
+        image.source = "";
+    }
+
+    Image {
+        id: image
+    }
+}

=== added file 'qml/Dash/graphics/phone/screenshots/gmail-webapp.svg'
--- qml/Dash/graphics/phone/screenshots/gmail-webapp.svg	1970-01-01 00:00:00 +0000
+++ qml/Dash/graphics/phone/screenshots/gmail-webapp.svg	2015-04-16 12:11:39 +0000
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="768"
+   height="1280"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="gmail-webapp.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="117.33439"
+     inkscape:cy="668.80479"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,227.63782)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2985"
+       width="769.73627"
+       height="1276.8328"
+       x="-2.0203052"
+       y="3.1671834"
+       transform="translate(0,-227.63782)" />
+    <rect
+       style="fill:#e6e6e6;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3797"
+       width="773.77686"
+       height="129.29953"
+       x="-6.0609155"
+       y="-0.87342685"
+       transform="translate(0,-227.63782)" />
+    <text
+       xml:space="preserve"
+       style="font-size:72px;font-style:normal;font-weight:500;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium;font-stretch:normal;font-variant:normal"
+       x="20.203053"
+       y="-139.61781"
+       id="text3755"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3757"
+         x="20.203053"
+         y="-139.61781">GMail</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="14.142137"
+       y="-28.501045"
+       id="text3759"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3761"
+         x="14.142137"
+         y="-28.501045">Inbox</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:#8effff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-28.284271,-251.88148)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 14.142136,237.52257 729.330134,0"
+       id="path3769"
+       inkscape:connector-curvature="0"
+       transform="translate(0,-227.63782)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="167.68533"
+       y="78.575127"
+       id="text3771"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773"
+         x="167.68533"
+         y="78.575127">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="167.68532"
+       y="131.10306"
+       id="text3775"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777"
+         x="167.68532"
+         y="131.10306"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 13.13199,165.44825 729.33013,0"
+       id="path3769-2"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8eff58;fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-3"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-26.263969,-93.102383)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="169.70564"
+       y="237.35422"
+       id="text3771-9"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-7"
+         x="169.70564"
+         y="237.35422">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="169.70561"
+       y="289.88217"
+       id="text3775-1"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-1"
+         x="169.70561"
+         y="289.88217"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.152292,324.22735 729.330128,0"
+       id="path3769-2-6"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8effff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-7"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-28.284274,64.481414)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="167.68533"
+       y="394.93799"
+       id="text3771-92"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-0"
+         x="167.68533"
+         y="394.93799">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="167.68532"
+       y="447.46594"
+       id="text3775-9"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-8"
+         x="167.68532"
+         y="447.46594"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 13.131986,481.81114 729.330124,0"
+       id="path3769-2-3"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8ea2ff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-2"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-26.263969,226.10582)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="169.70564"
+       y="556.56238"
+       id="text3771-1"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-1"
+         x="169.70564"
+         y="556.56238">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="169.70563"
+       y="609.09033"
+       id="text3775-8"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-85"
+         x="169.70563"
+         y="609.09033"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.152292,643.43555 729.330128,0"
+       id="path3769-2-1"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#8effff;fill-opacity:1;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-8"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-24.243664,391.77084)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="171.72594"
+       y="722.22742"
+       id="text3771-7"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-6"
+         x="171.72594"
+         y="722.22742">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="171.72592"
+       y="774.75537"
+       id="text3775-5"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-2"
+         x="171.72592"
+         y="774.75537"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 17.172597,809.10057 729.330133,0"
+       id="path3769-2-13"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#e44738;fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3765-9"
+       sodipodi:cx="107.07617"
+       sodipodi:cy="337.52768"
+       sodipodi:rx="64.649765"
+       sodipodi:ry="61.619305"
+       d="m 171.72594,337.52768 a 64.649765,61.619305 0 1 1 -129.299533,0 64.649765,61.619305 0 1 1 129.299533,0 z"
+       transform="translate(-24.243664,557.43585)" />
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="171.72594"
+       y="887.89246"
+       id="text3771-2"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3773-8"
+         x="171.72594"
+         y="887.89246">Lorem ipsum</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:64px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       x="171.72592"
+       y="940.42041"
+       id="text3775-3"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3777-7"
+         x="171.72592"
+         y="940.42041"
+         style="font-size:48px;fill:#b3b3b3">bla bla bla bla bla bla bla ...</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 17.172597,974.76558 729.330123,0"
+       id="path3769-2-9"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3929"
+       sodipodi:cx="590.93921"
+       sodipodi:cy="-119.06127"
+       sodipodi:rx="33.335033"
+       sodipodi:ry="33.335033"
+       d="m 624.27424,-119.06127 a 33.335033,33.335033 0 1 1 -66.67006,0 33.335033,33.335033 0 1 1 66.67006,0 z"
+       transform="matrix(0.85096826,0,0,0.85096826,175.43863,-68.81729)" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3.40387297;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 692.92249,-145.20602 20.63059,24.06901 12.03451,-13.75372 -20.63059,-17.19215"
+       id="path3931"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

=== removed file 'qml/Dash/graphics/phone/screenshots/[e-mail]'
Binary files qml/Dash/graphics/phone/screenshots/[e-mail]	2013-06-20 13:42:39 +0000 and qml/Dash/graphics/phone/screenshots/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== added file 'qml/Dash/graphics/phone/screenshots/ubuntu-weather-app.svg'
--- qml/Dash/graphics/phone/screenshots/ubuntu-weather-app.svg	1970-01-01 00:00:00 +0000
+++ qml/Dash/graphics/phone/screenshots/ubuntu-weather-app.svg	2015-04-16 12:11:39 +0000
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="829"
+   height="480"
+   id="svg2740"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   version="1.0"
+   sodipodi:docname="ubuntu-weather-app.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2742">
+    <linearGradient
+       id="linearGradient3824">
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1;"
+         offset="0"
+         id="stop3826" />
+      <stop
+         style="stop-color:#23abff;stop-opacity:1;"
+         offset="1"
+         id="stop3828" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3824"
+       id="linearGradient3830"
+       x1="348.55862"
+       y1="343.23914"
+       x2="348.55862"
+       y2="-17.422215"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.82625984"
+     inkscape:cx="331.28234"
+     inkscape:cy="125.54212"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1145"
+     inkscape:window-height="847"
+     inkscape:window-x="268"
+     inkscape:window-y="63"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2745">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-321.13452,-104.68346)">
+    <rect
+       style="fill:url(#linearGradient3830);fill-opacity:1;stroke:#000000;stroke-width:0.69999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2990"
+       width="832.66785"
+       height="480.47839"
+       x="-1.210273"
+       y="0.73188055"
+       transform="translate(321.13452,104.68346)" />
+    <path
+       d="m 310.66382,132.06057 c -1.82703,2.0443 -22.21039,-18.38308 -24.89334,-17.37811 -2.68295,1.00497 -6.73783,33.64192 -9.57527,34.01165 -2.83744,0.36973 -7.71546,-33.08881 -10.48084,-33.88783 -2.76539,-0.79903 -18.7793,19.34152 -21.17964,17.82892 -2.40034,-1.51259 5.69972,-26.09808 4.36486,-28.67057 -1.33487,-2.57249 -31.86305,-3.78032 -32.49182,-6.6501 -0.62876,-2.86978 27.66855,-10.399376 27.90248,-13.241764 0.23394,-2.842387 -18.99828,-18.90215 -17.89698,-21.393798 1.10131,-2.491647 26.85456,8.177399 28.59429,5.99159 1.73972,-2.185809 -3.39182,-29.683489 -0.75169,-30.507098 2.64013,-0.823608 18.50306,18.485327 21.32153,18.392972 2.81847,-0.09235 11.30312,-24.287685 14.18258,-23.722317 2.87947,0.565368 1.44329,25.667631 3.67226,27.34365 2.22897,1.676019 24.27161,-6.28288 25.90675,-4.004945 1.63514,2.277936 -12.63923,24.445025 -11.77955,27.07291 0.85968,2.627885 27.01183,5.1355 26.65457,7.852474 -0.35726,2.716973 -32.69913,3.875594 -34.04684,6.507203 -1.3477,2.631613 12.32368,32.410863 10.49665,34.455163 z"
+       id="path11949"
+       inkscape:flatsided="false"
+       inkscape:randomized="-0.092"
+       inkscape:rounded="0.1"
+       sodipodi:arg1="0.79570711"
+       sodipodi:arg2="1.144773"
+       sodipodi:cx="275.15002"
+       sodipodi:cy="88.090233"
+       sodipodi:r1="57.019234"
+       sodipodi:r2="32.818508"
+       sodipodi:sides="9"
+       sodipodi:type="star"
+       style="fill:#f5ff12;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2;marker:none;visibility:visible;display:inline;overflow:visible"
+       transform="matrix(2.527571,0,0,2.527571,85.214779,60.619097)" />
+    <path
+       d="m 194.51692,77.283737 c 0,20.659371 -17.86424,37.407103 -39.90091,37.407103 -22.03666,0 -39.90091,-16.747732 -39.90091,-37.407103 0,-20.659371 17.86425,-37.4071 39.90091,-37.4071 22.03667,0 39.90091,16.747729 39.90091,37.4071 z"
+       id="path11951"
+       sodipodi:cx="154.61601"
+       sodipodi:cy="77.283737"
+       sodipodi:rx="39.900909"
+       sodipodi:ry="37.407101"
+       sodipodi:type="arc"
+       style="fill:#f5ff12;fill-opacity:1;fill-rule:nonzero;stroke:#f5ff12;stroke-width:10.27388287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       transform="matrix(2.4568175,0,0,2.1990879,404.91256,120.05076)" />
+    <path
+       transform="matrix(3.2663208,0,0,3.4016021,515.92101,-254.59331)"
+       style="fill:#6798e9;fill-opacity:1;fill-rule:nonzero;stroke:#6798e9;stroke-width:7.30059433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0"
+       inkscape:original="M 110.53125 144.96875 C 100.76599 144.96875 92.384060 150.03292 88.281250 157.34375 C 86.642607 156.42892 84.835190 155.87500 82.906250 155.87500 C 77.073071 155.87500 72.219030 160.56753 70.718750 166.93750 C 68.157973 165.92533 65.180470 165.31250 62.000000 165.31250 C 52.458571 165.31250 44.718750 170.53296 44.718750 176.96875 C 44.718749 182.77816 51.066430 187.55402 59.312500 188.43750 C 58.942922 189.06456 58.656250 189.68551 58.656250 190.34375 C 58.656248 196.50568 75.538140 201.53125 96.343750 201.53125 C 117.14936 201.53125 134.03126 196.50568 134.03125 190.34375 C 134.03125 189.92916 133.77393 189.55916 133.62500 189.15625 C 134.53629 189.38287 135.43860 189.62500 136.43750 189.62500 C 142.00333 189.62501 146.53125 185.84318 146.53125 181.18750 C 146.53125 176.53182 142.00332 172.75000 136.43750 172.75000 C 135.75542 172.75000 135.17544 172.98560 134.53125 173.09375 C 135.09454 171.23218 135.46875 169.33268 135.46875 167.31250 C 135.46875 154.98864 124.31330 144.96875 110.53125 144.96875 z "
+       id="path11953"
+       d="m 110.53125,144.96875 c -9.76526,0 -18.14719,5.06417 -22.25,12.375 -1.638643,-0.91483 -3.44606,-1.46875 -5.375,-1.46875 -5.833179,0 -10.68722,4.69253 -12.1875,11.0625 -2.560777,-1.01217 -5.53828,-1.625 -8.71875,-1.625 -9.541429,0 -17.28125,5.22046 -17.28125,11.65625 -10e-7,5.80941 6.34768,10.58527 14.59375,11.46875 -0.369578,0.62706 -0.65625,1.24801 -0.65625,1.90625 -2e-6,6.16193 16.88189,11.1875 37.6875,11.1875 20.80561,0 37.68751,-5.02557 37.6875,-11.1875 0,-0.41459 -0.25732,-0.78459 -0.40625,-1.1875 0.91129,0.22662 1.8136,0.46875 2.8125,0.46875 5.56583,1e-5 10.09375,-3.78182 10.09375,-8.4375 0,-4.65568 -4.52793,-8.4375 -10.09375,-8.4375 -0.68208,0 -1.26206,0.2356 -1.90625,0.34375 0.56329,-1.86157 0.9375,-3.76107 0.9375,-5.78125 0,-12.32386 -11.15545,-22.34375 -24.9375,-22.34375 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#386195;fill-opacity:1;fill-rule:nonzero;stroke:#386195;stroke-width:24.07697487;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0.5;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path11963"
+       d="m 975.70833,305.75079 c -17.87875,0 -33.1897,9.10731 -40.70137,22.18913 -3.00012,-1.63696 -6.34124,-2.6392 -9.87286,-2.6392 -10.67967,0 -19.5639,8.39604 -22.31073,19.7943 -4.6884,-1.81117 -10.09942,-2.93251 -15.92242,-2.93251 -17.46892,0 -31.65122,9.35352 -31.65122,20.86955 0,10.39528 11.61748,18.9466 26.71485,20.52749 -0.67665,1.12204 -1.20995,2.24338 -1.20995,3.42121 0,11.02604 30.92124,19.98985 69.01327,19.98985 38.09195,0 69.0132,-8.96381 69.0132,-19.98985 0,-0.74183 -0.5017,-1.42952 -0.7743,-2.15046 1.6684,0.40556 3.3496,0.83088 5.1784,0.83088 10.1902,0 18.439,-6.7716 18.439,-15.10234 0,-8.33078 -8.2488,-15.05348 -18.439,-15.05348 -1.2488,0 -2.3535,0.39297 -3.5329,0.58647 1.0312,-3.33102 1.7422,-6.7466 1.7422,-10.36143 0,-22.05212 -20.4533,-39.97961 -45.68617,-39.97961 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#6798e9;fill-opacity:1;fill-rule:nonzero;stroke:#6798e9;stroke-width:15.64964962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:nodetypes="cccc"
+       id="path11965"
+       d="m 717.80594,482.73655 c -32.27924,28.4432 5.62151,52.69793 20.03284,13.63938 l 11.08203,-36.22961 -31.11487,22.59023 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#6798e9;fill-opacity:1;fill-rule:nonzero;stroke:#6798e9;stroke-width:15.64964962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.20000005;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:nodetypes="cccc"
+       id="path11967"
+       d="m 799.47,485.76116 c -32.27925,28.4432 5.62151,52.69792 20.03284,13.63937 l 11.08202,-36.2296 -31.11486,22.59023 z" />
+    <text
+       xml:space="preserve"
+       style="font-size:32px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="68.985565"
+       y="92.712631"
+       id="text2992"
+       sodipodi:linespacing="125%"
+       transform="translate(321.13452,104.68346)"><tspan
+         sodipodi:role="line"
+         id="tspan2994"
+         x="68.985565"
+         y="92.712631" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:10px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="-202.1156"
+       y="155.64684"
+       id="text2996"
+       sodipodi:linespacing="125%"
+       transform="translate(321.13452,104.68346)"><tspan
+         sodipodi:role="line"
+         id="tspan2998"
+         x="-202.1156"
+         y="155.64684" /></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="342.91943"
+       y="155.03653"
+       id="text3000"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3002"
+         x="342.91943"
+         y="155.03653"
+         style="font-size:32px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium">Wheather App</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff0000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="460.31592"
+       y="358.3624"
+       id="text3004"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3006"
+         x="460.31592"
+         y="358.3624"
+         style="font-size:48px;fill:#ff0000;-inkscape-font-specification:Ubuntu;font-family:Ubuntu;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">22C</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="460.19751"
+       y="412.14325"
+       id="text3004-0"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3006-4"
+         x="460.19751"
+         y="412.14325"
+         style="font-size:48px;fill:#0000ff;-inkscape-font-specification:Ubuntu Medium;font-family:Ubuntu;font-weight:500;font-style:normal;font-stretch:normal;font-variant:normal">14C</tspan></text>
+  </g>
+</svg>

=== added file 'qml/DeviceConfiguration.qml'
--- qml/DeviceConfiguration.qml	1970-01-01 00:00:00 +0000
+++ qml/DeviceConfiguration.qml	2015-04-16 12:11:39 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+StateGroup {
+    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 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: "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"
+            }
+        }
+    ]
+
+}

=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2015-03-18 10:17:28 +0000
+++ qml/Greeter/Greeter.qml	2015-04-16 12:11:39 +0000
@@ -52,6 +52,8 @@
     property int failedLoginsDelayAttempts: 7 // number of failed logins
     property real failedLoginsDelayMinutes: 5 // minutes of forced waiting
 
+    readonly property bool animating: loader.item ? loader.item.animating : false
+
     signal tease()
     signal sessionStarted()
     signal emergencyCall()

=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2015-02-23 15:43:41 +0000
+++ qml/Greeter/NarrowView.qml	2015-04-16 12:11:39 +0000
@@ -33,6 +33,7 @@
     property alias infographicModel: coverPage.infographicModel
     readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
     readonly property bool required: coverPage.required || lockscreen.required
+    readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
 
     signal selected(int index) // unused
     signal responded(string response)

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2015-02-23 15:43:41 +0000
+++ qml/Greeter/WideView.qml	2015-04-16 12:11:39 +0000
@@ -32,6 +32,7 @@
     property alias infographicModel: coverPage.infographicModel
     readonly property bool fullyShown: coverPage.showProgress === 1
     readonly property bool required: coverPage.required
+    readonly property bool animating: coverPage.showAnimation.running || coverPage.hideAnimation.running
 
     // so that it can be replaced in tests with a mock object
     property var inputMethod: Qt.inputMethod

=== added file 'qml/OrientedShell.qml'
--- qml/OrientedShell.qml	1970-01-01 00:00:00 +0000
+++ qml/OrientedShell.qml	2015-04-16 12:11:39 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Window 2.0
+import Unity.Session 0.1
+import GSettings 1.0
+import "Components"
+import "Rotation"
+
+Rectangle {
+    id: root
+    color: "black"
+
+    // 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 var usageModeSettings: GSettings { schema.id: "com.canonical.Unity8" }
+    property int physicalOrientation: Screen.orientation
+    property bool orientationLocked: OrientationLock.enabled
+    property var orientationLock: OrientationLock
+
+    property int orientation
+    onPhysicalOrientationChanged: {
+        if (!orientationLocked) {
+            orientation = physicalOrientation;
+        }
+    }
+    onOrientationLockedChanged: {
+        if (orientationLocked) {
+            orientationLock.savedOrientation = physicalOrientation;
+        } else {
+            orientation = physicalOrientation;
+        }
+    }
+    Component.onCompleted: {
+        if (orientationLocked) {
+            orientation = orientationLock.savedOrientation;
+        }
+    }
+
+    readonly property int supportedOrientations: shell.supportedOrientations
+                                               & deviceConfiguration.supportedOrientations
+    property int acceptedOrientationAngle: {
+        if (orientation & supportedOrientations) {
+            return Screen.angleBetween(nativeOrientation, orientation);
+        } else if (shell.orientation & supportedOrientations) {
+            // stay where we are
+            return shell.orientationAngle;
+        } else if (angleToOrientation(shell.mainAppWindowOrientationAngle) & supportedOrientations) {
+            return shell.mainAppWindowOrientationAngle;
+        } else {
+            // 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);
+            } else if (supportedOrientations & Qt.LandcscapeOrientation) {
+                return Screen.angleBetween(nativeOrientation, Qt.LandscapeOrientation);
+            } else if (supportedOrientations & Qt.InvertedPortraitOrientation) {
+                return Screen.angleBetween(nativeOrientation, Qt.InvertedPortraitOrientation);
+            } else if (supportedOrientations & Qt.InvertedLandscapeOrientation) {
+                return Screen.angleBetween(nativeOrientation, Qt.InvertedLandscapeOrientation);
+            } else {
+                // if all fails, fallback to primary orientation
+                return Screen.angleBetween(nativeOrientation, primaryOrientation);
+            }
+        }
+    }
+
+    function angleToOrientation(angle) {
+        switch (angle) {
+        case 0:
+            return nativeOrientation;
+            break;
+        case 90:
+            return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
+                                                                : Qt.PortraitOrientation;
+            break;
+        case 180:
+            return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
+                                                                : Qt.InvertedLandscapeOrientation;
+            break;
+        case 270:
+            return nativeOrientation === Qt.PortraitOrientation ? Qt.LandscapeOrientation
+                                                                : Qt.InvertedPortraitOrientation;
+            break;
+        default:
+            console.warn("angleToOrientation: Invalid orientation angle: " + angle);
+            return primaryOrientation;
+        }
+    }
+
+    RotationStates {
+        id: rotationStates
+        objectName: "rotationStates"
+        orientedShell: root
+        shell: shell
+        shellCover: shellCover
+        windowScreenshot: windowScreenshot
+    }
+
+    Shell {
+        id: shell
+        objectName: "shell"
+        width: root.width
+        height: root.height
+        orientation: root.angleToOrientation(orientationAngle)
+        primaryOrientation: root.primaryOrientation
+        nativeOrientation: root.nativeOrientation
+        nativeWidth: root.width
+        nativeHeight: root.height
+
+        // TODO: Factor in the connected input devices (eg: physical keyboard, mouse, touchscreen),
+        //       what's the output device (eg: big TV, desktop monitor, phone display), etc.
+        usageScenario: {
+            if (root.usageModeSettings.usageMode === "Windowed") {
+                return "desktop";
+            } else if (root.usageModeSettings.usageMode === "Staged"
+                    && deviceConfiguration.category === "desktop") {
+                return "tablet";
+            } else {
+                return deviceConfiguration.category;
+            }
+        }
+
+        property real transformRotationAngle
+        property real transformOriginX
+        property real transformOriginY
+
+        transform: Rotation {
+            origin.x: shell.transformOriginX; origin.y: shell.transformOriginY; axis { x: 0; y: 0; z: 1 }
+            angle: shell.transformRotationAngle
+        }
+    }
+
+    Rectangle {
+        id: shellCover
+        color: "black"
+        anchors.fill: parent
+        visible: false
+    }
+
+    WindowScreenshot {
+        id: windowScreenshot
+        visible: false
+        width: root.width
+        height: root.height
+
+        property real transformRotationAngle
+        property real transformOriginX
+        property real transformOriginY
+
+        transform: Rotation {
+            origin.x: windowScreenshot.transformOriginX; origin.y: windowScreenshot.transformOriginY;
+            axis { x: 0; y: 0; z: 1 }
+            angle: windowScreenshot.transformRotationAngle
+        }
+    }
+}

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-04-02 15:08:05 +0000
+++ qml/Panel/Panel.qml	2015-04-16 12:11:39 +0000
@@ -27,6 +27,9 @@
     property alias indicators: __indicators
     property alias callHint: __callHint
     property bool fullscreenMode: false
+    property real indicatorAreaShowProgress: 1.0
+
+    opacity: fullscreenMode && indicators.fullyClosed ? 0.0 : 1.0
 
     Rectangle {
         id: darkenedArea
@@ -58,6 +61,12 @@
             NumberAnimation { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
         }
 
+        transform: Translate {
+            y: indicators.state === "initial"
+                ? (1.0 - indicatorAreaShowProgress) * -d.indicatorHeight
+                : 0
+        }
+
         BorderImage {
             id: dropShadow
             anchors {

=== added directory 'qml/Rotation'
=== added file 'qml/Rotation/HalfLoopRotationAnimation.qml'
--- qml/Rotation/HalfLoopRotationAnimation.qml	1970-01-01 00:00:00 +0000
+++ qml/Rotation/HalfLoopRotationAnimation.qml	2015-04-16 12:11:39 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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.3
+
+SequentialAnimation {
+    id: root
+
+    // set from outside
+    property int fromAngle
+    property int toAngle
+    property var info
+    property var shell
+
+    readonly property bool flipShellDimensions: toAngle == 90 || toAngle == 270
+
+    ScriptAction { script: {
+        info.transitioning = true;
+        shell.orientationAngle = root.toAngle;
+        shell.x = (orientedShell.width - shell.width) / 2
+        shell.y = (orientedShell.height - shell.height) / 2;
+        shell.transformOriginX = shell.width / 2;
+        shell.transformOriginY = shell.height / 2;
+        shell.updateFocusedAppOrientation();
+    } }
+    NumberAnimation {
+        target: shell
+        property: "transformRotationAngle"
+        from: root.fromAngle; to: root.toAngle
+        duration: rotationDuration; easing.type: rotationEasing
+    }
+    ScriptAction { script: { info.transitioning = false; } }
+}

=== added file 'qml/Rotation/ImmediateRotationAction.qml'
--- qml/Rotation/ImmediateRotationAction.qml	1970-01-01 00:00:00 +0000
+++ qml/Rotation/ImmediateRotationAction.qml	2015-04-16 12:11:39 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+
+ScriptAction {
+    property var info
+    property var shell
+
+    script: {
+        info.transitioning = true;
+        shell.orientationAngle = info.requestedOrientationAngle;
+        shell.transformRotationAngle = info.requestedOrientationAngle;
+
+        // Making bindings as orientedShell's dimensions might wiggle during startup.
+        if (info.requestedOrientationAngle === 90 || info.requestedOrientationAngle === 270) {
+            shell.width = Qt.binding(function() { return orientedShell.height; });
+            shell.height = Qt.binding(function() { return orientedShell.width; });
+        } else {
+            shell.width = Qt.binding(function() { return orientedShell.width; });
+            shell.height = Qt.binding(function() { return orientedShell.height; });
+        }
+
+        shell.x = Qt.binding(function() { return (orientedShell.width - shell.width) / 2; });
+        shell.y = Qt.binding(function() { return (orientedShell.height - shell.height) / 2; });
+        shell.transformOriginX = Qt.binding(function() { return shell.width / 2; });
+        shell.transformOriginY = Qt.binding(function() { return shell.height / 2; });
+
+        shell.updateFocusedAppOrientation();
+        info.transitioning = false;
+    }
+}

=== added file 'qml/Rotation/NinetyRotationAnimation.qml'
--- qml/Rotation/NinetyRotationAnimation.qml	1970-01-01 00:00:00 +0000
+++ qml/Rotation/NinetyRotationAnimation.qml	2015-04-16 12:11:39 +0000
@@ -0,0 +1,90 @@
+/*
+ * 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.3
+
+SequentialAnimation {
+    id: root
+
+    property int fromAngle
+    property int toAngle
+    property var info
+    property var shell
+
+    readonly property real fromY: fromAngle === 0 || fromAngle === 90 ? 0 : orientedShell.height - orientedShell.width;
+    readonly property real toY: toAngle === 0 || toAngle === 90 ? 0 : orientedShell.height - orientedShell.width;
+    readonly property bool flipShellDimensions: toAngle == 90 || toAngle == 270
+
+    ScriptAction { script: {
+        info.transitioning = true;
+        windowScreenshot.take();
+        windowScreenshot.visible = true;
+        shell.orientationAngle = root.toAngle;
+        shell.x = 0;
+        shell.width = flipShellDimensions ? orientedShell.height : orientedShell.width;
+        shell.height = flipShellDimensions ? orientedShell.width : orientedShell.height;
+        shell.transformOriginX = orientedShell.width / 2;
+        shell.transformOriginY = orientedShell.width / 2;
+        shell.updateFocusedAppOrientation();
+        shellCover.visible = true;
+
+        windowScreenshot.transformOriginX = orientedShell.width / 2;
+        if (fromAngle == 180 || fromAngle == 270) {
+            windowScreenshot.transformOriginY = orientedShell.height - (orientedShell.width / 2);
+        } else {
+            windowScreenshot.transformOriginY = orientedShell.width / 2;
+        }
+    } }
+    ParallelAnimation {
+        NumberAnimation {
+            target: shellCover; property: "opacity"; from: 1; to: 0;
+            duration: rotationDuration; easing.type: rotationEasing
+        }
+        RotationAnimation {
+            target: shell; property: "transformRotationAngle";
+            from: root.fromAngle; to: root.toAngle
+            direction: RotationAnimation.Shortest
+            duration: rotationDuration; easing.type: rotationEasing
+        }
+        NumberAnimation {
+            target: shell; property: "y"
+            from: root.fromY; to: root.toY
+            duration: rotationDuration; easing.type: rotationEasing
+        }
+
+        NumberAnimation {
+            target: windowScreenshot; property: "opacity"; from: 1; to: 0;
+            duration: rotationDuration; easing.type: rotationEasing
+        }
+        RotationAnimation {
+            target: windowScreenshot; property: "transformRotationAngle";
+            from: 0; to: root.toAngle - root.fromAngle
+            direction: RotationAnimation.Shortest
+            duration: rotationDuration; easing.type: rotationEasing
+        }
+        NumberAnimation {
+            target: windowScreenshot; property: "y"
+            from: 0; to: root.toY - root.fromY
+            duration: rotationDuration; easing.type: rotationEasing
+        }
+    }
+    ScriptAction { script: {
+        windowScreenshot.visible = false;
+        windowScreenshot.discard();
+        shellCover.visible = false;
+        info.transitioning = false;
+    } }
+}

=== added file 'qml/Rotation/RotationStates.qml'
--- qml/Rotation/RotationStates.qml	1970-01-01 00:00:00 +0000
+++ qml/Rotation/RotationStates.qml	2015-04-16 12:11:39 +0000
@@ -0,0 +1,271 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+// Why the state machine is done that way:
+// We cannot use regular PropertyChanges{} inside the State elements as steps in the
+// transition animations must take place in a well defined order.
+// Which means that we also cannot jump to a new state in the middle of a transition
+// as that would make hell brake loose.
+StateGroup {
+    id: root
+
+    // to be set from the outside
+    property Item orientedShell
+    property Item shell
+    property Item shellCover
+    property Item windowScreenshot
+
+    property int rotationDuration: 450
+    property int rotationEasing: Easing.InOutCubic
+    // Those values are good for debugging/development
+    //property int rotationDuration: 3000
+    //property int rotationEasing: Easing.Linear
+
+    state: "0"
+    states: [
+        State { name: "0" },
+        State { name: "90" },
+        State { name: "180" },
+        State { name: "270" }
+    ]
+
+    property QtObject d: QtObject {
+        id: d
+
+        property bool startingUp: true
+        property var finishStartUpTimer: Timer {
+            interval: 500
+            onTriggered: d.startingUp = false
+        }
+        Component.onCompleted: {
+            finishStartUpTimer.start();
+        }
+
+        property bool transitioning: false
+        onTransitioningChanged: {
+            d.tryUpdateState();
+        }
+
+        readonly property int requestedOrientationAngle: root.orientedShell.acceptedOrientationAngle
+
+        // Avoiding a direct call to tryUpdateState() as the state change might trigger an immediate
+        // change to Shell.orientationAngle which, in its turn, causes a reevaluation of
+        // requestedOrientationAngle (ie., OrientedShell.acceptedOrientationAngle). A reentrant evaluation
+        // of a binding is detected by QML as a binding loop and QML will deny the reevalutation, which
+        // will leave us in a bogus state.
+        //
+        // To avoid this mess we update the state in the next event loop iteration, ensuring a clean
+        // call stack.
+        onRequestedOrientationAngleChanged: {
+            stateUpdateTimer.start();
+        }
+        property Timer stateUpdateTimer: Timer {
+            id: stateUpdateTimer
+            interval: 1
+            onTriggered: { d.tryUpdateState(); }
+        }
+
+        function tryUpdateState() {
+            if (d.transitioning || (!d.startingUp && !root.shell.orientationChangesEnabled)) {
+                return;
+            }
+
+            var requestedState = d.requestedOrientationAngle.toString();
+            if (requestedState !== root.state) {
+                d.resolveAnimationType();
+                root.state = requestedState;
+            }
+        }
+
+        property Connections shellConnections: Connections {
+            target: root.shell
+            onOrientationChangesEnabledChanged: {
+                d.tryUpdateState();
+            }
+        }
+
+        property var shellBeingResized: Binding {
+            target: root.shell
+            property: "beingResized"
+            value: d.transitioning
+        }
+
+        readonly property int fullAnimation: 0
+        readonly property int indicatorsBarAnimation: 1
+        readonly property int noAnimation: 2
+
+        property int animationType
+
+        // animationType update *must* take place *before* the state update.
+        // If animationType and state were updated through bindings, as with normal qml code,
+        // there would be no guarantee in the order of the binding updates, which could then
+        // cause the wrong transitions to be chosen for the state changes.
+        function resolveAnimationType() {
+            if (d.startingUp) {
+                // During start up, inital property values are still settling while we're still
+                // to render the very first frame
+                d.animationType = d.noAnimation;
+            } else {
+                if (!root.shell.mainApp) {
+                    // shouldn't happen but, anyway
+                    d.animationType = d.fullAnimation;
+                    return;
+                }
+
+                if (root.shell.mainApp.rotatesWindowContents) {
+                    // The application will animate its own GUI, so we don't have to do anything ourselves.
+                    d.animationType = d.noAnimation;
+                } else if (root.shell.mainAppWindowOrientationAngle == d.requestedOrientationAngle) {
+                    // The app window is already on its final orientation angle.
+                    // So we just animate the indicators bar
+                    // TODO: what if the app is fullscreen?
+                    d.animationType = d.indicatorsBarAnimation;
+                } else {
+                    d.animationType = d.fullAnimation;
+                }
+            }
+        }
+
+        // When an application switch takes place, d.requestedOrientationAngle and
+        // root.shell.mainAppWindowOrientationAngle get updated separately, at different moments.
+        // So, when one of those properties change, we shouldn't make a decision straight away
+        // as the other might be stale and about to be changed. So let's give it a bit of time for
+        // them to get properly updated.
+        // This approach is indeed a bit hacky.
+        property bool appWindowOrientationAngleNeedsUpdateUnstable:
+            root.shell.orientationAngle === d.requestedOrientationAngle
+            && root.shell.mainApp
+            && root.shell.mainAppWindowOrientationAngle !== root.shell.orientationAngle
+            && !d.transitioning
+        onAppWindowOrientationAngleNeedsUpdateUnstableChanged: {
+            stableTimer.restart();
+        }
+        property Timer stableTimer: Timer {
+            interval: 200
+            onTriggered: {
+                if (d.appWindowOrientationAngleNeedsUpdateUnstable) {
+                    shell.updateFocusedAppOrientationAnimated();
+                }
+            }
+        }
+    }
+
+    transitions: [
+        Transition {
+            from: "90"; to: "0"
+            enabled: d.animationType == d.fullAnimation
+            NinetyRotationAnimation { fromAngle: 90; toAngle: 0
+                                      info: d; shell: root.shell }
+        },
+        Transition {
+            from: "0"; to: "90"
+            enabled: d.animationType == d.fullAnimation
+            NinetyRotationAnimation { fromAngle: 0; toAngle: 90
+                                      info: d; shell: root.shell }
+        },
+        Transition {
+            from: "0"; to: "270"
+            enabled: d.animationType == d.fullAnimation
+            NinetyRotationAnimation { fromAngle: 0; toAngle: 270
+                                      info: d; shell: root.shell }
+        },
+        Transition {
+            from: "270"; to: "0"
+            enabled: d.animationType == d.fullAnimation
+            NinetyRotationAnimation { fromAngle: 270; toAngle: 0
+                                      info: d; shell: root.shell }
+        },
+        Transition {
+            from: "90"; to: "180"
+            enabled: d.animationType == d.fullAnimation
+            NinetyRotationAnimation { fromAngle: 90; toAngle: 180
+                                      info: d; shell: root.shell }
+        },
+        Transition {
+            from: "180"; to: "90"
+            enabled: d.animationType == d.fullAnimation
+            NinetyRotationAnimation { fromAngle: 180; toAngle: 90
+                                      info: d; shell: root.shell }
+        },
+        Transition {
+            from: "180"; to: "270"
+            enabled: d.animationType == d.fullAnimation
+            NinetyRotationAnimation { fromAngle: 180; toAngle: 270
+                                      info: d; shell: root.shell }
+        },
+        Transition {
+            from: "270"; to: "180"
+            enabled: d.animationType == d.fullAnimation
+            NinetyRotationAnimation { fromAngle: 270; toAngle: 180
+                                      info: d; shell: root.shell }
+        },
+        Transition {
+            from: "0"; to: "180"
+            enabled: d.animationType == d.fullAnimation
+            HalfLoopRotationAnimation { fromAngle: 0; toAngle: 180
+                                        info: d; shell: root.shell }
+        },
+        Transition {
+            from: "180"; to: "0"
+            enabled: d.animationType == d.fullAnimation
+            HalfLoopRotationAnimation { fromAngle: 180; toAngle: 0
+                                        info: d; shell: root.shell }
+        },
+        Transition {
+            from: "90"; to: "270"
+            enabled: d.animationType == d.fullAnimation
+            HalfLoopRotationAnimation { fromAngle: 90; toAngle: 270
+                                        info: d; shell: root.shell }
+        },
+        Transition {
+            from: "270"; to: "90"
+            enabled: d.animationType == d.fullAnimation
+            HalfLoopRotationAnimation { fromAngle: 270; toAngle: 90
+                                        info: d; shell: root.shell }
+        },
+        Transition {
+            objectName: "immediateTransition"
+            enabled: d.animationType == d.noAnimation
+            ImmediateRotationAction { info: d; shell: root.shell }
+        },
+        Transition {
+            enabled: d.animationType == d.indicatorsBarAnimation
+            SequentialAnimation {
+                ScriptAction { script: {
+                    d.transitioning = true;
+                } }
+                NumberAnimation {
+                    duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing
+                    target: root.shell; property: "indicatorAreaShowProgress"
+                    from: 1.0; to: 0.0
+                }
+                ImmediateRotationAction { info: d; shell: root.shell }
+                NumberAnimation {
+                    duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing
+                    target: root.shell; property: "indicatorAreaShowProgress"
+                    from: 0.0; to: 1.0
+                }
+                ScriptAction { script: {
+                    d.transitioning = false;
+                }}
+            }
+        }
+    ]
+
+}

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-04-09 14:01:00 +0000
+++ qml/Shell.qml	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,40 +45,68 @@
 Item {
     id: shell
 
+    // to be set from outside
+    property int orientationAngle: 0
+    property int orientation
+    property int primaryOrientation
+    property int nativeOrientation
+    property real nativeWidth
+    property real nativeHeight
+    property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress
+    property bool beingResized
+    property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop"
+    function updateFocusedAppOrientation() {
+        applicationsDisplayLoader.item.updateFocusedAppOrientation();
+    }
+    function updateFocusedAppOrientationAnimated() {
+        applicationsDisplayLoader.item.updateFocusedAppOrientationAnimated();
+    }
+
+    // to be read from outside
+    readonly property int mainAppWindowOrientationAngle:
+            applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainAppWindowOrientationAngle : 0
+
+    readonly property bool orientationChangesEnabled: panel.indicators.fullyClosed
+            && (applicationsDisplayLoader.item && applicationsDisplayLoader.item.orientationChangesEnabled)
+            && !greeter.animating
+
+    property bool startingUp: true
+    Timer { id: finishStartUpTimer; interval: 500; onTriggered: startingUp = false }
+
+    property int supportedOrientations: {
+        if (startingUp) {
+            // Ensure we don't rotate during start up
+            return Qt.PrimaryOrientation;
+        } else if (greeter.shown) {
+            return Qt.PrimaryOrientation;
+        } else if (mainApp) {
+            return mainApp.supportedOrientations;
+        } else {
+            // we just don't care
+            return Qt.PortraitOrientation
+                 | Qt.LandscapeOrientation
+                 | Qt.InvertedPortraitOrientation
+                 | Qt.InvertedLandscapeOrientation;
+        }
+    }
+
+    // For autopilot consumption
+    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
+
+    // internal props from here onwards
+    readonly property var mainApp:
+            applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainApp : null
+
     // Disable everything while greeter is waiting, so that the user can't swipe
     // the greeter or launcher until we know whether the session is locked.
     enabled: !greeter.waiting
 
-    // this is only here to select the width / height of the window if not running fullscreen
-    property bool tablet: false
-    width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
-    height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
-
     property real edgeSize: units.gu(2)
     property url defaultBackground: Qt.resolvedUrl(shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg")
     property url background: asImageTester.status == Image.Ready ? asImageTester.source
                              : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
     readonly property real panelHeight: panel.panelHeight
 
-    property bool sideStageEnabled: shell.width >= units.gu(100)
-    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
-
-    property int orientation
-    readonly property int deviceOrientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
-    onDeviceOrientationAngleChanged: {
-        if (!OrientationLock.enabled) {
-            orientation = Screen.orientation;
-        }
-    }
-    readonly property bool orientationLockEnabled: OrientationLock.enabled
-    onOrientationLockEnabledChanged: {
-        if (orientationLockEnabled) {
-            OrientationLock.savedOrientation = Screen.orientation;
-        } else {
-            orientation = Screen.orientation;
-        }
-    }
-
     // This is _only_ used to expose the property to autopilot tests
     readonly property string testShellMode: shellMode
 
@@ -86,7 +114,8 @@
         if (ApplicationManager.findApplication(appId)) {
             ApplicationManager.requestFocusApplication(appId);
         } else {
-            var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
+            var execFlags = shell.usageScenario === "phone" ? ApplicationManager.ForceMainStage
+                                                            : ApplicationManager.NoFlag;
             ApplicationManager.startApplication(appId, execFlags);
         }
     }
@@ -124,11 +153,6 @@
         sourceSize.width: 0
     }
 
-    GSettings {
-        id: usageModeSettings
-        schema.id: "com.canonical.Unity8"
-    }
-
     Binding {
         target: LauncherModel
         property: "applicationManager"
@@ -140,9 +164,7 @@
         if (ApplicationManager.count > 0) {
             ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
         }
-        if (orientationLockEnabled) {
-            orientation = OrientationLock.savedOrientation;
-        }
+        finishStartUpTimer.start();
     }
 
     VolumeControl {
@@ -231,9 +253,19 @@
             // theoretical attack where user enters lockedApp mode, then makes
             // the screen larger (maybe connects to monitor) and tries to enter
             // tablet mode.
-            property bool tabletMode: shell.sideStageEnabled && !greeter.hasLockedApp
-            source: usageModeSettings.usageMode === "Windowed" ? "Stages/DesktopStage.qml"
-                        : tabletMode ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
+
+            property string usageScenario: shell.usageScenario === "phone" || greeter.hasLockedApp
+                                           ? "phone"
+                                           : shell.usageScenario
+            source: {
+                if (applicationsDisplayLoader.usageScenario === "phone") {
+                    return "Stages/PhoneStage.qml";
+                } else if (applicationsDisplayLoader.usageScenario === "tablet") {
+                    return "Stages/TabletStage.qml";
+                } else {
+                    return "Stages/DesktopStage.qml";
+                }
+            }
 
             property bool interactive: tutorial.spreadEnabled
                     && !greeter.shown
@@ -276,7 +308,12 @@
             }
             Binding {
                 target: applicationsDisplayLoader.item
-                property: "orientation"
+                property: "shellOrientationAngle"
+                value: shell.orientationAngle
+            }
+            Binding {
+                target: applicationsDisplayLoader.item
+                property: "shellOrientation"
                 value: shell.orientation
             }
             Binding {
@@ -284,6 +321,31 @@
                 property: "background"
                 value: shell.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
+            }
+            Binding {
+                target: applicationsDisplayLoader.item
+                property: "nativeHeight"
+                value: shell.nativeHeight
+            }
+            Binding {
+                target: applicationsDisplayLoader.item
+                property: "beingResized"
+                value: shell.beingResized
+            }
         }
 
         Tutorial {
@@ -353,7 +415,7 @@
         objectName: "greeter"
 
         hides: [launcher, panel.indicators]
-        tabletMode: shell.sideStageEnabled
+        tabletMode: shell.usageScenario !== "phone"
         launcherOffset: launcher.progress
         forcedUnlock: tutorial.running
         background: shell.background
@@ -480,20 +542,18 @@
                 expandedPanelHeight: units.gu(7)
 
                 indicatorsModel: Indicators.IndicatorsModel {
-                    // TODO: This should be sourced by device type (e.g. "desktop", "tablet", "phone"...)
-                    profile: indicatorProfile
-                    Component.onCompleted: load()
+                    // tablet and phone both use the same profile
+                    profile: shell.usageScenario === "desktop" ? "desktop" : "phone"
+                    Component.onCompleted: load();
                 }
             }
+
             callHint {
                 greeterShown: greeter.shown
             }
 
-            property bool topmostApplicationIsFullscreen:
-                ApplicationManager.focusedApplicationId &&
-                    ApplicationManager.findApplication(ApplicationManager.focusedApplicationId).fullscreen
-
-            fullscreenMode: (topmostApplicationIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
+            property bool mainAppIsFullscreen: shell.mainApp && shell.mainApp.fullscreen
+            fullscreenMode: (mainAppIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
                             || greeter.hasLockedApp
         }
 
@@ -511,7 +571,7 @@
             available: tutorial.launcherEnabled
                     && (!greeter.locked || AccountsService.enableLauncherWhileLocked)
                     && !greeter.hasLockedApp
-            inverted: usageModeSettings.usageMode === "Staged"
+            inverted: shell.usageScenario !== "desktop"
             shadeBackground: !tutorial.running
 
             onShowDashHome: showHome()
@@ -553,7 +613,7 @@
         Rectangle {
             id: modalNotificationBackground
 
-            visible: notifications.useModal && (notifications.state == "narrow")
+            visible: notifications.useModal
             color: "#000000"
             anchors.fill: parent
             opacity: 0.9
@@ -598,6 +658,7 @@
 
     Dialogs {
         id: dialogs
+        objectName: "dialogs"
         anchors.fill: parent
         z: overlay.z + 10
         onPowerOffClicked: {

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2015-02-26 22:35:53 +0000
+++ qml/Stages/ApplicationWindow.qml	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -24,10 +24,11 @@
     // to be read from outside
     readonly property bool fullscreen: application ? application.fullscreen : false
     property alias interactive: sessionContainer.interactive
+    property bool orientationChangesEnabled: d.supportsSurfaceResize ? d.surfaceOldEnoughToBeResized : true
 
     // to be set from outside
     property QtObject application
-    property int orientation
+    property int surfaceOrientationAngle
 
     QtObject {
         id: d
@@ -62,6 +63,15 @@
         // Remove this when possible
         property bool surfaceInitialized: false
 
+        property bool supportsSurfaceResize:
+                application &&
+                ((application.supportedOrientations & Qt.PortraitOrientation)
+                  || (application.supportedOrientations & Qt.InvertedPortraitOrientation))
+                &&
+                ((application.supportedOrientations & Qt.LandscapeOrientation)
+                 || (application.supportedOrientations & Qt.InvertedLandscapeOrientation))
+
+        property bool surfaceOldEnoughToBeResized: false
     }
 
     Timer {
@@ -70,6 +80,12 @@
         onTriggered: { if (sessionContainer.surface) {d.surfaceInitialized = true;} }
     }
 
+    Timer {
+        id: surfaceIsOldTimer
+        interval: 1000
+        onTriggered: { if (stateGroup.state === "surface") { d.surfaceOldEnoughToBeResized = true; } }
+    }
+
     Image {
         id: screenshotImage
         objectName: "screenshotImage"
@@ -113,7 +129,8 @@
         // A fake application might not even have a session property.
         session: application && application.session ? application.session : null
         anchors.fill: parent
-        orientation: root.orientation
+
+        surfaceOrientationAngle: application && application.rotatesWindowContents ? root.surfaceOrientationAngle : 0
 
         onSurfaceChanged: {
             if (sessionContainer.surface) {
@@ -179,15 +196,21 @@
                     UbuntuNumberAnimation { target: sessionContainer.surfaceContainer; property: "opacity";
                                             from: 0.0; to: 1.0
                                             duration: UbuntuAnimation.BriskDuration }
-                    PropertyAction { target: splashLoader; property: "active"; value: false }
+                    ScriptAction { script: {
+                        splashLoader.active = false;
+                        surfaceIsOldTimer.start();
+                    } }
                 }
             },
             Transition {
                 from: "surface"; to: "splashScreen"
                 SequentialAnimation {
-                    PropertyAction { target: splashLoader; property: "active"; value: true }
-                    PropertyAction { target: sessionContainer.surfaceContainer
-                                     property: "visible"; value: true }
+                    ScriptAction { script: {
+                        surfaceIsOldTimer.stop();
+                        d.surfaceOldEnoughToBeResized = false;
+                        splashLoader.active = true;
+                        sessionContainer.surfaceContainer.visible = true;
+                    } }
                     UbuntuNumberAnimation { target: splashLoader; property: "opacity";
                                             from: 0.0; to: 1.0
                                             duration: UbuntuAnimation.BriskDuration }
@@ -198,14 +221,18 @@
             Transition {
                 from: "surface"; to: "screenshot"
                 SequentialAnimation {
-                    PropertyAction { target: screenshotImage
-                                     property: "visible"; value: true }
+                    ScriptAction { script: {
+                        surfaceIsOldTimer.stop();
+                        d.surfaceOldEnoughToBeResized = false;
+                        screenshotImage.visible = true;
+                    } }
                     UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
                                             from: 0.0; to: 1.0
                                             duration: UbuntuAnimation.BriskDuration }
-                    PropertyAction { target: sessionContainer.surfaceContainer
-                                     property: "visible"; value: false }
-                    ScriptAction { script: { if (sessionContainer.session) { sessionContainer.session.release(); } } }
+                    ScriptAction { script: {
+                        sessionContainer.surfaceContainer.visible = false;
+                        if (sessionContainer.session) { sessionContainer.session.release(); }
+                    } }
                 }
             },
             Transition {
@@ -216,8 +243,11 @@
                     UbuntuNumberAnimation { target: screenshotImage; property: "opacity";
                                             from: 1.0; to: 0.0
                                             duration: UbuntuAnimation.BriskDuration }
-                    PropertyAction { target: screenshotImage; property: "visible"; value: false }
-                    PropertyAction { target: screenshotImage; property: "source"; value: "" }
+                    ScriptAction { script: {
+                        screenshotImage.visible = false;
+                        screenshotImage.source = "";
+                        surfaceIsOldTimer.start();
+                    } }
                 }
             },
             Transition {
@@ -233,10 +263,12 @@
             },
             Transition {
                 from: "surface"; to: "void"
-                SequentialAnimation {
-                    PropertyAction { target: sessionContainer.surfaceContainer; property: "visible"; value: false }
-                    ScriptAction { script: { if (sessionContainer.session) { sessionContainer.session.release(); } } }
-                }
+                ScriptAction { script: {
+                    surfaceIsOldTimer.stop();
+                    d.surfaceOldEnoughToBeResized = false;
+                    sessionContainer.surfaceContainer.visible = false;
+                    if (sessionContainer.session) { sessionContainer.session.release(); }
+                } }
             },
             Transition {
                 from: "void"; to: "surface"
@@ -246,6 +278,9 @@
                     UbuntuNumberAnimation { target: sessionContainer.surfaceContainer; property: "opacity";
                                             from: 0.0; to: 1.0
                                             duration: UbuntuAnimation.BriskDuration }
+                    ScriptAction { script: {
+                        surfaceIsOldTimer.start();
+                    } }
                 }
             }
         ]

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2015-03-13 19:18:35 +0000
+++ qml/Stages/DesktopStage.qml	2015-04-16 12:11:39 +0000
@@ -27,6 +27,29 @@
 
     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
+
+    // functions to be called from outside
+    function updateFocusedAppOrientation() { /* TODO */ }
+    function updateFocusedAppOrientationAnimated() { /* TODO */}
+
+    // To be read from outside
+    readonly property var mainApp: ApplicationManager.focusedApplicationId
+            ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
+            : null
+    property int mainAppWindowOrientationAngle: 0
+    readonly property bool orientationChangesEnabled: false
+
     property alias background: wallpaper.source
 
     property var windowStateStorage: WindowStateStorage

=== added file 'qml/Stages/OrientationChangeAnimation.qml'
--- qml/Stages/OrientationChangeAnimation.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/OrientationChangeAnimation.qml	2015-04-16 12:11:39 +0000
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+
+QtObject {
+    id: root
+
+    // to be set from outside
+    property Item spreadDelegate
+    property Item background
+    property Item window
+    property Image screenshot
+
+    function start() {
+        if (window.orientationAngle === 0) {
+            if (spreadDelegate.shellOrientationAngle === 90) {
+                chosenAnimation = simple90Animation;
+            } else if (spreadDelegate.shellOrientationAngle === 180) {
+                chosenAnimation = halfLoopAnimation;
+            } else if (spreadDelegate.shellOrientationAngle === 270) {
+                chosenAnimation = moving90Animation;
+            } else {
+                chosenAnimation = null;
+            }
+        } else if (window.orientationAngle === 90) {
+            if (spreadDelegate.shellOrientationAngle === 0) {
+                chosenAnimation = simple90Animation;
+            } else if (spreadDelegate.shellOrientationAngle === 180) {
+                chosenAnimation = moving90Animation;
+            } else if (spreadDelegate.shellOrientationAngle === 270) {
+                chosenAnimation = halfLoopAnimation;
+            } else {
+                chosenAnimation = null;
+            }
+        } else if (window.orientationAngle === 180) {
+            if (spreadDelegate.shellOrientationAngle === 0) {
+                chosenAnimation = halfLoopAnimation;
+            } else if (spreadDelegate.shellOrientationAngle === 90) {
+                chosenAnimation = moving90Animation;
+            } else if (spreadDelegate.shellOrientationAngle === 270) {
+                chosenAnimation = simple90Animation;
+            } else {
+                chosenAnimation = null;
+            }
+        } else if (window.orientationAngle === 270) {
+            if (spreadDelegate.shellOrientationAngle === 0) {
+                chosenAnimation = moving90Animation;
+            } else if (spreadDelegate.shellOrientationAngle === 90) {
+                chosenAnimation = halfLoopAnimation;
+            } else if (spreadDelegate.shellOrientationAngle === 180) {
+                chosenAnimation = simple90Animation;
+            } else {
+                chosenAnimation = null;
+            }
+        }
+
+        if (chosenAnimation)
+            chosenAnimation.start();
+    }
+
+    // to be read from outside
+    property bool running: chosenAnimation ? chosenAnimation.running : false
+
+    property int duration: 450
+    property int easingType: Easing.InOutCubic
+    // Those values are good for debugging/development
+    //property int duration: 6000
+    //property int easingType: Easing.Linear
+
+    property int shortestDimension: spreadDelegate.width < spreadDelegate.height
+                                    ? spreadDelegate.width : spreadDelegate.height
+    property int longestDimension: spreadDelegate.width > spreadDelegate.height
+                                   ? spreadDelegate.width : spreadDelegate.height
+    property string longestAxis: spreadDelegate.width > spreadDelegate.height ? "x" : "y"
+
+    property QtObject chosenAnimation
+
+    function setup90Animation() {
+        background.visible = true;
+
+        screenshot.width = window.width
+        screenshot.height = window.height
+        screenshot.take();
+        screenshot.transformOriginX = root.shortestDimension / 2
+        screenshot.transformOriginY = root.shortestDimension / 2
+        screenshot.visible = true;
+
+        window.rotation = 0;
+        window.width = spreadDelegate.width;
+        window.height = spreadDelegate.height;
+        window.transformOriginX = root.shortestDimension / 2
+        window.transformOriginY = root.shortestDimension / 2
+    }
+
+    function tearDown90Animation() {
+        window.orientationAngle = spreadDelegate.shellOrientationAngle;
+        screenshot.source = "";
+        screenshot.visible = false;
+        background.visible = false;
+    }
+
+    property QtObject simple90Animation: SequentialAnimation {
+        id: simple90Animation
+
+        ScriptAction { script: setup90Animation() }
+        ParallelAnimation {
+            RotationAnimation {
+                target: root.window
+                duration: root.duration
+                easing.type: root.easingType
+                from: window.orientationAngle - spreadDelegate.shellOrientationAngle
+                to: 0
+                property: "transformRotationAngle"
+            }
+            RotationAnimation {
+                target: root.screenshot
+                duration: root.duration
+                easing.type: root.easingType
+                from: window.orientationAngle - spreadDelegate.shellOrientationAngle
+                to: 0
+                property: "transformRotationAngle"
+            }
+            NumberAnimation {
+                target: root.screenshot
+                duration: root.duration
+                easing.type: root.easingType
+                property: "opacity"
+                from: 1.0
+                to: 0.0
+            }
+            NumberAnimation {
+                target: root.window
+                duration: root.duration
+                easing.type: root.easingType
+                property: "opacity"
+                from: 0.0
+                to: 1.0
+            }
+        }
+        ScriptAction { script: tearDown90Animation() }
+    }
+
+    property QtObject moving90Animation: SequentialAnimation {
+        id: moving90Animation
+
+        ScriptAction { script: setup90Animation() }
+        ParallelAnimation {
+            RotationAnimation {
+                target: root.window
+                duration: root.duration
+                easing.type: root.easingType
+                direction: RotationAnimation.Shortest
+                from: window.orientationAngle - spreadDelegate.shellOrientationAngle
+                to: 0
+                property: "transformRotationAngle"
+            }
+            RotationAnimation {
+                target: root.screenshot
+                duration: root.duration
+                easing.type: root.easingType
+                direction: RotationAnimation.Shortest
+                from: window.orientationAngle - spreadDelegate.shellOrientationAngle
+                to: 0
+                property: "transformRotationAngle"
+            }
+            NumberAnimation {
+                target: root.screenshot
+                duration: root.duration
+                easing.type: root.easingType
+                property: "opacity"
+                from: 1.0
+                to: 0.0
+            }
+            NumberAnimation {
+                target: root.window
+                duration: root.duration
+                easing.type: root.easingType
+                property: "opacity"
+                from: 0.0
+                to: 1.0
+            }
+            NumberAnimation {
+                target: root.window
+                duration: root.duration
+                easing.type: root.easingType
+                property: root.longestAxis
+                from: root.longestDimension - root.shortestDimension
+                to: 0
+            }
+            NumberAnimation {
+                target: root.screenshot
+                duration: root.duration
+                easing.type: root.easingType
+                property: root.longestAxis
+                from: root.longestDimension - root.shortestDimension
+                to: 0
+            }
+        }
+        ScriptAction { script: tearDown90Animation() }
+    }
+
+    property QtObject halfLoopAnimation: SequentialAnimation {
+        id: halfLoopAnimation
+
+        ScriptAction { script: {
+            background.visible = true;
+
+            window.rotation = 0;
+            window.width = spreadDelegate.width;
+            window.height = spreadDelegate.height;
+            window.transformOriginX = window.width / 2
+            window.transformOriginY = window.height / 2
+        } }
+        ParallelAnimation {
+            RotationAnimation {
+                target: root.window
+                duration: root.duration
+                easing.type: root.easingType
+                from: window.orientationAngle - spreadDelegate.shellOrientationAngle
+                to: 0
+                property: "transformRotationAngle"
+            }
+        }
+        ScriptAction { script: {
+            window.orientationAngle = spreadDelegate.shellOrientationAngle;
+            background.visible = false;
+        } }
+    }
+}

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-02-18 18:29:03 +0000
+++ qml/Stages/PhoneStage.qml	2015-04-16 12:11:39 +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
@@ -31,12 +31,64 @@
     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 int orientation: Qt.PortraitOrientation
     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 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!
+            spreadView.selectedIndex = -1;
+            spreadView.phase = 0;
+            spreadView.contentX = -spreadView.shift;
+        }
+    }
+    function updateFocusedAppOrientation() {
+        if (spreadRepeater.count > 0) {
+            spreadRepeater.itemAt(0).matchShellOrientation();
+        }
+
+        for (var i = 1; i < spreadRepeater.count; ++i) {
+
+            var spreadDelegate = spreadRepeater.itemAt(i);
+
+            var delta = spreadDelegate.appWindowOrientationAngle - root.shellOrientationAngle;
+            if (delta < 0) { delta += 360; }
+            delta = delta % 360;
+
+            var supportedOrientations = spreadDelegate.application.supportedOrientations;
+            if (supportedOrientations === Qt.PrimaryOrientation) {
+                supportedOrientations = spreadDelegate.shellPrimaryOrientation;
+            }
+
+            if (delta === 180 && (supportedOrientations & spreadDelegate.shellOrientation)) {
+                spreadDelegate.matchShellOrientation();
+            }
+        }
+    }
+    function updateFocusedAppOrientationAnimated() {
+        if (spreadRepeater.count > 0) {
+            spreadRepeater.itemAt(0).animateToShellOrientation();
+        }
+    }
+
+    // To be read from outside
+    readonly property var 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
 
     // How far left the stage has been dragged
     readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
@@ -54,12 +106,6 @@
         spreadView.snapTo(priv.indexOf(appId));
     }
 
-    onWidthChanged: {
-        spreadView.selectedIndex = -1;
-        spreadView.phase = 0;
-        spreadView.contentX = -spreadView.shift;
-    }
-
     onInverseProgressChanged: {
         // This can't be a simple binding because that would be triggered after this handler
         // while we need it active before doing the anition left/right
@@ -73,6 +119,20 @@
         priv.oldInverseProgress = inverseProgress;
     }
 
+    // <FIXME-contentX> See rationale in the next comment with this tag
+    onWidthChanged: {
+        if (!root.beingResized) {
+            // we're being resized without a warning (ie, the corresponding property wasn't set
+            root.beingResized = true;
+            beingResizedTimer.start();
+        }
+    }
+    Timer {
+        id: beingResizedTimer
+        interval: 100
+        onTriggered: { root.beingResized = false; }
+    }
+
     Connections {
         target: applicationManager
 
@@ -115,10 +175,10 @@
     QtObject {
         id: priv
 
-        readonly property int firstSpreadIndex: root.focusFirstApp ? 1 : 0
-        property string focusedAppId: applicationManager.focusedApplicationId
-        property var focusedApplication: applicationManager.findApplication(focusedAppId)
+        property string focusedAppId: root.applicationManager.focusedApplicationId
+        property var focusedApplication: root.applicationManager.findApplication(focusedAppId)
         property var focusedAppDelegate: null
+        property bool focusedAppOrientationChangesEnabled: false
 
         property real oldInverseProgress: 0
         property bool animateX: false
@@ -131,15 +191,27 @@
             }
         }
 
+        property bool focusedAppDelegateIsDislocated: focusedAppDelegate && focusedAppDelegate.x !== 0
+
         function indexOf(appId) {
-            for (var i = 0; i < applicationManager.count; i++) {
-                if (applicationManager.get(i).appId == appId) {
+            for (var i = 0; i < root.applicationManager.count; i++) {
+                if (root.applicationManager.get(i).appId == appId) {
                     return i;
                 }
             }
             return -1;
         }
 
+        // Is more stable than "spreadView.shiftedContentX === 0" as it filters out noise caused by
+        // Flickable.contentX changing due to resizes.
+        property bool fullyShowingFocusedApp: true
+    }
+    Timer {
+        id: fullyShowingFocusedAppUpdateTimer
+        interval: 100
+        onTriggered: {
+            priv.fullyShowingFocusedApp = spreadView.shiftedContentX === 0;
+        }
     }
 
     Flickable {
@@ -153,7 +225,9 @@
 
         // This indicates when the spreadView is active. That means, all the animations
         // are activated and tiles need to line up for the spread.
-        readonly property bool active: shiftedContentX > 0 || spreadDragArea.status === DirectionalDragArea.Recognized || !root.focusFirstApp
+        readonly property bool active: shiftedContentX > 0
+                                    || spreadDragArea.status === DirectionalDragArea.Recognized
+                                    || !root.focusFirstApp
 
         // The flickable needs to fill the screen in order to get touch events all over.
         // However, we don't want to the user to be able to scroll back all the way. For
@@ -188,9 +262,25 @@
         property int draggedDelegateCount: 0
         property int closingIndex: -1
 
-        property bool focusChanging: false
+        // <FIXME-contentX> Workaround Flickable's behavior of bringing contentX back between valid boundaries
+        // when resized. The proper way to fix this is refactoring PhoneStage so that it doesn't
+        // rely on having Flickable.contentX keeping an out-of-bounds value when it's set programatically
+        // (as opposed to having contentX reaching an out-of-bounds value through dragging, which will trigger
+        // the Flickable.boundsBehavior upon release).
+        onContentXChanged: { forceItToRemainStillIfBeingResized(); }
+        onShiftChanged: { forceItToRemainStillIfBeingResized(); }
+        function forceItToRemainStillIfBeingResized() {
+            if (root.beingResized && contentX != -spreadView.shift) {
+                contentX = -spreadView.shift;
+            }
+        }
 
         onShiftedContentXChanged: {
+            if (root.beingResized) {
+                // Flickabe.contentX wiggles during resizes. Don't react to it.
+                return;
+            }
+
             switch (phase) {
             case 0:
                 if (shiftedContentX > width * positionMarker2) {
@@ -205,6 +295,7 @@
                 }
                 break;
             }
+            fullyShowingFocusedAppUpdateTimer.restart();
         }
 
         function snap() {
@@ -229,7 +320,7 @@
                 snapAnimation.start();
                 return;
             }
-            if (applicationManager.count <= index) {
+            if (root.applicationManager.count <= index) {
                 // In case we're trying to snap to some non existing app, lets snap back to the first one
                 index = 0;
             }
@@ -266,7 +357,7 @@
             ScriptAction {
                 script: {
                     if (spreadView.selectedIndex >= 0) {
-                        applicationManager.focusApplication(applicationManager.get(spreadView.selectedIndex).appId);
+                        root.applicationManager.focusApplication(root.applicationManager.get(spreadView.selectedIndex).appId);
 
                         spreadView.selectedIndex = -1;
                         spreadView.phase = 0;
@@ -281,7 +372,7 @@
             // This width controls how much the spread can be flicked left/right. It's composed of:
             //  tileDistance * app count (with a minimum of 3 apps, in order to also allow moving 1 and 2 apps a bit)
             //  + some constant value (still scales with the screen width) which looks good and somewhat fills the screen
-            width: Math.max(3, applicationManager.count) * spreadView.tileDistance + (spreadView.width - spreadView.tileDistance) * 1.5
+            width: Math.max(3, root.applicationManager.count) * spreadView.tileDistance + (spreadView.width - spreadView.tileDistance) * 1.5
             height: parent.height
             Behavior on width {
                 enabled: spreadView.closingIndex >= 0
@@ -304,7 +395,7 @@
             Repeater {
                 id: spreadRepeater
                 objectName: "spreadRepeater"
-                model: applicationManager
+                model: root.applicationManager
                 delegate: TransformedSpreadDelegate {
                     id: appDelegate
                     objectName: "appDelegate" + index
@@ -319,11 +410,10 @@
                     selected: spreadView.selectedIndex == index
                     otherSelected: spreadView.selectedIndex >= 0 && !selected
                     interactive: !spreadView.interactive && spreadView.phase === 0
-                            && spreadView.shiftedContentX === 0 && root.interactive && isFocused
+                            && priv.fullyShowingFocusedApp && root.interactive && isFocused
                     swipeToCloseEnabled: spreadView.interactive && root.interactive && !snapAnimation.running
                     maximizedAppTopMargin: root.maximizedAppTopMargin
-                    dropShadow: spreadView.active ||
-                                (priv.focusedAppDelegate && priv.focusedAppDelegate.x !== 0)
+                    dropShadow: spreadView.active || priv.focusedAppDelegateIsDislocated
                     focusFirstApp: root.focusFirstApp
 
                     readonly property bool isDash: model.appId == "unity8-dash"
@@ -346,7 +436,7 @@
                         return spreadView.width + spreadIndex * spreadView.tileDistance;
                     }
 
-                    application: applicationManager.get(index)
+                    application: root.applicationManager.get(index)
                     closeable: !isDash
 
                     property real behavioredIndex: index
@@ -362,18 +452,16 @@
                         }
                     }
 
+                    property var xBehavior: xBehavior
                     Behavior on x {
+                        id: xBehavior
                         enabled: root.spreadEnabled &&
                                  !spreadView.active &&
                                  !snapAnimation.running &&
-                                 priv.animateX
+                                 priv.animateX &&
+                                 !root.beingResized
                         UbuntuNumberAnimation {
                             duration: UbuntuAnimation.BriskDuration
-                            onRunningChanged: {
-                                if (!running && root.inverseProgress == 0) {
-                                    spreadView.focusChanging = false;
-                                }
-                            }
                         }
                     }
 
@@ -413,22 +501,21 @@
                     }
 
                     // Hiding tiles when their progress is negative or reached the maximum
-                    visible: (progress >= 0 && progress < 1.7) ||
-                             (isDash && priv.focusedAppDelegate.x !== 0)
-
-                    Binding {
-                        target: appDelegate
-                        property: "orientation"
-                        when: appDelegate.interactive
-                        value: root.orientation
-                    }
+                    visible: (progress >= 0 && progress < 1.7)
+                            || (isDash && priv.focusedAppDelegateIsDislocated)
+
+
+                    shellOrientationAngle: root.shellOrientationAngle
+                    shellOrientation: root.shellOrientation
+                    shellPrimaryOrientation: root.shellPrimaryOrientation
+                    nativeOrientation: root.nativeOrientation
 
                     onClicked: {
                         if (root.altTabEnabled && spreadView.phase == 2) {
-                            if (applicationManager.focusedApplicationId == applicationManager.get(index).appId) {
+                            if (root.applicationManager.focusedApplicationId == root.applicationManager.get(index).appId) {
                                 spreadView.snapTo(index);
                             } else {
-                                applicationManager.requestFocusApplication(applicationManager.get(index).appId);
+                                root.applicationManager.requestFocusApplication(root.applicationManager.get(index).appId);
                             }
                         }
                     }
@@ -443,7 +530,20 @@
 
                     onClosed: {
                         spreadView.closingIndex = index;
-                        applicationManager.stopApplication(applicationManager.get(index).appId);
+                        root.applicationManager.stopApplication(root.applicationManager.get(index).appId);
+                    }
+
+                    Binding {
+                        target: root
+                        when: index == 0
+                        property: "mainAppWindowOrientationAngle"
+                        value: appWindowOrientationAngle
+                    }
+                    Binding {
+                        target: priv
+                        when: index == 0
+                        property: "focusedAppOrientationChangesEnabled"
+                        value: orientationChangesEnabled
                     }
                 }
             }

=== modified file 'qml/Stages/SessionContainer.qml'
--- qml/Stages/SessionContainer.qml	2015-01-28 12:59:21 +0000
+++ qml/Stages/SessionContainer.qml	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -24,14 +24,13 @@
     readonly property var childSessions: session ? session.childSessions : null
     readonly property alias surface: _surfaceContainer.surface
     property alias interactive: _surfaceContainer.interactive
-    property int orientation
+    property alias surfaceOrientationAngle: _surfaceContainer.surfaceOrientationAngle
 
     readonly property alias surfaceContainer: _surfaceContainer
     SurfaceContainer {
         id: _surfaceContainer
         anchors.fill: parent
         surface: session ? session.surface : null
-        orientation: root.orientation
     }
 
     Repeater {
@@ -72,11 +71,6 @@
                 target: item; when: item
                 property: "height"; value: root.height
             }
-
-            Binding {
-                target: item; when: item
-                property: "orientation"; value: root.orientation
-            }
         }
     }
 

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2015-01-28 12:59:21 +0000
+++ qml/Stages/SpreadDelegate.qml	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +18,7 @@
  */
 
 import QtQuick 2.0
+import QtQuick.Window 2.0
 import Ubuntu.Components 1.1
 import "../Components"
 
@@ -28,6 +29,8 @@
     readonly property bool dragged: dragArea.moving
     signal clicked()
     signal closed()
+    readonly property alias appWindowOrientationAngle: appWindowWithShadow.orientationAngle
+    readonly property alias orientationChangesEnabled: appWindow.orientationChangesEnabled
 
     // to be set from outside
     property bool interactive: true
@@ -36,10 +39,54 @@
     property alias swipeToCloseEnabled: dragArea.enabled
     property bool closeable
     property alias application: appWindow.application
-    property int orientation
+    property int shellOrientationAngle
+    property int shellOrientation
+    property int shellPrimaryOrientation
+    property int nativeOrientation
+
+    function matchShellOrientation() {
+        if (!root.application)
+            return;
+        appWindowWithShadow.orientationAngle = root.shellOrientationAngle;
+    }
+
+    function animateToShellOrientation() {
+        if (!root.application)
+            return;
+
+        if (root.application.rotatesWindowContents) {
+            appWindowWithShadow.orientationAngle = root.shellOrientationAngle;
+        } else {
+            orientationChangeAnimation.start();
+        }
+    }
+
+    OrientationChangeAnimation {
+        id: orientationChangeAnimation
+        objectName: "orientationChangeAnimation"
+        spreadDelegate: root
+        background: background
+        window: appWindowWithShadow
+        screenshot: appWindowScreenshot
+    }
+
+    QtObject {
+        id: priv
+        property bool startingUp: true
+    }
+
+    Component.onCompleted: { finishStartUpTimer.start(); }
+    Timer { id: finishStartUpTimer; interval: 400; onTriggered: priv.startingUp = false }
+
+    Rectangle {
+        id: background
+        color: "black"
+        anchors.fill: parent
+        visible: false
+    }
 
     Item {
-        objectName: "appWindowWithShadow"
+        objectName: "displacedAppWindowWithShadow"
 
         readonly property real limit: root.height / 4
 
@@ -52,28 +99,198 @@
             return k * (1 - Math.pow((k - 1) / k, distance))
         }
 
-        BorderImage {
-            anchors {
-                fill: appWindow
-                margins: -units.gu(2)
-            }
-            source: "graphics/dropshadow2gu.sci"
-            opacity: root.dropShadow ? .3 : 0
-            Behavior on opacity { UbuntuNumberAnimation {} }
-        }
-
-        ApplicationWindow {
-            id: appWindow
-            objectName: application ? "appWindow_" + application.appId : "appWindow_null"
-            focus: true
-            anchors {
-                fill: parent
-                topMargin: appWindow.fullscreen ? 0 : maximizedAppTopMargin
-            }
-
-            interactive: root.interactive
-            orientation: root.orientation
-        }
+        Item {
+            id: appWindowWithShadow
+            objectName: "appWindowWithShadow"
+
+            property int orientationAngle
+
+            property real transformRotationAngle: 0
+            property real transformOriginX
+            property real transformOriginY
+
+            transform: Rotation {
+                origin.x: appWindowWithShadow.transformOriginX
+                origin.y: appWindowWithShadow.transformOriginY
+                axis { x: 0; y: 0; z: 1 }
+                angle: appWindowWithShadow.transformRotationAngle
+            }
+
+            state: {
+                if (priv.startingUp) {
+                    return "startingUp";
+                } else if (root.application && root.application.rotatesWindowContents) {
+                    return "counterRotate";
+                } else if (orientationChangeAnimation.running) {
+                    return "animatingRotation";
+                } else  {
+                    return "keepSceneRotation";
+                }
+            }
+
+            states: [
+                // Sets the initial orientationAngle of the window, when it first slides into view
+                // (with the splash screen likely being displayed). At that point we just try to
+                // match shell's current orientation. We need a bit of time in this state as the
+                // information we need to decide orientationAngle may take a few cycles to
+                // be set.
+                State {
+                    name: "startingUp"
+                    PropertyChanges {
+                        target: appWindowWithShadow
+                        restoreEntryValues: false
+                        orientationAngle: {
+                            if (!root.application || root.application.rotatesWindowContents) {
+                                return 0;
+                            }
+                            var supportedOrientations = root.application.supportedOrientations;
+
+                            if (supportedOrientations === Qt.PrimaryOrientation) {
+                                supportedOrientations = root.shellPrimaryOrientation;
+                            }
+
+                            // If it doesn't support shell's current orientation
+                            // then simply pick some arbitraty one that it does support
+                            var chosenOrientation = 0;
+                            if (supportedOrientations & root.shellOrientation) {
+                                chosenOrientation = root.shellOrientation;
+                            } else if (supportedOrientations & Qt.PortraitOrientation) {
+                                chosenOrientation = Qt.PortraitOrientation;
+                            } else if (supportedOrientations & Qt.LandscapeOrientation) {
+                                chosenOrientation = Qt.LandscapeOrientation;
+                            } else if (supportedOrientations & Qt.InvertedPortraitOrientation) {
+                                chosenOrientation = Qt.InvertedPortraitOrientation;
+                            } else if (supportedOrientations & Qt.InvertedLandscapeOrientation) {
+                                chosenOrientation = Qt.InvertedLandscapeOrientation;
+                            } else {
+                                chosenOrientation = root.shellPrimaryOrientation;
+                            }
+
+                            return Screen.angleBetween(root.nativeOrientation, chosenOrientation);
+                        }
+
+                        rotation: appWindowWithShadow.orientationAngle - root.shellOrientationAngle
+                        width: {
+                            if (rotation == 0 || Math.abs(rotation) == 180) {
+                                return root.width;
+                            } else {
+                                return root.height;
+                            }
+                        }
+                        height: {
+                            if (rotation == 0 || Math.abs(rotation) == 180)
+                                return root.height;
+                            else
+                                return root.width;
+                        }
+                    }
+                },
+                // In this state we stick to our currently set orientationAngle, which may change only due
+                // to calls made to matchShellOrientation() or animateToShellOrientation()
+                State {
+                    id: keepSceneRotationState
+                    name: "keepSceneRotation"
+
+                    StateChangeScript { script: {
+                        // break binding
+                        appWindowWithShadow.orientationAngle = appWindowWithShadow.orientationAngle;
+                    } }
+                    PropertyChanges {
+                        target: appWindowWithShadow
+                        restoreEntryValues: false
+                        rotation: appWindowWithShadow.orientationAngle - root.shellOrientationAngle
+                        width: {
+                            if (rotation == 0 || Math.abs(rotation) == 180) {
+                                return root.width;
+                            } else {
+                                return root.height;
+                            }
+                        }
+                        height: {
+                            if (rotation == 0 || Math.abs(rotation) == 180)
+                                return root.height;
+                            else
+                                return root.width;
+                        }
+                    }
+                },
+                // In this state we counteract any shell rotation so that the window, in scene coordinates,
+                // remains unrotated.
+                State {
+                    name: "counterRotate"
+                    StateChangeScript { script: {
+                        // break binding
+                        appWindowWithShadow.orientationAngle = appWindowWithShadow.orientationAngle;
+                    } }
+                    PropertyChanges {
+                        target: appWindowWithShadow
+                        width: root.shellOrientationAngle == 0 || root.shellOrientationAngle == 180 ? root.width : root.height
+                        height: root.shellOrientationAngle == 0 || root.shellOrientationAngle == 180 ? root.height : root.width
+                        rotation: -root.shellOrientationAngle
+                    }
+                    PropertyChanges {
+                        target: appWindow
+                        surfaceOrientationAngle: orientationAngle
+                    }
+                },
+                State {
+                    name: "animatingRotation"
+                }
+            ]
+
+            x: (parent.width - width) / 2
+            y: (parent.height - height) / 2
+
+            BorderImage {
+                anchors {
+                    fill: appWindow
+                    margins: -units.gu(2)
+                }
+                source: "graphics/dropshadow2gu.sci"
+                opacity: root.dropShadow ? .3 : 0
+                Behavior on opacity { UbuntuNumberAnimation {} }
+            }
+
+            ApplicationWindow {
+                id: appWindow
+                objectName: application ? "appWindow_" + application.appId : "appWindow_null"
+                focus: true
+                anchors {
+                    fill: parent
+                    topMargin: appWindow.fullscreen || application.rotatesWindowContents
+                                   ? 0 : maximizedAppTopMargin
+                }
+
+                interactive: root.interactive
+            }
+        }
+    }
+
+    Image {
+        id: appWindowScreenshot
+        source: ""
+        visible: false
+
+        property real transformRotationAngle: 0
+        property real transformOriginX
+        property real transformOriginY
+
+        transform: Rotation {
+            origin.x: appWindowScreenshot.transformOriginX
+            origin.y: appWindowScreenshot.transformOriginY
+            axis { x: 0; y: 0; z: 1 }
+            angle: appWindowScreenshot.transformRotationAngle
+        }
+
+        function take() {
+            // Format: "image://application/$APP_ID/$CURRENT_TIME_MS"
+            // eg: "image://application/calculator-app/123456"
+            var timeMs = new Date().getTime();
+            source = "image://application/" + root.application.appId + "/" + timeMs;
+        }
+
+        sourceSize.width: width
+        sourceSize.height: height
     }
 
     DraggingArea {

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-03-12 18:55:52 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-04-16 12:11:39 +0000
@@ -24,8 +24,8 @@
     objectName: "surfaceContainer"
     property Item surface: null
     property bool hadSurface: false
-    property int orientation
     property bool interactive
+    property int surfaceOrientationAngle: 0
 
     onSurfaceChanged: {
         if (surface) {
@@ -39,10 +39,10 @@
         }
     }
     Binding { target: surface; property: "anchors.fill"; value: root }
-    Binding { target: surface; property: "orientation"; value: root.orientation }
     Binding { target: surface; property: "z"; value: 1 }
     Binding { target: surface; property: "enabled"; value: root.interactive; when: surface }
     Binding { target: surface; property: "antialiasing"; value: !root.interactive; when: surface }
+    Binding { target: surface; property: "orientationAngle"; value: root.surfaceOrientationAngle; when: surface }
 
     InputWatcher {
         target: root.surface

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-02-02 16:28:03 +0000
+++ qml/Stages/TabletStage.qml	2015-04-16 12:11:39 +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
@@ -28,13 +28,79 @@
     color: "#111111"
 
     // Controls to be set from outside
-    property bool shown: false
-    property bool moving: false
     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 int orientation: Qt.PortraitOrientation
+    property int shellOrientationAngle: 0
+    property int shellOrientation
+    property int shellPrimaryOrientation
+    property int nativeOrientation
+    property real nativeWidth
+    property real nativeHeight
+    function updateFocusedAppOrientation() {
+        var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
+        if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {
+            spreadRepeater.itemAt(mainStageAppIndex).matchShellOrientation();
+        }
+
+        for (var i = 0; i < spreadRepeater.count; ++i) {
+
+            if (i === mainStageAppIndex) {
+                continue;
+            }
+
+            var spreadDelegate = spreadRepeater.itemAt(i);
+
+            var delta = spreadDelegate.appWindowOrientationAngle - root.shellOrientationAngle;
+            if (delta < 0) { delta += 360; }
+            delta = delta % 360;
+
+            var supportedOrientations = spreadDelegate.application.supportedOrientations;
+            if (supportedOrientations === Qt.PrimaryOrientation) {
+                supportedOrientations = spreadDelegate.shellPrimaryOrientation;
+            }
+
+            if (delta === 180 && (supportedOrientations & spreadDelegate.shellOrientation)) {
+                spreadDelegate.matchShellOrientation();
+            }
+        }
+    }
+    function updateFocusedAppOrientationAnimated() {
+        var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
+        if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {
+            spreadRepeater.itemAt(mainStageAppIndex).animateToShellOrientation();
+        }
+
+        if (priv.sideStageAppId) {
+            var sideStageAppIndex = priv.indexOf(priv.sideStageAppId);
+            if (sideStageAppIndex >= 0 && sideStageAppIndex < spreadRepeater.count) {
+                spreadRepeater.itemAt(sideStageAppIndex).matchShellOrientation();
+            }
+        }
+    }
+
+    // To be read from outside
+    property var mainApp: null
+    property int mainAppWindowOrientationAngle: 0
+    readonly property bool orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
+
+    onWidthChanged: {
+        spreadView.selectedIndex = -1;
+        spreadView.phase = 0;
+        spreadView.contentX = -spreadView.shift;
+    }
+
+    onShellOrientationChanged: {
+        if (shellOrientation == Qt.PortraitOrientation || shellOrientation == Qt.InvertedPortraitOrientation) {
+            ApplicationManager.focusApplication(priv.mainStageAppId);
+            priv.sideStageAppId = "";
+        }
+    }
 
     onInverseProgressChanged: {
         // This can't be a simple binding because that would be triggered after this handler
@@ -54,6 +120,13 @@
 
         property string focusedAppId: ApplicationManager.focusedApplicationId
         property string oldFocusedAppId: ""
+        property bool mainAppOrientationChangesEnabled: false
+
+        property real landscapeHeight: root.nativeOrientation == Qt.LandscapeOrientation ?
+                root.nativeHeight : root.nativeWidth
+
+        property bool shellIsLandscape: root.shellOrientation === Qt.LandscapeOrientation
+                      || root.shellOrientation === Qt.InvertedLandscapeOrientation
 
         property string mainStageAppId
         property string sideStageAppId
@@ -71,6 +144,7 @@
                     priv.sideStageAppId = focusedAppId;
                 } else {
                     priv.mainStageAppId = focusedAppId;
+                    root.mainApp = focusedApp;
                 }
             }
 
@@ -169,6 +243,7 @@
 
     Flickable {
         id: spreadView
+        objectName: "spreadView"
         anchors.fill: parent
         interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
                      && draggedDelegateCount === 0
@@ -218,7 +293,25 @@
         property int draggedDelegateCount: 0
         property int closingIndex: -1
 
+        // FIXME: Workaround Flickable's not keepping its contentX still when resized
+        onContentXChanged: { forceItToRemainStillIfBeingResized(); }
+        onShiftChanged: { forceItToRemainStillIfBeingResized(); }
+        function forceItToRemainStillIfBeingResized() {
+            if (root.beingResized && contentX != -shift) {
+                contentX = -shift;
+            }
+        }
+
         property bool animateX: true
+        property bool beingResized: false
+        onBeingResizedChanged: {
+            if (beingResized) {
+                // Brace yourselves for impact!
+                selectedIndex = -1;
+                phase = 0;
+                contentX = -shift;
+            }
+        }
 
         property bool sideStageDragging: sideStageDragHandle.dragging
         property real sideStageDragProgress: sideStageDragHandle.progress
@@ -257,7 +350,6 @@
             case "overlay":
                 return 1;
             }
-            print("Unhandled nextInStack case! This shouldn't happen any more when the Dash is an app!");
             return -1;
         }
         property int nextZInStack: indexToZIndex(nextInStack)
@@ -293,6 +385,10 @@
         }
 
         onShiftedContentXChanged: {
+            if (root.beingResized) {
+                // Flickabe.contentX wiggles during resizes. Don't react to it.
+                return;
+            }
             if (spreadView.phase == 0 && spreadView.shiftedContentX > spreadView.width * spreadView.positionMarker2) {
                 spreadView.phase = 1;
             } else if (spreadView.phase == 1 && spreadView.shiftedContentX > spreadView.width * spreadView.positionMarker4) {
@@ -402,8 +498,8 @@
         MouseArea {
             id: spreadRow
             x: spreadView.contentX
+            width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)
             height: root.height
-            width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)
 
             onClicked: {
                 spreadView.snapTo(0);
@@ -412,8 +508,9 @@
             Rectangle {
                 id: sideStageBackground
                 color: "black"
-                anchors.fill: parent
-                anchors.leftMargin: spreadView.width - (1 - sideStageDragHandle.progress) * spreadView.sideStageWidth
+                width: spreadView.sideStageWidth * (1 - sideStageDragHandle.progress)
+                height: priv.landscapeHeight
+                x: spreadView.width - width
                 z: spreadView.indexToZIndex(priv.indexOf(priv.sideStageAppId))
                 opacity: spreadView.phase == 0 ? 1 : 0
                 Behavior on opacity { UbuntuNumberAnimation {} }
@@ -421,8 +518,10 @@
 
             Item {
                 id: sideStageDragHandle
-                anchors { top: parent.top; bottom: parent.bottom; left: parent.left; leftMargin: spreadView.width - spreadView.sideStageWidth - width }
+                anchors.right: sideStageBackground.left
+                anchors.top: sideStageBackground.top
                 width: units.gu(2)
+                height: priv.landscapeHeight
                 z: sideStageBackground.z
                 opacity: spreadView.phase <= 0 && spreadView.sideStageVisible ? 1 : 0
                 property real progress: 0
@@ -441,7 +540,6 @@
 
                 Image {
                     anchors.centerIn: parent
-                    anchors.horizontalCenterOffset: parent.progress * spreadView.sideStageWidth - (width - parent.width) / 2
                     width: sideStageDragHandleMouseArea.pressed ? parent.width * 2 : parent.width
                     height: parent.height
                     source: "graphics/[e-mail]"
@@ -454,16 +552,19 @@
                     enabled: spreadView.shiftedContentX == 0
                     property int startX
                     property var gesturePoints: new Array()
+                    property real totalDiff
 
                     onPressed: {
                         gesturePoints = [];
                         startX = mouseX;
+                        totalDiff = 0.0;
                         sideStageDragHandle.progress = 0;
                         sideStageDragHandle.dragging = true;
                     }
                     onMouseXChanged: {
+                        totalDiff += mouseX - startX;
                         if (priv.mainStageAppId) {
-                            sideStageDragHandle.progress = Math.max(0, (-startX + mouseX) / spreadView.sideStageWidth);
+                            sideStageDragHandle.progress = Math.max(0, totalDiff / spreadView.sideStageWidth);
                         }
                         gesturePoints.push(mouseX);
                     }
@@ -492,12 +593,26 @@
 
             Repeater {
                 id: spreadRepeater
+                objectName: "spreadRepeater"
                 model: ApplicationManager
 
                 delegate: TransformedTabletSpreadDelegate {
                     id: spreadTile
-                    height: spreadView.height
-                    width: model.stage == ApplicationInfoInterface.MainStage ? spreadView.width : spreadView.sideStageWidth
+                    objectName: "spreadDelegate_" + model.appId
+                    width: {
+                        if (wantsMainStage) {
+                            return spreadView.width;
+                        } else {
+                            return spreadView.sideStageWidth;
+                        }
+                    }
+                    height: {
+                        if (wantsMainStage) {
+                            return spreadView.height;
+                        } else {
+                            return priv.landscapeHeight;
+                        }
+                    }
                     active: model.appId == priv.mainStageAppId || model.appId == priv.sideStageAppId
                     zIndex: spreadView.indexToZIndex(index)
                     selected: spreadView.selectedIndex == index
@@ -510,6 +625,8 @@
                     application: ApplicationManager.get(index)
                     closeable: !isDash
 
+                    readonly property bool wantsMainStage: model.stage == ApplicationInfoInterface.MainStage
+
                     readonly property bool isDash: model.appId == "unity8-dash"
 
                     // FIXME: A regular binding doesn't update any more after closing an app.
@@ -561,12 +678,11 @@
                         return progress;
                     }
 
-                    Binding {
-                        target: spreadTile
-                        property: "orientation"
-                        when: spreadTile.interactive
-                        value: root.orientation
-                    }
+                    shellOrientationAngle: wantsMainStage ? root.shellOrientationAngle : 0
+                    shellOrientation: wantsMainStage ? root.shellOrientation : Qt.PortraitOrientation
+                    shellPrimaryOrientation: wantsMainStage ? root.shellPrimaryOrientation : Qt.PortraitOrientation
+                    nativeOrientation: wantsMainStage ? root.nativeOrientation : Qt.PortraitOrientation
+
 
                     onClicked: {
                         if (spreadView.phase == 2) {
@@ -587,6 +703,19 @@
                         ApplicationManager.stopApplication(ApplicationManager.get(index).appId);
                     }
 
+                    Binding {
+                        target: root
+                        when: model.appId == priv.mainStageAppId
+                        property: "mainAppWindowOrientationAngle"
+                        value: appWindowOrientationAngle
+                    }
+                    Binding {
+                        target: priv
+                        when: model.appId == priv.mainStageAppId
+                        property: "mainAppOrientationChangesEnabled"
+                        value: orientationChangesEnabled
+                    }
+
                     EasingCurve {
                         id: snappingCurve
                         type: EasingCurve.Linear
@@ -603,6 +732,7 @@
         anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
         width: root.dragAreaWidth
         direction: Direction.Leftwards
+        enabled: (spreadView.phase != 2 && root.spreadEnabled) || dragging
 
         property var gesturePoints: new Array()
 
@@ -631,11 +761,15 @@
             var oneWayFlick = priv.evaluateOneWayFlick(gesturePoints);
             gesturePoints = [];
 
+            var nextAppInStackIsInMainStage =
+                    spreadView.nextInStack !== -1 &&
+                    ApplicationManager.get(spreadView.nextInStack).stage === ApplicationInfoInterface.MainStage;
+
             if (oneWayFlick && spreadView.shiftedContentX < spreadView.positionMarker1 * spreadView.width) {
                 // If it was a short one-way movement, do the Alt+Tab switch
                 // no matter if we didn't cross positionMarker1 yet.
                 spreadView.snapTo(spreadView.nextInStack);
-            } else if (!dragging) {
+            } else {
                 if (spreadView.shiftedContentX < spreadView.width * spreadView.positionMarker1) {
                     spreadView.snap();
                 } else if (spreadView.shiftedContentX < spreadView.width * spreadView.positionMarker2) {

=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
--- qml/Stages/TransformedTabletSpreadDelegate.qml	2015-02-02 16:23:34 +0000
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2015-04-16 12:11:39 +0000
@@ -50,7 +50,9 @@
     property int dragOffset: 0
 
     dropShadow: spreadView.active ||
-                (active && model.stage == ApplicationInfoInterface.MainStage && priv.xTranslate != 0)
+                (active
+                 && (model.stage == ApplicationInfoInterface.MainStage || !priv.shellIsLandscape)
+                 && priv.xTranslate != 0)
 
     onSelectedChanged: {
         if (selected) {
@@ -139,7 +141,8 @@
                      !snapAnimation.running &&
                      model.appId !== "unity8-dash" &&
                      !spreadView.sideStageDragging &&
-                     spreadView.animateX
+                     spreadView.animateX &&
+                     !spreadView.beingResized
             UbuntuNumberAnimation {
                 duration: UbuntuAnimation.FastDuration
             }

=== modified file 'run.sh'
--- run.sh	2015-03-11 08:07:31 +0000
+++ run.sh	2015-04-16 12:11:39 +0000
@@ -44,7 +44,7 @@
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/plugins/LightDM/liblightdm
 fi
 
-QML_PHONE_SHELL_ARGS=""
+QML_PHONE_SHELL_ARGS="-windowgeometry=40gux68gu -devicename=mako"
 if $MOUSE_TOUCH; then
   QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"
 fi

=== added file 'src/ApplicationArguments.cpp'
--- src/ApplicationArguments.cpp	1970-01-01 00:00:00 +0000
+++ src/ApplicationArguments.cpp	2015-04-16 12:11:39 +0000
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ApplicationArguments.h"
+
+ApplicationArguments::ApplicationArguments(QObject *parent)
+    : QObject(parent)
+{
+}

=== modified file 'src/ApplicationArguments.h'
--- src/ApplicationArguments.h	2014-07-08 19:04:17 +0000
+++ src/ApplicationArguments.h	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Nick Dedekind <[e-mail]>
  */
 
 
@@ -22,24 +21,29 @@
 
 #include <QObject>
 #include <QSize>
-#include <QStringList>
+#include <QString>
 
 class ApplicationArguments : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QString deviceName READ deviceName CONSTANT)
 public:
-    // Not exposed to the app as setSize isn't invokable
+    ApplicationArguments(QObject *parent = nullptr);
+
+    void setDeviceName(QString deviceName) { m_deviceName = deviceName; }
     void setSize(int width, int height) {
         m_size.rwidth()  = width;
         m_size.rheight() = height;
     }
 
-    Q_INVOKABLE bool hasGeometry() const { return m_size.isValid(); }
     Q_INVOKABLE int width() const { return m_size.width(); }
     Q_INVOKABLE int height() const { return m_size.height(); }
 
+    QString deviceName() const { return m_deviceName; }
+
 private:
-  QSize m_size;
+    QSize m_size;
+    QString m_deviceName;
 };
 
 #endif // APPLICATION_ARGUMENTS_H

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-27 09:40:01 +0000
+++ src/CMakeLists.txt	2015-04-16 12:11:39 +0000
@@ -17,21 +17,21 @@
 )
 
 add_executable(${SHELL_APP}
-    ApplicationArguments.h
+    ApplicationArguments.cpp
     main.cpp
     MouseTouchAdaptor.cpp
     CachingNetworkManagerFactory.cpp
+    UnityCommandLineParser.cpp
     ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
 )
 
 qt5_use_modules(${SHELL_APP} Gui Qml Quick Test)
-pkg_check_modules(XCB REQUIRED xcb)
-
-if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
-    set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
-
-    target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
+
+pkg_check_modules(NEEDED_LIBS REQUIRED xcb libandroid-properties)
+if (NOT "${NEEDED_LIBS_INCLUDE_DIRS}" STREQUAL "")
+    set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${NEEDED_LIBS_INCLUDE_DIRS})
 endif()
+target_link_libraries(${SHELL_APP} ${NEEDED_LIBS_LDFLAGS})
 
 target_link_libraries(${SHELL_APP} UbuntuGestures connectivity-qt1)
 

=== modified file 'src/Dash/CMakeLists.txt'
--- src/Dash/CMakeLists.txt	2014-10-27 09:40:01 +0000
+++ src/Dash/CMakeLists.txt	2015-04-16 12:11:39 +0000
@@ -1,6 +1,6 @@
 set(DASH_SRCS
     main.cpp
-    ../ApplicationArguments.h
+    ../ApplicationArguments.cpp
     ../MouseTouchAdaptor.cpp
     ../CachingNetworkManagerFactory.cpp
 )
@@ -9,6 +9,12 @@
 
 qt5_use_modules(unity8-dash Gui Qml Quick Test)
 
+pkg_check_modules(NEEDED_LIBS REQUIRED xcb libandroid-properties)
+if (NOT "${NEEDED_LIBS_INCLUDE_DIRS}" STREQUAL "")
+    set_target_properties(unity8-dash PROPERTIES INCLUDE_DIRECTORIES ${NEEDED_LIBS_INCLUDE_DIRS})
+endif()
+target_link_libraries(unity8-dash ${NEEDED_LIBS_LDFLAGS})
+
 # For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
 set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
 

=== added file 'src/UnityCommandLineParser.cpp'
--- src/UnityCommandLineParser.cpp	1970-01-01 00:00:00 +0000
+++ src/UnityCommandLineParser.cpp	2015-04-16 12:11:39 +0000
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UnityCommandLineParser.h"
+
+#include <QDebug>
+
+#define ENV_GRID_UNIT_PX "GRID_UNIT_PX"
+#define DEFAULT_GRID_UNIT_PX 8
+
+UnityCommandLineParser::UnityCommandLineParser(const QCoreApplication &app)
+{
+    m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX);
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription("Description: Unity 8 Shell");
+    parser.addHelpOption();
+
+    QCommandLineOption fullscreenOption("fullscreen",
+        "Run in fullscreen");
+    parser.addOption(fullscreenOption);
+
+    QCommandLineOption framelessOption("frameless",
+        "Run without window borders");
+    parser.addOption(framelessOption);
+
+    QCommandLineOption mousetouchOption("mousetouch",
+        "Allow the mouse to provide touch input");
+    parser.addOption(mousetouchOption);
+
+    QCommandLineOption windowGeometryOption(QStringList() << "windowgeometry",
+            "Specify the window geometry as [<width>x<height>]", "windowgeometry", "1");
+    parser.addOption(windowGeometryOption);
+
+    QCommandLineOption testabilityOption("testability",
+        "DISCOURAGED: Please set QT_LOAD_TESTABILITY instead.\nLoad the testability driver");
+    parser.addOption(testabilityOption);
+
+    QCommandLineOption devicenameOption(QStringList() << "devicename",
+            "Specify the device name instead of letting Unity 8 find it out", "devicename", "");
+    parser.addOption(devicenameOption);
+
+    QCommandLineOption modeOption("mode",
+        "Whether to run greeter and/or shell [full-greeter, full-shell, greeter, shell]",
+        "mode", "full-greeter");
+    parser.addOption(modeOption);
+
+    // Treat args with single dashes the same as arguments with two dashes
+    // Ex: -fullscreen == --fullscreen
+    parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+
+    parser.process(app);
+
+    if (parser.isSet(windowGeometryOption))
+    {
+        QStringList geom = parser.value(windowGeometryOption).split('x');
+        if (geom.count() == 2) {
+            m_windowGeometry.rwidth() = parsePixelsValue(geom[0]);
+            m_windowGeometry.rheight() = parsePixelsValue(geom[1]);
+        }
+    }
+
+    m_hasTestability = parser.isSet(testabilityOption);
+    m_hasFrameless = parser.isSet(framelessOption);
+    m_hasMouseToTouch = parser.isSet(mousetouchOption);
+    m_hasFullscreen = parser.isSet(fullscreenOption);
+    m_deviceName = parser.value(devicenameOption);
+    resolveMode(parser, modeOption);
+}
+
+int UnityCommandLineParser::parsePixelsValue(const QString &str)
+{
+    if (str.endsWith("gu", Qt::CaseInsensitive)) {
+        QString numStr = str;
+        numStr.remove(numStr.size() - 2, 2);
+        return numStr.toInt() * m_gridUnit;
+    } else {
+        return str.toInt();
+    }
+}
+
+float UnityCommandLineParser::getenvFloat(const char* name, float defaultValue)
+{
+    QByteArray stringValue = qgetenv(name);
+    bool ok;
+    float value = stringValue.toFloat(&ok);
+    return ok ? value : defaultValue;
+}
+
+void UnityCommandLineParser::resolveMode(QCommandLineParser &parser, QCommandLineOption &modeOption)
+{
+    // If an invalid option was specified, set it to the default
+    // If no default was provided in the QCommandLineOption constructor, abort.
+    if (!parser.isSet(modeOption) ||
+        (parser.value(modeOption) != "full-greeter" &&
+         parser.value(modeOption) != "full-shell" &&
+         parser.value(modeOption) != "greeter" &&
+         parser.value(modeOption) != "shell")) {
+
+        if (modeOption.defaultValues().first() != nullptr) {
+            m_mode = modeOption.defaultValues().first();
+            qWarning() << "Mode argument was not provided or was set to an illegal value."
+                " Using default value of --mode=" << m_mode;
+        } else {
+            qFatal("Shell mode argument was not provided and there is no default mode.");
+        }
+    } else {
+        m_mode = parser.value(modeOption);
+    }
+}

=== added file 'src/UnityCommandLineParser.h'
--- src/UnityCommandLineParser.h	1970-01-01 00:00:00 +0000
+++ src/UnityCommandLineParser.h	2015-04-16 12:11:39 +0000
@@ -0,0 +1,52 @@
+/*
+ * 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 UNITY_COMMAND_LINE_PARSER_H
+#define UNITY_COMMAND_LINE_PARSER_H
+
+#include <QCommandLineParser>
+#include <QSize>
+#include <QString>
+
+class UnityCommandLineParser {
+public:
+    UnityCommandLineParser(const QCoreApplication &app);
+
+    QSize windowGeometry() const { return m_windowGeometry; }
+    bool hasTestability() const { return m_hasTestability; }
+    bool hasFrameless() const { return m_hasFrameless; }
+    bool hasMouseToTouch() const { return m_hasMouseToTouch; }
+    bool hasFullscreen() const { return m_hasFullscreen; }
+    QString deviceName() const { return m_deviceName; }
+    QString mode() const { return m_mode; }
+private:
+
+    int parsePixelsValue(const QString &str);
+    static float getenvFloat(const char* name, float defaultValue);
+    void resolveMode(QCommandLineParser &parser, QCommandLineOption &modeOption);
+
+    float m_gridUnit;
+
+    QSize m_windowGeometry;
+    bool m_hasTestability;
+    bool m_hasFrameless;
+    bool m_hasMouseToTouch;
+    bool m_hasFullscreen;
+    QString m_deviceName;
+    QString m_mode;
+};
+
+#endif // UNITY_COMMAND_LINE_PARSER_H

=== modified file 'src/main.cpp'
--- src/main.cpp	2015-03-23 23:40:27 +0000
+++ src/main.cpp	2015-04-16 12:11:39 +0000
@@ -25,11 +25,15 @@
 #include <csignal>
 #include <libintl.h>
 
+// libandroid-properties
+#include <hybris/properties/properties.h>
+
 // local
 #include <paths.h>
 #include "MouseTouchAdaptor.h"
 #include "ApplicationArguments.h"
 #include "CachingNetworkManagerFactory.h"
+#include "UnityCommandLineParser.h"
 
 // Ubuntu Gestures
 #include <TouchRegistry.h>
@@ -45,79 +49,22 @@
     QGuiApplication::setApplicationName("unity8");
     QGuiApplication *application;
 
-    QCommandLineParser parser;
-    parser.setApplicationDescription("Description: Unity 8 Shell");
-    parser.addHelpOption();
-
-    QCommandLineOption fullscreenOption("fullscreen",
-        "Run in fullscreen");
-    parser.addOption(fullscreenOption);
-
-    QCommandLineOption framelessOption("frameless",
-        "Run without window borders");
-    parser.addOption(framelessOption);
-
-    QCommandLineOption mousetouchOption("mousetouch",
-        "Allow the mouse to provide touch input");
-    parser.addOption(mousetouchOption);
-
-    QCommandLineOption windowGeometryOption(QStringList() << "windowgeometry",
-            "Specify the window geometry as [<width>x<height>]", "windowgeometry", "1");
-    parser.addOption(windowGeometryOption);
-
-    QCommandLineOption testabilityOption("testability",
-        "DISCOURAGED: Please set QT_LOAD_TESTABILITY instead. \n \
-Load the testability driver");
-    parser.addOption(testabilityOption);
-
-    QCommandLineOption modeOption("mode",
-        "Whether to run greeter and/or shell [full-greeter, full-shell, greeter, shell]",
-        "mode", "full-greeter");
-    parser.addOption(modeOption);
-
     application = new QGuiApplication(argc, (char**)argv);
 
-    // Treat args with single dashes the same as arguments with two dashes
-    // Ex: -fullscreen == --fullscreen
-    parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
-    parser.process(*application);
-
-    QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");
-    if (indicatorProfile.isEmpty()) {
-        indicatorProfile = "phone";
-    }
+    UnityCommandLineParser parser(*application);
 
     ApplicationArguments qmlArgs;
-    if (parser.isSet(windowGeometryOption) &&
-        parser.value(windowGeometryOption).split('x').size() == 2)
-    {
-        QStringList geom = parser.value(windowGeometryOption).split('x');
-        qmlArgs.setSize(geom.at(0).toInt(), geom.at(1).toInt());
-    }
-
-    // If an invalid option was specified, set it to the default
-    // If no default was provided in the QCommandLineOption constructor, abort.
-    QString shellMode;
-    if(!parser.isSet(modeOption) ||
-        (parser.value(modeOption) != "full-greeter" &&
-         parser.value(modeOption) != "full-shell" &&
-         parser.value(modeOption) != "greeter" &&
-         parser.value(modeOption) != "shell"))
-    {
-        if (modeOption.defaultValues().first() != nullptr) {
-            shellMode = modeOption.defaultValues().first();
-            qWarning() << "Mode argument was not provided or was set to an illegal value. Using default value of --mode=" << shellMode;
-        } else {
-            qFatal("Shell mode argument was not provided and there is no default mode,");
-        }
-
+    if (!parser.deviceName().isEmpty()) {
+        qmlArgs.setDeviceName(parser.deviceName());
     } else {
-        shellMode = parser.value(modeOption);
+        char buffer[200];
+        property_get("ro.product.device", buffer /* value */, "desktop" /* default_value*/);
+        qmlArgs.setDeviceName(QString(buffer));
     }
 
     // The testability driver is only loaded by QApplication but not by QGuiApplication.
     // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.
-    if (parser.isSet(testabilityOption) || getenv("QT_LOAD_TESTABILITY")) {
+    if (parser.hasTestability() || getenv("QT_LOAD_TESTABILITY")) {
         QLibrary testLib(QLatin1String("qttestability"));
         if (testLib.load()) {
             typedef void (*TasInitialize)(void);
@@ -141,22 +88,25 @@
     view->setTitle("Unity8 Shell");
     view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
     view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
-    view->rootContext()->setContextProperty("indicatorProfile", indicatorProfile);
-    view->rootContext()->setContextProperty("shellMode", shellMode);
-    if (parser.isSet(framelessOption)) {
+    view->rootContext()->setContextProperty("shellMode", parser.mode());
+    if (parser.hasFrameless()) {
         view->setFlags(Qt::FramelessWindowHint);
     }
     TouchRegistry touchRegistry;
     view->installEventFilter(&touchRegistry);
+    if (parser.windowGeometry().isValid()) {
+        view->setWidth(parser.windowGeometry().width());
+        view->setHeight(parser.windowGeometry().height());
+    }
 
     // You will need this if you want to interact with touch-only components using a mouse
     // Needed only when manually testing on a desktop.
     MouseTouchAdaptor *mouseTouchAdaptor = 0;
-    if (parser.isSet(mousetouchOption)) {
+    if (parser.hasMouseToTouch()) {
         mouseTouchAdaptor = MouseTouchAdaptor::instance();
     }
 
-    QUrl source(::qmlDirectory()+"Shell.qml");
+    QUrl source(::qmlDirectory()+"OrientedShell.qml");
     prependImportPaths(view->engine(), ::overrideImportPaths());
     if (!isMirServer) {
         prependImportPaths(view->engine(), ::nonMirImportPaths());
@@ -169,7 +119,7 @@
     view->setSource(source);
     QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
 
-    if (isMirServer || parser.isSet(fullscreenOption)) {
+    if (isMirServer || parser.hasFullscreen()) {
         view->showFullScreen();
     } else {
         view->show();

=== modified file 'tests/autopilot/unity8/fixture_setup.py'
--- tests/autopilot/unity8/fixture_setup.py	2015-04-07 11:48:34 +0000
+++ tests/autopilot/unity8/fixture_setup.py	2015-04-16 12:11:39 +0000
@@ -17,18 +17,146 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import os
+import subprocess
+import threading
 import fixtures
-import subprocess
 import logging
 
 from autopilot import introspection
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from ubuntuuitoolkit import fixture_setup
 
 from unity8 import (
     get_binary_path,
+    sensors,
     process_helpers
 )
+
 from unity8.shell import emulators
 
+from unity8.shell.emulators import (
+    main_window as main_window_emulator
+)
+
+from unity8 import (
+    get_lib_path,
+    get_binary_path,
+    get_mocks_library_path,
+    get_default_extra_mock_libraries,
+    get_data_dirs
+)
+
+logger = logging.getLogger(__name__)
+
+class LaunchUnityWithFakeSensors(fixtures.Fixture):
+
+    """Fixture to launch Unity8 with an injectable sensors backend.
+
+    :ivar unity_proxy: The Autopilot proxy object for the Unity shell.
+
+    """
+
+    unity_proxy = None
+    main_win = None
+
+    def setUp(self):
+        """Restart Unity8 with testability and create sensors."""
+        super(LaunchUnityWithFakeSensors, self).setUp()
+        self.useFixture(
+            fixture_setup.InitctlEnvironmentVariable(
+                UBUNTU_PLATFORM_API_TEST_OVERRIDE='sensors'))
+
+        self.addCleanup(process_helpers.stop_job, 'unity8')
+        restart_thread = threading.Thread(
+            target=self._restart_unity_with_testability)
+        restart_thread.start()
+
+        self._create_sensors()
+
+        restart_thread.join()
+        self.fake_sensors = sensors.FakePlatformSensors()
+
+    def _get_lightdm_mock_path(self):
+        lib_path = get_mocks_library_path()
+        lightdm_mock_path = os.path.abspath(
+            os.path.join(lib_path, "LightDM", "liblightdm")
+        )
+
+        if not os.path.exists(lightdm_mock_path):
+            raise RuntimeError(
+                "LightDM mock does not exist at path '%s'."
+                % (lightdm_mock_path)
+            )
+        return lightdm_mock_path
+
+    def _get_qml_import_path_with_mock(self):
+        """Return the QML2_IMPORT_PATH value with the mock path prepended."""
+        qml_import_path = [get_mocks_library_path()]
+        if os.getenv('QML2_IMPORT_PATH') is not None:
+            qml_import_path.append(os.getenv('QML2_IMPORT_PATH'))
+
+        qml_import_path = ':'.join(qml_import_path)
+        return qml_import_path
+
+    def _restart_unity_with_testability(self):
+        _environment = {}
+
+        data_dirs = get_data_dirs(True)
+        if data_dirs is not None:
+            _environment['XDG_DATA_DIRS'] = data_dirs
+
+        _environment['QML2_IMPORT_PATH'] = (
+            self._get_qml_import_path_with_mock()
+        )
+
+        new_ld_library_path = [
+            get_default_extra_mock_libraries(),
+            self._get_lightdm_mock_path()
+        ]
+        if os.getenv('LD_LIBRARY_PATH') is not None:
+            new_ld_library_path.append(os.getenv('LD_LIBRARY_PATH'))
+        new_ld_library_path = ':'.join(new_ld_library_path)
+        _environment['LD_LIBRARY_PATH'] = new_ld_library_path
+
+        # FIXME: we shouldn't be doing this
+        # $MIR_SOCKET, fallback to $XDG_RUNTIME_DIR/mir_socket and
+        # /tmp/mir_socket as last resort
+        try:
+            os.unlink(
+                os.getenv('MIR_SOCKET',
+                          os.path.join(os.getenv('XDG_RUNTIME_DIR', "/tmp"),
+                                       "mir_socket")))
+        except OSError:
+            pass
+        try:
+            os.unlink("/tmp/mir_socket")
+        except OSError:
+            pass
+
+        binary_arg = "BINARY=%s" % get_binary_path()
+        env_args = ["%s=%s" % (k, v) for k, v in _environment.items()]
+        args = [binary_arg] + env_args
+        self.unity_proxy = process_helpers.restart_unity_with_testability(*args)
+        self.main_win = self.unity_proxy.select_single(main_window_emulator.QQuickView)
+
+    def _create_sensors(self):
+        # Wait for unity to start running.
+        Eventually(Equals(True)).match(
+            lambda: process_helpers.is_job_running('unity8'))
+
+        # Wait for the sensors fifo file to be created.
+        fifo_path = '/tmp/sensor-fifo-{0}'.format(
+            process_helpers.get_unity_pid())
+        Eventually(Equals(True)).match(
+            lambda: os.path.exists(fifo_path))
+
+        with open(fifo_path, 'w') as fifo:
+            fifo.write('create accel 0 1000 0.1\n')
+            fifo.write('create light 0 10 1\n')
+            fifo.write('create proximity\n')
+
 logger = logging.getLogger(__name__)
 
 class LaunchDashApp(fixtures.Fixture):

=== modified file 'tests/autopilot/unity8/indicators/tests/test_display_indicator.py'
--- tests/autopilot/unity8/indicators/tests/test_display_indicator.py	2015-03-20 11:31:40 +0000
+++ tests/autopilot/unity8/indicators/tests/test_display_indicator.py	2015-04-16 12:11:39 +0000
@@ -16,9 +16,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from autopilot import platform
+
 from unity8 import (
     fixture_setup,
     indicators,
+    process_helpers
 )
 from unity8.indicators import tests
 
@@ -39,6 +42,9 @@
 
         self.assertTrue(display_indicator.is_indicator_icon_visible())
 
+        self.fake_sensors.set_orientation_top_down()
+        # TODO how to get the shell orientation?
+
     def test_indicator_icon_must_not_be_visible_after_rotation_unlocked(self):
         rotation_locked = fixture_setup.DisplayRotationLock(True)
         self.useFixture(rotation_locked)

=== modified file 'tests/autopilot/unity8/process_helpers.py'
--- tests/autopilot/unity8/process_helpers.py	2015-04-01 14:50:19 +0000
+++ tests/autopilot/unity8/process_helpers.py	2015-04-16 12:11:39 +0000
@@ -57,7 +57,7 @@
     """
     if unity_proxy_obj is None:
         try:
-            pid = _get_unity_pid()
+            pid = get_unity_pid()
             unity = _get_unity_proxy_object(pid)
             main_window = unity.select_single(main_window_emulator.QQuickView)
         except ProcessSearchError as e:
@@ -261,7 +261,7 @@
         raise CannotAccessUnity(str(error))
 
 
-def _get_unity_pid():
+def get_unity_pid():
     try:
         return get_job_pid('unity8')
     except JobError as error:

=== added file 'tests/autopilot/unity8/sensors.py'
--- tests/autopilot/unity8/sensors.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/unity8/sensors.py	2015-04-16 12:11:39 +0000
@@ -0,0 +1,90 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Unity Autopilot Test Suite
+# Copyright (C) 2015 Canonical
+#
+# 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+"""Control module for event injection to the fake/test platform sensors."""
+
+from unity8 import process_helpers
+
+
+class FakePlatformSensors:
+
+    def __init__(self, pid=None):
+        self.pid = pid or process_helpers.get_unity_pid()
+
+    def set_orientation_top_up(self):
+        with open("/tmp/sensor-fifo-{0}".format(self.pid), "w") as fifo:
+            fifo.write("70 accel -10.050858 -0.598550 0.756568\n")
+            fifo.write("70 accel -9.797073 -0.555455 1.019930\n")
+            fifo.write("70 accel -10.141838 -0.770933 0.632069\n")
+            fifo.write("70 accel -12.057199 -1.259350 1.690306\n")
+            fifo.write("70 accel -19.282900 -3.926491 3.098097\n")
+            fifo.write("70 accel -14.480132 -14.269443 1.216254\n")
+            fifo.write("70 accel 16.419436 4.242526 -7.714118\n")
+            fifo.write("70 accel 5.583278 8.279149 -1.848324\n")
+            fifo.write("70 accel 1.422156 8.547300 0.416591\n")
+            fifo.write("70 accel 4.357447 9.988609 -0.110133\n")
+            fifo.write("70 accel 0.699107 9.840169 0.756568\n")
+            fifo.write("70 accel 1.364695 9.844957 -0.287304\n")
+            fifo.flush()
+
+    def set_orientation_top_down(self):
+        with open("/tmp/sensor-fifo-{0}".format(self.pid), "w") as fifo:
+            fifo.write("70 accel -10.050858 -0.598550 0.756568\n")
+            fifo.write("70 accel 9.538500 -0.603339 1.292869\n")
+            fifo.write("70 accel 9.485827 -0.636858 1.422156\n")
+            fifo.write("70 accel 9.677363 -0.402226 1.374272\n")
+            fifo.write("70 accel 9.303867 -0.507571 1.283292\n")
+            fifo.write("70 accel 8.604761 -1.015141 1.436521\n")
+            fifo.write("70 accel 7.580042 -2.001553 0.521936\n")
+            fifo.write("70 accel 7.503428 -4.247314 0.502782\n")
+            fifo.write("70 accel 7.067683 -7.240066 0.842759\n")
+            fifo.write("70 accel 6.488286 -9.873688 -0.541090\n")
+            fifo.write("70 accel 6.229713 -9.241618 -1.048660\n")
+            fifo.write("70 accel 4.046201 -9.198523 -0.057461\n")
+            fifo.write("70 accel 2.398990 -9.629479 0.957681\n")
+            fifo.write("70 accel 1.632846 -9.361329 -0.311246\n")
+            fifo.write("70 accel -0.181959 -9.696517 -0.301669\n")
+            fifo.flush()
+
+    def set_orientation_left_up(self):
+        with open("/tmp/sensor-fifo-{0}".format(self.pid), "w") as fifo:
+            fifo.write("70 accel -10.050858 -0.598550 0.756568\n")
+            fifo.write("70 accel 0.196325 9.878476 0.948104\n")
+            fifo.write("70 accel 0.258574 9.955091 1.091756\n")
+            fifo.write("70 accel 0.287304 10.041282 1.134852\n")
+            fifo.write("70 accel 1.537078 10.553641 1.561020\n")
+            fifo.write("70 accel 8.130709 10.093954 2.561796\n")
+            fifo.write("70 accel -0.229843 5.348647 1.723825\n")
+            fifo.write("70 accel -9.916783 0.488417 -3.418920\n")
+            fifo.write("70 accel -13.417107 -0.416591 -2.360683\n")
+            fifo.write("70 accel -13.872005 -2.049437 -0.574608\n")
+            fifo.flush()
+
+    def set_orientation_right_up(self):
+        with open("/tmp/sensor-fifo-{0}".format(self.pid), "w") as fifo:
+            fifo.write("70 accel -10.050858 -0.598550 0.756568\n")
+            fifo.write("70 accel -0.799663 9.988609 1.197101\n")
+            fifo.write("70 accel -0.861913 9.864111 0.866701\n")
+            fifo.write("70 accel -1.776498 9.830592 1.273715\n")
+            fifo.write("70 accel -13.158532 2.217031 1.091756\n")
+            fifo.write("70 accel 5.056554 1.067814 0.799663\n")
+            fifo.write("70 accel 14.882358 2.896984 1.221043\n")
+            fifo.write("70 accel 9.466674 -0.363919 -1.029507\n")
+            fifo.write("70 accel 12.253524 -0.186748 -0.311246\n")
+            fifo.flush()

=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
--- tests/autopilot/unity8/shell/emulators/main_window.py	2015-02-24 10:15:33 +0000
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2015-04-16 12:11:39 +0000
@@ -169,6 +169,18 @@
             objectName='pinPadButton{}'.format(button_id)
         )
 
+    def get_shell_orientation_angle(self):
+        return self._get_shell().orientationAngle
+
+    def get_shell_orientation(self):
+        return self._get_shell().orientation
+
+    def get_shell_primary_orientation(self):
+        return self._get_shell().primaryOrientation
+
+    def get_shell_native_orientation(self):
+        return self._get_shell().nativeOrientation
+
     @autopilot_logging.log_action(logger.info)
     def wait_for_notification(self):
         """Wait for a notification dialog to appear.

=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
--- tests/autopilot/unity8/shell/tests/__init__.py	2015-04-09 14:00:54 +0000
+++ tests/autopilot/unity8/shell/tests/__init__.py	2015-04-16 12:11:39 +0000
@@ -378,6 +378,8 @@
 
         """
         self._proxy = proxy
+        print("main_window/proxy - # of children: ", len(proxy.get_children()))
+        print("main_window/proxy - properties: ", proxy.get_properties())
         self.addCleanup(self._clear_proxy)
 
     def _clear_proxy(self):

=== added file 'tests/autopilot/unity8/shell/tests/test_rotation.py'
--- tests/autopilot/unity8/shell/tests/test_rotation.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/unity8/shell/tests/test_rotation.py	2015-04-16 12:11:39 +0000
@@ -0,0 +1,134 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Unity Autopilot Test Suite
+# Copyright (C) 2015 Canonical
+#
+# 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+"""Tests for shell-rotation"""
+
+from autopilot.platform import model
+from unity8 import (
+    shell,
+    fixture_setup,
+    indicators,
+    process_helpers
+)
+import os
+from unity8.shell import tests
+import ubuntuuitoolkit
+import logging
+from testtools.matchers import Equals, NotEquals
+from autopilot.matchers import Eventually
+
+logger = logging.getLogger(__name__)
+
+class RotationBase(tests.UnityTestCase):
+    """Base class for all shell-rotation tests that provides helper methods."""
+
+    scenarios = tests._get_device_emulation_scenarios()
+
+    def setUp(self):
+        if model() == 'Desktop':
+            self.skipTest('Test cannot be run on the desktop.')
+        super(RotationBase, self).setUp()
+        self._qml_mock_enabled = False
+        self._data_dirs_mock_enabled = False
+
+    def _assert_change_of_orientation_and_angle(self):
+        tmp_o = self.shell_proxy.orientation
+        tmp_a = self.shell_proxy.orientationAngle
+        self.assertThat(self.orientation, Equals(tmp_o))
+        self.assertThat(self.angle, Equals(tmp_a))
+
+    def test_fake_sensor(self):
+        unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
+        self.useFixture(unity_with_sensors)
+        process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
+        fake_sensors = unity_with_sensors.fake_sensors
+        oriented_shell_proxy = unity_with_sensors.main_win.select_single('OrientedShell')
+
+        fake_sensors.set_orientation_top_up()
+        target_orientation = 1
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(target_orientation), timeout=15))
+
+        fake_sensors.set_orientation_right_up()
+        target_orientation = 8
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(target_orientation), timeout=15))
+
+        fake_sensors.set_orientation_top_down()
+        target_orientation = 4
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(target_orientation), timeout=15))
+
+        fake_sensors.set_orientation_left_up()
+        target_orientation = 2
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(target_orientation), timeout=15))
+
+    def test_rotation_with_webbrowser_app(self):
+        """Do an orientation-change and verify that an app and the shell adapted correctly"""
+
+        unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
+        self.useFixture(unity_with_sensors)
+        process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
+        fake_sensors = unity_with_sensors.fake_sensors
+        oriented_shell_proxy = unity_with_sensors.main_win.select_single('OrientedShell')
+        self.shell_proxy = unity_with_sensors.main_win.select_single('Shell')
+
+        # launch an application
+        self.launch_upstart_application('webbrowser-app')
+        unity_with_sensors.main_win.show_dash_from_launcher()
+        unity_with_sensors.main_win.launch_application('webbrowser-app')
+        self.assertThat(unity_with_sensors.main_win.get_current_focused_app_id(), Eventually(Equals('webbrowser-app')))
+
+        # get default orientation and angle
+        self.orientation = self.shell_proxy.orientation
+        self.angle = self.shell_proxy.orientationAngle
+
+        # check if fake sensors affect orientation and angle
+        fake_sensors.set_orientation_top_up()
+        self.orientation = 1
+        self.angle = 0
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(self.orientation), timeout=15))
+        if (self.orientation & oriented_shell_proxy.supportedOrientations):
+            self._assert_change_of_orientation_and_angle()
+        else:
+            logger.info("unsupported orientation TOP-UP. skipped.")
+
+        fake_sensors.set_orientation_right_up()
+        self.orientation = 8
+        self.angle = 90
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(self.orientation), timeout=15))
+        if (self.orientation & oriented_shell_proxy.supportedOrientations):
+            self._assert_change_of_orientation_and_angle()
+        else:
+            logger.info("unsupported orientation RIGHT-UP. skipped.")
+
+        fake_sensors.set_orientation_top_down()
+        self.orientation = 4
+        self.angle = 180
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(self.orientation), timeout=15))
+        if (self.orientation & oriented_shell_proxy.supportedOrientations):
+            self._assert_change_of_orientation_and_angle()
+        else:
+            logger.info("unsupported orientation TOP-DOWN. skipped.")
+
+        fake_sensors.set_orientation_left_up()
+        self.orientation = 2
+        self.angle = 270
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(self.orientation), timeout=15))
+        if (self.orientation & oriented_shell_proxy.supportedOrientations):
+            self._assert_change_of_orientation_and_angle()
+        else:
+            logger.info("unsupported orientation LEFT-UP. skipped.")

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2014-08-28 23:16:07 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,11 @@
     , m_focused(false)
     , m_fullscreen(false)
     , m_session(0)
+    , m_supportedOrientations(Qt::PortraitOrientation |
+            Qt::LandscapeOrientation |
+            Qt::InvertedPortraitOrientation |
+            Qt::InvertedLandscapeOrientation)
+    , m_rotatesWindowContents(false)
     , m_manualSurfaceCreation(false)
 {
 }
@@ -45,6 +50,11 @@
     , m_focused(false)
     , m_fullscreen(false)
     , m_session(0)
+    , m_supportedOrientations(Qt::PortraitOrientation |
+            Qt::LandscapeOrientation |
+            Qt::InvertedPortraitOrientation |
+            Qt::InvertedLandscapeOrientation)
+    , m_rotatesWindowContents(false)
     , m_manualSurfaceCreation(false)
 {
 }
@@ -99,9 +109,17 @@
 
 void ApplicationInfo::setScreenshotId(const QString &screenshotId)
 {
-    QString screenshotFileName = QString("%1/Dash/graphics/phone/screenshots/[e-mail]")
-            .arg(qmlDirectory())
-            .arg(screenshotId);
+    QString screenshotFileName;
+
+    if (screenshotId.endsWith(".svg")) {
+        screenshotFileName = QString("%1/Dash/graphics/phone/screenshots/%2")
+            .arg(qmlDirectory())
+            .arg(screenshotId);
+    } else {
+        screenshotFileName = QString("%1/Dash/graphics/phone/screenshots/[e-mail]")
+            .arg(qmlDirectory())
+            .arg(screenshotId);
+    }
 
     if (screenshotFileName != m_screenshotFileName) {
         m_screenshotFileName = screenshotFileName;
@@ -145,6 +163,9 @@
 
         if (!m_manualSurfaceCreation && m_state == ApplicationInfo::Running) {
             QTimer::singleShot(500, this, SLOT(createSession()));
+        } else if (m_state == ApplicationInfo::Stopped) {
+            delete m_session;
+            m_session = nullptr;
         }
     }
 }
@@ -172,3 +193,23 @@
         Q_EMIT manualSurfaceCreationChanged(value);
     }
 }
+
+Qt::ScreenOrientations ApplicationInfo::supportedOrientations() const
+{
+    return m_supportedOrientations;
+}
+
+void ApplicationInfo::setSupportedOrientations(Qt::ScreenOrientations orientations)
+{
+    m_supportedOrientations = orientations;
+}
+
+bool ApplicationInfo::rotatesWindowContents() const
+{
+    return m_rotatesWindowContents;
+}
+
+void ApplicationInfo::setRotatesWindowContents(bool value)
+{
+    m_rotatesWindowContents = value;
+}

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
--- tests/mocks/Unity/Application/ApplicationInfo.h	2014-09-15 19:05:32 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -80,6 +80,12 @@
     void setFullscreen(bool value);
     bool fullscreen() const { return m_fullscreen; }
 
+    Qt::ScreenOrientations supportedOrientations() const override;
+    void setSupportedOrientations(Qt::ScreenOrientations orientations);
+
+    bool rotatesWindowContents() const override;
+    void setRotatesWindowContents(bool value);
+
     bool manualSurfaceCreation() const { return m_manualSurfaceCreation; }
     void setManualSurfaceCreation(bool value);
 
@@ -108,6 +114,8 @@
     bool m_focused;
     bool m_fullscreen;
     Session* m_session;
+    Qt::ScreenOrientations m_supportedOrientations;
+    bool m_rotatesWindowContents;
 
     bool m_manualSurfaceCreation;
 };

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2015-03-10 14:25:12 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 Canonical, Ltd.
+ * Copyright (C) 2013-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -348,6 +348,13 @@
 
 void ApplicationManager::buildListOfAvailableApplications()
 {
+    /*
+        ATTENTION!
+        Be careful when changing application properties here as some qmltests
+        rely on them being the way it's specified here (e.g. that camera-app
+        is fullscreen, that twitter-webapp can rotate in all directions, etc)
+     */
+
     ApplicationInfo *application;
 
     application = new ApplicationInfo(this);
@@ -355,6 +362,7 @@
     application->setName("Unity 8 Mock Dash");
     application->setScreenshotId("unity8-dash");
     application->setStage(ApplicationInfo::MainStage);
+    application->setSupportedOrientations(Qt::PrimaryOrientation);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
@@ -363,6 +371,8 @@
     application->setScreenshotId("dialer");
     application->setIconId("dialer-app");
     application->setStage(ApplicationInfo::SideStage);
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::InvertedPortraitOrientation);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
@@ -371,6 +381,11 @@
     application->setScreenshotId("camera");
     application->setIconId("camera");
     application->setFullscreen(true);
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::LandscapeOrientation
+                                        | Qt::InvertedPortraitOrientation
+                                        | Qt::InvertedLandscapeOrientation);
+    application->setRotatesWindowContents(true);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
@@ -416,13 +431,35 @@
     application->setAppId("gmail-webapp");
     application->setName("GMail");
     application->setIconId("gmail");
+    application->setScreenshotId("gmail-webapp.svg");
+    application->setFullscreen(false);
+    application->setStage(ApplicationInfo::MainStage);
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::LandscapeOrientation
+                                        | Qt::InvertedPortraitOrientation
+                                        | Qt::InvertedLandscapeOrientation);
+    m_availableApplications.append(application);
+
+    application = new ApplicationInfo(this);
+    application->setAppId("music-app");
+    application->setName("Music");
+    application->setIconId("soundcloud");
+    application->setScreenshotId("music");
+    application->setFullscreen(false);
+    application->setStage(ApplicationInfo::MainStage);
+    application->setSupportedOrientations(Qt::PortraitOrientation
+                                        | Qt::LandscapeOrientation
+                                        | Qt::InvertedPortraitOrientation
+                                        | Qt::InvertedLandscapeOrientation);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);
     application->setAppId("ubuntu-weather-app");
     application->setName("Weather");
     application->setIconId("weather");
-    application->setStage(ApplicationInfo::SideStage);
+    application->setScreenshotId("ubuntu-weather-app.svg");
+    application->setSupportedOrientations(Qt::LandscapeOrientation
+                                        | Qt::InvertedLandscapeOrientation);
     m_availableApplications.append(application);
 
     application = new ApplicationInfo(this);

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2014-10-06 15:45:25 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2015-04-16 12:11:39 +0000
@@ -1,4 +1,6 @@
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
+include_directories(
+  ${APPLICATION_API_INCLUDE_DIRS}
+)
 
 set(FakeUnityApplicationQml_SOURCES
     plugin.cpp
@@ -14,6 +16,7 @@
     SurfaceManager.cpp
     SessionModel.h
     UbuntuKeyboardInfo.cpp
+    VirtualKeyboard.cpp
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
 )

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-03-12 14:45:44 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-04-16 12:11:39 +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
@@ -39,14 +39,12 @@
     , m_type(type)
     , m_state(state)
     , m_live(true)
-    , m_orientation(Qt::PortraitOrientation)
+    , m_orientationAngle(Angle0)
+    , m_qmlItem(nullptr)
+    , m_screenshotUrl(screenshot)
     , m_touchPressCount(0)
     , m_touchReleaseCount(0)
-    , m_qmlItem(nullptr)
-    , m_screenshotUrl(screenshot)
 {
-    qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();
-
     setAcceptedMouseButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton |
         Qt::ExtraButton1 | Qt::ExtraButton2 | Qt::ExtraButton3 | Qt::ExtraButton4 |
         Qt::ExtraButton5 | Qt::ExtraButton6 | Qt::ExtraButton7 | Qt::ExtraButton8 |
@@ -55,9 +53,6 @@
 
     QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
 
-    connect(this, &QQuickItem::focusChanged,
-            this, &MirSurfaceItem::onFocusChanged);
-
     // The assumptions I make here really should hold.
     QQuickView *quickView =
         qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);
@@ -117,17 +112,17 @@
     }
 }
 
-void MirSurfaceItem::setOrientation(const Qt::ScreenOrientation orientation)
+void MirSurfaceItem::setOrientationAngle(OrientationAngle angle)
 {
-    if (m_orientation == orientation)
+    if (m_orientationAngle == angle)
         return;
 
-    m_orientation = orientation;
-
-    QQmlProperty orientationProp(m_qmlItem, "orientation");
-    orientationProp.write(QVariant::fromValue(orientation));
-
-    Q_EMIT orientationChanged();
+    m_orientationAngle = angle;
+
+    QQmlProperty orientationProp(m_qmlItem, "orientationAngle");
+    orientationProp.write(QVariant::fromValue(m_orientationAngle));
+
+    Q_EMIT orientationAngleChanged(m_orientationAngle);
 }
 
 void MirSurfaceItem::setSession(Session* session)
@@ -152,15 +147,6 @@
     }
 }
 
-void MirSurfaceItem::onFocusChanged()
-{
-    if (!hasFocus()) {
-        // Causes a crash in tst_Shell.qml, inside the mock Unity.Application itself.
-        // Didn't have time to debug yet.
-        //Q_EMIT inputMethodDismissed();
-    }
-}
-
 void MirSurfaceItem::setState(MirSurfaceItem::State newState)
 {
     if (newState != m_state) {
@@ -197,9 +183,6 @@
     if (event->touchPointStates() & Qt::TouchPointPressed) {
         ++m_touchPressCount;
         Q_EMIT touchPressCountChanged(m_touchPressCount);
-        // Causes a crash in tst_Shell.qml, inside the mock Unity.Application itself.
-        // Didn't have time to debug yet.
-        // Q_EMIT inputMethodRequested();
     } else if (event->touchPointStates() & Qt::TouchPointReleased) {
         ++m_touchReleaseCount;
         Q_EMIT touchReleaseCountChanged(m_touchReleaseCount);

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2015-03-12 14:45:44 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2015-04-16 12:11:39 +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
@@ -29,17 +29,18 @@
     Q_OBJECT
     Q_ENUMS(Type)
     Q_ENUMS(State)
+    Q_ENUMS(OrientationAngle)
 
     Q_PROPERTY(Type type READ type NOTIFY typeChanged)
     Q_PROPERTY(State state READ state NOTIFY stateChanged)
     Q_PROPERTY(QString name READ name CONSTANT)
     Q_PROPERTY(bool live READ live NOTIFY liveChanged)
-    Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged DESIGNABLE false)
-
-    Q_PROPERTY(int touchPressCount READ touchPressCount WRITE setTouchPressCount NOTIFY touchPressCountChanged
-                                   DESIGNABLE false)
-    Q_PROPERTY(int touchReleaseCount READ touchReleaseCount WRITE setTouchReleaseCount NOTIFY touchReleaseCountChanged
-                                     DESIGNABLE false)
+    Q_PROPERTY(OrientationAngle orientationAngle READ orientationAngle WRITE setOrientationAngle
+               NOTIFY orientationAngleChanged DESIGNABLE false)
+    Q_PROPERTY(int touchPressCount READ touchPressCount WRITE setTouchPressCount
+                                   NOTIFY touchPressCountChanged DESIGNABLE false)
+    Q_PROPERTY(int touchReleaseCount READ touchReleaseCount WRITE setTouchReleaseCount
+                                     NOTIFY touchReleaseCountChanged DESIGNABLE false)
 
 public:
     enum Type {
@@ -62,6 +63,13 @@
         Fullscreen,
     };
 
+    enum OrientationAngle {
+        Angle0 = 0,
+        Angle90 = 90,
+        Angle180 = 180,
+        Angle270 = 270
+    };
+
     ~MirSurfaceItem();
 
     //getters
@@ -70,9 +78,9 @@
     State state() const { return m_state; }
     QString name() const { return m_name; }
     bool live() const { return m_live; }
-    Qt::ScreenOrientation orientation() const { return m_orientation; }
+    OrientationAngle orientationAngle() const { return m_orientationAngle; }
 
-    void setOrientation(const Qt::ScreenOrientation orientation);
+    void setOrientationAngle(OrientationAngle angle);
 
     void setSession(Session* item);
     void setScreenshot(const QUrl& screenshot);
@@ -91,29 +99,14 @@
     void typeChanged(Type);
     void stateChanged(State);
     void liveChanged(bool live);
-    void orientationChanged();
+    void orientationAngleChanged(OrientationAngle angle);
     void touchPressCountChanged(int count);
     void touchReleaseCountChanged(int count);
 
-    void inputMethodRequested();
-    void inputMethodDismissed();
-
     // internal mock use
     void deregister();
 
 protected:
-    void touchEvent(QTouchEvent * event) override;
-
-    // becaue the default implementation ignores the events
-    void mousePressEvent(QMouseEvent *) override {}
-    void mouseMoveEvent(QMouseEvent *) override {}
-    void mouseReleaseEvent(QMouseEvent *) override {}
-
-private Q_SLOTS:
-    void onFocusChanged();
-    void onComponentStatusChanged(QQmlComponent::Status status);
-
-private:
     explicit MirSurfaceItem(const QString& name,
                             Type type,
                             State state,
@@ -121,6 +114,12 @@
                             const QString &qmlFilePath = QString(),
                             QQuickItem *parent = 0);
 
+    void touchEvent(QTouchEvent * event) override;
+
+private Q_SLOTS:
+    void onComponentStatusChanged(QQmlComponent::Status status);
+
+private:
     void createQmlContentItem();
     void printComponentErrors();
 
@@ -129,19 +128,20 @@
     const Type m_type;
     State m_state;
     bool m_live;
-    Qt::ScreenOrientation m_orientation;
-    int m_touchPressCount;
-    int m_touchReleaseCount;
+    OrientationAngle  m_orientationAngle;
 
     QQmlComponent *m_qmlContentComponent;
     QQuickItem *m_qmlItem;
     QUrl m_screenshotUrl;
 
+    int m_touchPressCount;
+    int m_touchReleaseCount;
+
     friend class SurfaceManager;
 };
 
 Q_DECLARE_METATYPE(MirSurfaceItem*)
 Q_DECLARE_METATYPE(QList<MirSurfaceItem*>)
-Q_DECLARE_METATYPE(Qt::ScreenOrientation)
+Q_DECLARE_METATYPE(MirSurfaceItem::OrientationAngle)
 
 #endif // MIRSURFACEITEM_H

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.qml'
--- tests/mocks/Unity/Application/MirSurfaceItem.qml	2015-01-28 12:59:21 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.qml	2015-04-16 12:11:39 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -23,19 +23,11 @@
     implicitWidth: units.gu(40)
     implicitHeight: units.gu(70)
 
-    rotation: {
-        if (orientation == Qt.PortraitOrientation) return 0;
-        else if (orientation == Qt.LandscapeOrientation) return 90;
-        else if (orientation == Qt.InvertedPortraitOrientation) return 180;
-        else return 270;
-    }
-    x: parent ? (parent.width - width) / 2 : 0
-    y: parent ? (parent.height - height) / 2 : 0
-    width: parent ? (rotation == 0 || rotation == 180 ? parent.width : parent.height) : implicitWidth
-    height: parent ? (rotation == 0 || rotation == 180 ? parent.height : parent.width) : implicitHeight
+    width: parent ? parent.width : implicitWidth
+    height: parent ? parent.height : implicitHeight
 
     property alias screenshotSource: screenshotImage.source
-    property int orientation: Qt.PortraitOrientation
+    property int orientationAngle
 
     Image {
         id: screenshotImage
@@ -50,6 +42,7 @@
         fontSizeMode: Text.Fit
         minimumPixelSize: 10
         verticalAlignment: Text.AlignVCenter
+        rotation: surfaceText.rotation
         x: surfaceText.x
         y: surfaceText.y
         width: surfaceText.width
@@ -59,12 +52,17 @@
     }
     Text {
         id: surfaceText
-        anchors.fill: parent
-        text: "SURFACE"
+        text: "SURFACE " + root.width + "," + root.height
         color: root.parent && root.parent.activeFocus ? "yellow" : "blue"
         font.bold: true
         fontSizeMode: Text.Fit
         minimumPixelSize: 10; font.pixelSize: 200
         verticalAlignment: Text.AlignVCenter
+
+        rotation: root.orientationAngle
+        x: (parent.width - width) / 2
+        y: (parent.height - height) / 2
+        width: (rotation == 0 || rotation == 180 ? parent.width : parent.height)
+        height:(rotation == 0 || rotation == 180 ? parent.height : parent.width)
     }
 }

=== modified file 'tests/mocks/Unity/Application/SurfaceManager.cpp'
--- tests/mocks/Unity/Application/SurfaceManager.cpp	2014-08-29 14:50:49 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.cpp	2015-04-16 12:11:39 +0000
@@ -16,8 +16,9 @@
 
 #include "SurfaceManager.h"
 
+#include "VirtualKeyboard.h"
+
 #include <paths.h>
-#include "MirSurfaceItem.h"
 
 SurfaceManager *SurfaceManager::the_surface_manager = nullptr;
 
@@ -40,10 +41,7 @@
                                               MirSurfaceItem::State state,
                                               const QUrl& screenshot)
 {
-    MirSurfaceItem* surface = new MirSurfaceItem(name,
-                                       type,
-                                       state,
-                                       screenshot);
+    MirSurfaceItem* surface = new MirSurfaceItem(name, type, state, screenshot);
     Q_EMIT surfaceCreated(surface);
     return surface;
 }
@@ -57,40 +55,12 @@
         surface->setLive(false);
         Q_EMIT surfaceDestroyed(surface);
     });
-    connect(surface, &MirSurfaceItem::inputMethodRequested,
-            this, &SurfaceManager::showInputMethod);
-    connect(surface, &MirSurfaceItem::inputMethodDismissed,
-            this, &SurfaceManager::hideInputMethod);
-}
-
-void SurfaceManager::showInputMethod()
-{
-    inputMethodSurface()->setState(MirSurfaceItem::Restored);
-}
-
-void SurfaceManager::hideInputMethod()
-{
-    if (m_virtualKeyboard) {
-        m_virtualKeyboard->setState(MirSurfaceItem::Minimized);
-    }
 }
 
 MirSurfaceItem *SurfaceManager::inputMethodSurface()
 {
     if (!m_virtualKeyboard) {
-
-        QString screenshotPath = QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")
-            .arg(qmlDirectory());
-
-        QString qmlFilePath = QString("%1/Unity/Application/VirtualKeyboard.qml")
-            .arg(mockPluginsDir());
-
-        m_virtualKeyboard = new MirSurfaceItem(
-                "input-method",
-                MirSurfaceItem::InputMethod,
-                MirSurfaceItem::Minimized,
-                screenshotPath,
-                qmlFilePath);
+        m_virtualKeyboard = new VirtualKeyboard;
         Q_EMIT surfaceCreated(m_virtualKeyboard);
     }
     return m_virtualKeyboard;

=== modified file 'tests/mocks/Unity/Application/SurfaceManager.h'
--- tests/mocks/Unity/Application/SurfaceManager.h	2014-08-28 23:16:07 +0000
+++ tests/mocks/Unity/Application/SurfaceManager.h	2015-04-16 12:11:39 +0000
@@ -20,6 +20,7 @@
 #include <QObject>
 
 #include "MirSurfaceItem.h"
+#include "VirtualKeyboard.h"
 
 class SurfaceManager : public QObject
 {
@@ -45,13 +46,9 @@
     void surfaceCreated(MirSurfaceItem *surface);
     void surfaceDestroyed(MirSurfaceItem *surface);
 
-private Q_SLOTS:
-    void showInputMethod();