Unity 8

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

externalMonitor
Merge into trunk

Proposed by Michał Sawicz on 2015-10-08

Status:	Merged
Approved by:	Gerry Boland on 2015-10-21
Approved revision:	2007
Merged at revision:	2008
Proposed branch:	lp:~unity-team/unity8/externalMonitor
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/mousePointer
Diff against target:	1322 lines (+748/-169) 29 files modified debian/unity8.install (+1/-0) qml/Components/WallpaperResolver.qml (+63/-0) qml/DeviceConfiguration.qml (+1/-0) qml/DisabledScreenNotice.qml (+49/-0) qml/Notifications/Notification.qml (+2/-0) qml/Notifications/NotificationMenuItemFactory.qml (+2/-1) qml/Notifications/Notifications.qml (+2/-0) qml/OrientedShell.qml (+10/-1) qml/Rotation/RotationStates.qml (+2/-2) qml/Shell.qml (+9/-32) src/ApplicationArguments.h (+10/-2) src/CMakeLists.txt (+3/-0) src/SecondaryWindow.cpp (+31/-0) src/SecondaryWindow.h (+30/-0) src/ShellApplication.cpp (+197/-0) src/ShellApplication.h (+55/-0) src/ShellView.cpp (+59/-0) src/ShellView.h (+34/-0) src/main.cpp (+4/-101) tests/autopilot/unity8/fixture_setup.py (+1/-1) tests/autopilot/unity8/greeter/tests/__init__.py (+1/-1) tests/autopilot/unity8/launcher.py (+1/-1) tests/autopilot/unity8/shell/__init__.py (+1/-1) tests/autopilot/unity8/shell/tests/__init__.py (+1/-1) tests/qmltests/CMakeLists.txt (+2/-0) tests/qmltests/Components/tst_WallpaperResolver.qml (+89/-0) tests/qmltests/tst_DisabledScreenNotice.qml (+37/-0) tests/qmltests/tst_OrientedShell.qml (+51/-1) tests/qmltests/tst_Shell.qml (+0/-24)
To merge this branch:	bzr merge lp:~unity-team/unity8/externalMonitor
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland		2015-10-08	Approve on 2015-10-21
PS Jenkins bot	continuous-integration	2015-10-08	Needs Fixing on 2015-10-20
Michał Sawicz			Pending
Lukáš Tinkl		2015-10-08	Pending
Review via email: mp+273829@code.launchpad.net

This proposal supersedes a proposal from 2015-10-05.

Commit Message

Initial multi-monitor support

When an external screen appears, move the shell to it

Description of the Change

Works best on a laptop.

Known issues:
- Input events come at very irregular intervals (if at all) when an external monitor is connected to a phone or tablet. Works fine on a laptop connected to an external monitor.

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~unity-team/qtmir/multimonitorNext/+merge/274516

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes. Works fine on laptops/desktops. On phones you can get mixed results due to known Mir bugs.

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

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

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

PS Jenkins bot (ps-jenkins) wrote on 2015-10-03: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-05: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2015-10-05: Posted in a previous version of this proposal

I tried this on a Nexus 7, here's my results:
- with my monitor it takes a significant amount of time to switch (like 30-40s) when the device seems locked up, the external screen switches modes back and forth
- only settled down with my TV cold-plugged, hotplugging worked after that, too
- external and internal screens are swapped (I get the splash screen over HDMI)
- touch doesn't work on the internal screen, where the UI is displayed
- splash screen doesn't fill the whole screen (resolution is reported correctly)
- if I can see correctly, the whole shell is reinitialized when switching, that might explain some of the delay

Trying on Nexus 4 now, will report back soon.

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-10-05: Posted in a previous version of this proposal

> I tried this on a Nexus 7, here's my results:
> - with my monitor it takes a significant amount of time to switch (like
> 30-40s) when the device seems locked up, the external screen switches modes
> back and forth
> - only settled down with my TV cold-plugged, hotplugging worked after that,
> too
> - external and internal screens are swapped (I get the splash screen over
> HDMI)
> - touch doesn't work on the internal screen, where the UI is displayed
> - splash screen doesn't fill the whole screen (resolution is reported
> correctly)
> - if I can see correctly, the whole shell is reinitialized when switching,
> that might explain some of the delay
>
> Trying on Nexus 4 now, will report back soon.

You likely missing https://code.launchpad.net/~dandrader/qtmir/multimonitorNext/+merge/273303

Gerry Boland (gerboland) wrote on 2015-10-05: Posted in a previous version of this proposal

Note also, current Mir has multimonitor stability & functionality issues. USC is crashy on hot plug, and brings down unity8 with it. Touch input broken is also Mir issue.

Gerry Boland (gerboland) wrote on 2015-10-05: Posted in a previous version of this proposal

"SecondaryDisplay" not a name I like. Qt uses the term: "Screen", never "Display". Also it's more than a secondary screen, it has actual purpose. How about "DisabledScreenSplash" ? It's just inevitable we'll rename it when we do more advanced MM stuff.

"BackgroundResolver" - since the term "background" is heavily loaded, could this be renamed to "BackgroundImageResolver" or "WallpaperResolver"?

Did design really want the user's personal wallpaper to be used as background on the 'secondary' screen?

+++ qml/Components/BackgroundResolver.qml
+ /*
+ Users should set their UI width here.
+ */
+ property real width
Shell.qml prefers using "//" for multiline comments. Dunno if there's a standard.
What uses "width" in here?

+++ src/SecondaryWindow.cpp
+ setTitle(QStringLiteral("Unity8 Shell - Secundary Screen"));
typo
Am surprised you not inheriting QQuickWindow, but if that's all you need, great!

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-10-05: Posted in a previous version of this proposal

On 05/10/2015 11:46, Gerry Boland wrote:
> Review: Needs Fixing
>
> "SecondaryDisplay" not a name I like. Qt uses the term: "Screen", never "Display". Also it's more than a secondary screen, it has actual purpose. How about "DisabledScreenSplash" ? It's just inevitable we'll rename it when we do more advanced MM stuff.

Renamed to DisabledScreenNotice.qml

> "BackgroundResolver" - since the term "background" is heavily loaded, could this be renamed to "BackgroundImageResolver" or "WallpaperResolver"?

Renamed to WallpaperResolver

> Did design really want the user's personal wallpaper to be used as background on the 'secondary' screen?

This didn't go through design at all. I don't see what's the problem
with using the background image there. This is just a placeholder for
the first iteration of multimonitor support anyway.

>
> +++ qml/Components/BackgroundResolver.qml
> + /*
> + Users should set their UI width here.
> + */
> + property real width
> Shell.qml prefers using "//" for multiline comments. Dunno if there's a standard.
> What uses "width" in here?

Done.

>
>
> +++ src/SecondaryWindow.cpp
> + setTitle(QStringLiteral("Unity8 Shell - Secundary Screen"));
> typo
> Am surprised you not inheriting QQuickWindow, but if that's all you need, great!
>

QQuickView inherits QQuickWindow.

PS Jenkins bot (ps-jenkins) wrote on 2015-10-05: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-05: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2015-10-07: Posted in a previous version of this proposal

+ property var _asImageTester: Image {
49 + id: asImageTester
50 + source: "Adas"//AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : ""

Looks like a typo here

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2015-10-07: Posted in a previous version of this proposal

On 07/10/2015 07:46, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> + property var _asImageTester: Image {
> 49 + id: asImageTester
> 50 + source: "Adas"//AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : ""
>
> Looks like a typo here

Fixed. Thanks.

PS Jenkins bot (ps-jenkins) wrote on 2015-10-07: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Gerry Boland (gerboland) wrote on 2015-10-08: Posted in a previous version of this proposal

> > Did design really want the user's personal wallpaper to be used as
> background on the 'secondary' screen?
>
> This didn't go through design at all. I don't see what's the problem
> with using the background image there. This is just a placeholder for
> the first iteration of multimonitor support anyway.

Fair enough

> >
> > +++ src/SecondaryWindow.cpp
> > + setTitle(QStringLiteral("Unity8 Shell - Secundary Screen"));
> > typo
> > Am surprised you not inheriting QQuickWindow, but if that's all you need,
> great!
> >
> QQuickView inherits QQuickWindow.
Ah, I always think it is the other way around.

Lukáš Tinkl (lukas-kde) wrote on 2015-10-08: Posted in a previous version of this proposal

Text conflict in CMakeLists.txt

review: Needs Fixing

Michał Sawicz (saviq) wrote on 2015-10-08: Posted in a previous version of this proposal

W dniu 08.10.2015 o 14:38, Lukáš Tinkl pisze:
> Text conflict in CMakeLists.txt
Fixed (resubmitted on top of the right branch and merged).

PS Jenkins bot (ps-jenkins) wrote on 2015-10-08:

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

review: Needs Fixing (continuous-integration)

Gerry Boland (gerboland) wrote on 2015-10-09:

No further code complaints. Testing in silo22, this is working as well as it can.

review: Approve

Gerry Boland (gerboland) wrote on 2015-10-20:

m_qmlEngine is not being deleted anywhere, I think is reason for hang.

Found a bug on desktop - for single monitor case, keyboard events not being delivered to any QWindow. You need to call
m_shellView->requestActivate();
for it.

review: Needs Fixing

lp:~unity-team/unity8/externalMonitor updated on 2015-10-20

2007. By Daniel d'Andrada on 2015-10-20: Some more deletions

PS Jenkins bot (ps-jenkins) wrote on 2015-10-20:

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-10-20:

On 20/10/2015 14:02, Gerry Boland wrote:
> Review: Needs Fixing
>
> m_qmlEngine is not being deleted anywhere, I think is reason for hang.

Done.

>
> Found a bug on desktop - for single monitor case, keyboard events not being delivered to any QWindow. You need to call
> m_shellView->requestActivate();
> for it.

Can't reproduce it on my laptop. m_shellView->showFullScreen()
internally calls m_shellView->requestActivate(). Or is that after
connecting and disconnecting a monitor? Need more info...

PS Jenkins bot (ps-jenkins) wrote on 2015-10-20:

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

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2015-10-20:

> On 20/10/2015 14:02, Gerry Boland wrote:
> > Review: Needs Fixing
> >
> > m_qmlEngine is not being deleted anywhere, I think is reason for hang.
>
> Done.
>
> >
> > Found a bug on desktop - for single monitor case, keyboard events not being
> delivered to any QWindow. You need to call
> > m_shellView->requestActivate();
> > for it.
>
> Can't reproduce it on my laptop. m_shellView->showFullScreen()
> internally calls m_shellView->requestActivate(). Or is that after
> connecting and disconnecting a monitor? Need more info...

Used lp:~unity-team/unity8/req-445 and lp:~unity-team/qtmir/req-445 and still can't reproduce it on my laptop.

Michał Sawicz (saviq) wrote on 2015-10-20:

> > On 20/10/2015 14:02, Gerry Boland wrote:
> > > Found a bug on desktop - for single monitor case, keyboard events not
> being
> > delivered to any QWindow. You need to call
> > > m_shellView->requestActivate();
> > > for it.
> >
> > Can't reproduce it on my laptop. m_shellView->showFullScreen()
> > internally calls m_shellView->requestActivate(). Or is that after
> > connecting and disconnecting a monitor? Need more info...
>
> Used lp:~unity-team/unity8/req-445 and lp:~unity-team/qtmir/req-445 and still
> can't reproduce it on my laptop.

Me either, silo 22 works quite fine here.

Gerry Boland (gerboland) wrote on 2015-10-21:

Yep, I must have had old package or something. All good for me now.

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/unity8.install'
 --- debian/unity8.install	2015-10-01 13:10:32 +0000
 +++ debian/unity8.install	2015-10-20 16:45:46 +0000
@@ -12,6 +12,7 @@
  usr/share/unity8/Rotation
  usr/share/unity8/DeviceConfiguration.qml
  usr/share/unity8/OrientedShell.qml
++usr/share/unity8/DisabledScreenNotice.qml
  usr/share/unity8/Shell.qml
  usr/share/unity8/Stages
  usr/share/unity8/Tutorial
 === added file 'qml/Components/WallpaperResolver.qml'
 --- qml/Components/WallpaperResolver.qml	1970-01-01 00:00:00 +0000
 +++ qml/Components/WallpaperResolver.qml	2015-10-20 16:45:46 +0000
@@ -0,0 +1,63 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import AccountsService 0.1
++import GSettings 1.0
++import Ubuntu.Components 1.3
++
++/*
++    Defines the background URL based on several factors, such as:
++        - default, fallback, background
++        - Background set in AccountSettings, if any
++        - Background set in GSettings, if any
++ */
++QtObject {
++    // Users should set their UI width here.
++    property real width
++
++    property url defaultBackground: Qt.resolvedUrl(width >= units.gu(60) ? "../graphics/tablet_background.jpg"
++                                                                         : "../graphics/phone_background.jpg")
++
++    // That's the property users of this component are going to consume.
++    readonly property url background: asImageTester.status == Image.Ready ? asImageTester.source
++                                    : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
++
++    // This is a dummy image to detect if the custom AS set wallpaper loads successfully.
++    property var _asImageTester: Image {
++        id: asImageTester
++        source: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : ""
++        height: 0
++        width: 0
++        sourceSize.height: 0
++        sourceSize.width: 0
++    }
++
++    // This is a dummy image to detect if the custom GSettings set wallpaper loads successfully.
++    property var _gsImageTester: Image {
++        id: gsImageTester
++        source: backgroundSettings.pictureUri && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : ""
++        height: 0
++        width: 0
++        sourceSize.height: 0
++        sourceSize.width: 0
++    }
++
++    property var _gsettings: GSettings {
++        id: backgroundSettings
++        schema.id: "org.gnome.desktop.background"
++    }
++}
 === modified file 'qml/DeviceConfiguration.qml'
 --- qml/DeviceConfiguration.qml	2015-07-01 17:52:34 +0000
 +++ qml/DeviceConfiguration.qml	2015-10-20 16:45:46 +0000
@@ -86,6 +86,7 @@
              PropertyChanges {
                  target: root
                  category: "desktop"
++                supportedOrientations: root.useNativeOrientation
+             }
+         }
+     ]
 === added file 'qml/DisabledScreenNotice.qml'
 --- qml/DisabledScreenNotice.qml	1970-01-01 00:00:00 +0000
 +++ qml/DisabledScreenNotice.qml	2015-10-20 16:45:46 +0000
@@ -0,0 +1,49 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Ubuntu.Components 1.3
++import "Components"
++
++Image {
++    id: root
++
++    WallpaperResolver {
++        width: root.width
++        id: wallpaperResolver
++    }
++
++    source: wallpaperResolver.background
++
++    UbuntuShape {
++        anchors.fill: text
++        anchors.margins: -units.gu(2)
++        backgroundColor: "black"
++        opacity: 0.4
++    }
++
++    Label {
++        id: text
++        anchors.centerIn: parent
++        width: parent.width / 2
++        text: i18n.tr("Your device is now connected to an external display.")
++        color: "white"
++        horizontalAlignment: Text.AlignHCenter
++        verticalAlignment: Text.AlignVCenter
++        fontSize: "x-large"
++        wrapMode: Text.Wrap
++    }
++}
 === modified file 'qml/Notifications/Notification.qml'
 --- qml/Notifications/Notification.qml	2015-10-08 19:30:59 +0000
 +++ qml/Notifications/Notification.qml	2015-10-20 16:45:46 +0000
@@ -50,6 +50,7 @@
      readonly property real contentSpacing: units.gu(2)
      readonly property bool canBeClosed: type === Notification.Ephemeral
      property bool hasMouse
++    property url background: ""
      objectName: "background"
      implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : outterColumn.height - shapedBack.anchors.topMargin + contentSpacing * 2) : 0
@@ -401,6 +402,7 @@
                          menuData: model
                          menuIndex: index
                          maxHeight: notification.maxHeight
++                        background: notification.background
                          onLoaded: {
                              notification.fullscreen = Qt.binding(function() { return fullscreen; });
 === modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
 --- qml/Notifications/NotificationMenuItemFactory.qml	2014-11-17 13:46:56 +0000
 +++ qml/Notifications/NotificationMenuItemFactory.qml	2015-10-20 16:45:46 +0000
@@ -30,6 +30,7 @@
      property int menuIndex : -1
      property int maxHeight
      readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"
++    property url background: ""
      signal accepted()
@@ -149,7 +150,7 @@
              infoText: notification.summary
              errorText: errorAction.valid ? errorAction.state : ""
              retryText: notification.body
--            background: shell.background
++            background: menuFactory.background
              darkenBackground: 0.4
              onEntered: {
 === modified file 'qml/Notifications/Notifications.qml'
 --- qml/Notifications/Notifications.qml	2015-09-22 14:23:44 +0000
 +++ qml/Notifications/Notifications.qml	2015-10-20 16:45:46 +0000
@@ -29,6 +29,7 @@
      property real margin
      property bool useModal: snapDecisionProxyModel.count > 0
      property bool hasMouse
++    property url background: ""
      UnitySortFilterProxyModel {
          id: snapDecisionProxyModel
@@ -60,6 +61,7 @@
          maxHeight: notificationList.height
          margins: notificationList.margin
          hasMouse: notificationList.hasMouse
++        background: notificationList.background
          // make sure there's no opacity-difference between the several
          // elements in a notification
 === modified file 'qml/OrientedShell.qml'
 --- qml/OrientedShell.qml	2015-09-22 14:23:44 +0000
 +++ qml/OrientedShell.qml	2015-10-20 16:45:46 +0000
@@ -76,6 +76,12 @@
          oskSettings.disableHeight = shell.usageScenario == "desktop"
+     }
++    // we must rotate to a supported orientation regardless of shell's preference
++    property bool orientationChangesEnabled:
++        (orientation & supportedOrientations) === 0 ? true
++                                                    : shell.orientationChangesEnabled
++
++
      Binding {
          target: oskSettings
          property: "stayHidden"
@@ -89,7 +95,10 @@
+     }
      readonly property int supportedOrientations: shell.supportedOrientations
--                                               & deviceConfiguration.supportedOrientations
++        & (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation
++                ? nativeOrientation
++                : deviceConfiguration.supportedOrientations)
++
      property int acceptedOrientationAngle: {
          if (orientation & supportedOrientations) {
              return Screen.angleBetween(nativeOrientation, orientation);
 === modified file 'qml/Rotation/RotationStates.qml'
 --- qml/Rotation/RotationStates.qml	2015-05-11 14:36:03 +0000
 +++ qml/Rotation/RotationStates.qml	2015-10-20 16:45:46 +0000
@@ -83,7 +83,7 @@
+         }
          function tryUpdateState() {
--            if (d.transitioning || (!d.startingUp && !root.shell.orientationChangesEnabled)) {
++            if (d.transitioning || (!d.startingUp && !root.orientedShell.orientationChangesEnabled)) {
                  return;
+             }
@@ -95,7 +95,7 @@
+         }
          property Connections shellConnections: Connections {
--            target: root.shell
++            target: root.orientedShell
              onOrientationChangesEnabledChanged: {
                  d.tryUpdateState();
+             }
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2015-10-20 16:45:46 +0000
 +++ qml/Shell.qml	2015-10-20 16:45:46 +0000
@@ -17,7 +17,6 @@
  import QtQuick 2.0
  import QtQuick.Window 2.0
  import AccountsService 0.1
--import GSettings 1.0
  import Unity.Application 0.1
  import Ubuntu.Components 0.1
  import Ubuntu.Components.Popups 1.0
@@ -108,9 +107,11 @@
      enabled: greeter && !greeter.waiting
      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
++
++    WallpaperResolver {
++        id: wallpaperResolver
++        width: shell.width
++    }
      readonly property alias greeter: greeterLoader.item
@@ -131,31 +132,6 @@
          shell.activateApplication(app);
+     }
--    // This is a dummy image to detect if the custom AS set wallpaper loads successfully.
--    Image {
--        id: asImageTester
--        source: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : ""
--        height: 0
--        width: 0
--        sourceSize.height: 0
--        sourceSize.width: 0
--    }
--
--    GSettings {
--        id: backgroundSettings
--        schema.id: "org.gnome.desktop.background"
--    }
--
--    // This is a dummy image to detect if the custom GSettings set wallpaper loads successfully.
--    Image {
--        id: gsImageTester
--        source: backgroundSettings.pictureUri && backgroundSettings.pictureUri.length > 0 ? backgroundSettings.pictureUri : ""
--        height: 0
--        width: 0
--        sourceSize.height: 0
--        sourceSize.width: 0
--    }
--
      Binding {
          target: LauncherModel
          property: "applicationManager"
@@ -323,7 +299,7 @@
              Binding {
                  target: applicationsDisplayLoader.item
                  property: "background"
--                value: shell.background
++                value: wallpaperResolver.background
+             }
              Binding {
                  target: applicationsDisplayLoader.item
@@ -428,7 +404,7 @@
              tabletMode: shell.usageScenario != "phone"
              launcherOffset: launcher.progress
              forcedUnlock: tutorial.running
--            background: shell.background
++            background: wallpaperResolver.background
              // avoid overlapping with Launcher's edge drag area
              // FIXME: Fix TouchRegistry & friends and remove this workaround
@@ -603,7 +579,7 @@
              id: wizard
              objectName: "wizard"
              anchors.fill: parent
--            background: shell.background
++            background: wallpaperResolver.background
              function unlockWhenDoneWithWizard() {
                  if (!active) {
@@ -634,6 +610,7 @@
              model: NotificationBackend.Model
              margin: units.gu(1)
              hasMouse: shell.hasMouse
++            background: wallpaperResolver.background
              y: topmostIsFullscreen ? 0 : panel.panelHeight
              height: parent.height - (topmostIsFullscreen ? 0 : panel.panelHeight)
 === modified file 'src/ApplicationArguments.h'
 --- src/ApplicationArguments.h	2015-09-14 09:11:08 +0000
 +++ src/ApplicationArguments.h	2015-10-20 16:45:46 +0000
@@ -26,17 +26,25 @@
  class ApplicationArguments : public QObject
+ {
      Q_OBJECT
--    Q_PROPERTY(QString deviceName READ deviceName CONSTANT)
++    Q_PROPERTY(QString deviceName READ deviceName NOTIFY deviceNameChanged)
      Q_PROPERTY(QString mode READ mode CONSTANT)
  public:
      ApplicationArguments(QObject *parent = nullptr);
--    void setDeviceName(const QString &deviceName) { m_deviceName = deviceName; }
++    void setDeviceName(const QString &deviceName) {
++        if (deviceName != m_deviceName) {
++            m_deviceName = deviceName;
++            Q_EMIT deviceNameChanged(m_deviceName);
++        }
++    }
      QString deviceName() const { return m_deviceName; }
      void setMode(const QString &mode) { m_mode = mode; }
      QString mode() const { return m_mode; }
++Q_SIGNALS:
++    void deviceNameChanged(const QString&);
++
  private:
      QString m_deviceName;
      QString m_mode;
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2015-06-24 11:41:09 +0000
 +++ src/CMakeLists.txt	2015-10-20 16:45:46 +0000
@@ -21,6 +21,9 @@
      main.cpp
      MouseTouchAdaptor.cpp
      CachingNetworkManagerFactory.cpp
++    SecondaryWindow.cpp
++    ShellApplication.cpp
++    ShellView.cpp
      UnityCommandLineParser.cpp
      ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
+ )
 === added file 'src/SecondaryWindow.cpp'
 --- src/SecondaryWindow.cpp	1970-01-01 00:00:00 +0000
 +++ src/SecondaryWindow.cpp	2015-10-20 16:45:46 +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/>.
++ */
++
++#include "SecondaryWindow.h"
++
++// local
++#include <paths.h>
++
++SecondaryWindow::SecondaryWindow(QQmlEngine *engine)
++    : QQuickView(engine, nullptr)
++{
++    setResizeMode(QQuickView::SizeRootObjectToView);
++    setColor("black");
++    setTitle(QStringLiteral("Unity8 Shell - Secondary Screen"));
++
++    QUrl source(::qmlDirectory() + "/DisabledScreenNotice.qml");
++    setSource(source);
++}
 === added file 'src/SecondaryWindow.h'
 --- src/SecondaryWindow.h	1970-01-01 00:00:00 +0000
 +++ src/SecondaryWindow.h	2015-10-20 16:45:46 +0000
@@ -0,0 +1,30 @@
++/*
++ * 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_SECONDARY_WINDOW_H
++#define UNITY_SECONDARY_WINDOW_H
++
++#include <QQuickView>
++
++class SecondaryWindow : public QQuickView
++{
++    Q_OBJECT
++
++public:
++    SecondaryWindow(QQmlEngine *engine);
++};
++
++#endif // UNITY_SECONDARY_WINDOW_H
 === added file 'src/ShellApplication.cpp'
 --- src/ShellApplication.cpp	1970-01-01 00:00:00 +0000
 +++ src/ShellApplication.cpp	2015-10-20 16:45:46 +0000
@@ -0,0 +1,197 @@
++/*
++ * 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 "ShellApplication.h"
++
++// Qt
++#include <QLibrary>
++#include <QScreen>
++
++#include <libintl.h>
++
++// libandroid-properties
++#include <hybris/properties/properties.h>
++
++// local
++#include <paths.h>
++#include "CachingNetworkManagerFactory.h"
++#include "MouseTouchAdaptor.h"
++#include "UnityCommandLineParser.h"
++
++ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
++    : QGuiApplication(argc, argv)
++    , m_shellView(nullptr)
++    , m_secondaryWindow(nullptr)
++    , m_mouseTouchAdaptor(nullptr)
++    , m_qmlEngine(nullptr)
++{
++
++    setApplicationName(QStringLiteral("unity8"));
++
++    connect(this, &QGuiApplication::screenAdded, this, &ShellApplication::onScreenAdded);
++
++    setupQmlEngine(isMirServer);
++
++    UnityCommandLineParser parser(*this);
++
++    if (!parser.deviceName().isEmpty()) {
++        m_deviceName = parser.deviceName();
++    } else {
++        char buffer[200];
++        property_get("ro.product.device", buffer /* value */, "desktop" /* default_value*/);
++        m_deviceName = QString(buffer);
++    }
++    m_qmlArgs.setDeviceName(m_deviceName);
++
++    m_qmlArgs.setMode(parser.mode());
++
++    // 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.hasTestability() || getenv("QT_LOAD_TESTABILITY")) {
++        QLibrary testLib(QStringLiteral("qttestability"));
++        if (testLib.load()) {
++            typedef void (*TasInitialize)(void);
++            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
++            if (initFunction) {
++                initFunction();
++            } else {
++                qCritical("Library qttestability resolve failed!");
++            }
++        } else {
++            qCritical("Library qttestability load failed!");
++        }
++    }
++
++    bindtextdomain("unity8", translationDirectory().toUtf8().data());
++    textdomain("unity8");
++
++    m_shellView = new ShellView(m_qmlEngine, &m_qmlArgs);
++
++    if (parser.windowGeometry().isValid()) {
++        m_shellView->setWidth(parser.windowGeometry().width());
++        m_shellView->setHeight(parser.windowGeometry().height());
++    }
++
++    if (parser.hasFrameless()) {
++        m_shellView->setFlags(Qt::FramelessWindowHint);
++    }
++
++    // You will need this if you want to interact with touch-only components using a mouse
++    // Needed only when manually testing on a desktop.
++    if (parser.hasMouseToTouch()) {
++        m_mouseTouchAdaptor = MouseTouchAdaptor::instance();
++    }
++
++
++    // Some hard-coded policy for now.
++    // NB: We don't support more than two screens at the moment
++    //
++    // TODO: Support an arbitrary number of screens and different policies
++    //       (eg cloned desktop, several desktops, etc)
++    if (isMirServer && screens().count() == 2) {
++        m_shellView->setScreen(screens().at(1));
++        m_qmlArgs.setDeviceName("desktop");
++
++        m_secondaryWindow = new SecondaryWindow(m_qmlEngine);
++        m_secondaryWindow->setScreen(screens().at(0));
++        // QWindow::showFullScreen() also calls QWindow::requestActivate() and we don't want that!
++        m_secondaryWindow->setWindowState(Qt::WindowFullScreen);
++        m_secondaryWindow->setVisible(true);
++    }
++
++    if (isMirServer || parser.hasFullscreen()) {
++        m_shellView->showFullScreen();
++    } else {
++        m_shellView->show();
++    }
++}
++
++ShellApplication::~ShellApplication()
++{
++    destroyResources();
++}
++
++void ShellApplication::destroyResources()
++{
++    // Deletion order is important. Don't use QScopedPointers and the like
++    // Otherwise the process will hang on shutdown (bug somewhere I guess).
++    delete m_shellView;
++    m_shellView = nullptr;
++
++    delete m_secondaryWindow;
++    m_secondaryWindow = nullptr;
++
++    delete m_mouseTouchAdaptor;
++    m_mouseTouchAdaptor = nullptr;
++
++    delete m_qmlEngine;
++    m_qmlEngine = nullptr;
++}
++
++void ShellApplication::setupQmlEngine(bool isMirServer)
++{
++    m_qmlEngine = new QQmlEngine(this);
++
++    m_qmlEngine->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
++
++    prependImportPaths(m_qmlEngine, ::overrideImportPaths());
++    if (!isMirServer) {
++        prependImportPaths(m_qmlEngine, ::nonMirImportPaths());
++    }
++    appendImportPaths(m_qmlEngine, ::fallbackImportPaths());
++
++    m_qmlEngine->setNetworkAccessManagerFactory(new CachingNetworkManagerFactory);
++
++    QObject::connect(m_qmlEngine, &QQmlEngine::quit, this, &QGuiApplication::quit);
++}
++
++void ShellApplication::onScreenAdded(QScreen * /*screen*/)
++{
++    // TODO: Support an arbitrary number of screens and different policies
++    //       (eg cloned desktop, several desktops, etc)
++    if (screens().count() == 2) {
++        m_shellView->setScreen(screens().at(1));
++        m_qmlArgs.setDeviceName("desktop");
++        // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having
++        // its backing QPlatformWindow recreated). So lets refocus it.
++        m_shellView->requestActivate();
++
++        m_secondaryWindow = new SecondaryWindow(m_qmlEngine);
++        m_secondaryWindow->setScreen(screens().at(0));
++
++        // QWindow::showFullScreen() also calls QWindow::requestActivate() and we don't want that!
++        m_secondaryWindow->setWindowState(Qt::WindowFullScreen);
++        m_secondaryWindow->setVisible(true);
++    }
++}
++
++void ShellApplication::onScreenAboutToBeRemoved(QScreen *screen)
++{
++    // TODO: Support an arbitrary number of screens and different policies
++    //       (eg cloned desktop, several desktops, etc)
++    if (screen == m_shellView->screen()) {
++        Q_ASSERT(screens().count() > 1);
++        Q_ASSERT(screens().at(0) != screen);
++        Q_ASSERT(m_secondaryWindow);
++        delete m_secondaryWindow;
++        m_secondaryWindow = nullptr;
++        m_shellView->setScreen(screens().first());
++        m_qmlArgs.setDeviceName(m_deviceName);
++        // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having
++        // its backing QPlatformWindow recreated). So lets refocus it.
++        m_shellView->requestActivate();
++    }
++}
 === added file 'src/ShellApplication.h'
 --- src/ShellApplication.h	1970-01-01 00:00:00 +0000
 +++ src/ShellApplication.h	2015-10-20 16:45:46 +0000
@@ -0,0 +1,55 @@
++/*
++ * 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 SHELLAPPLICATION_H
++#define SHELLAPPLICATION_H
++
++#include <QGuiApplication>
++#include <QQmlEngine>
++#include <QQuickView>
++#include <QScopedPointer>
++
++#include "ApplicationArguments.h"
++#include "MouseTouchAdaptor.h"
++#include "SecondaryWindow.h"
++#include "ShellView.h"
++
++class ShellApplication : public QGuiApplication
++{
++    Q_OBJECT
++public:
++    ShellApplication(int & argc, char ** argv, bool isMirServer);
++    virtual ~ShellApplication();
++
++    void destroyResources();
++public Q_SLOTS:
++    // called by qtmir
++    void onScreenAboutToBeRemoved(QScreen *screen);
++
++private Q_SLOTS:
++    void onScreenAdded(QScreen*);
++
++private:
++    void setupQmlEngine(bool isMirServer);
++    QString m_deviceName;
++    ApplicationArguments m_qmlArgs;
++    ShellView *m_shellView;
++    SecondaryWindow *m_secondaryWindow;
++    MouseTouchAdaptor *m_mouseTouchAdaptor;
++    QQmlEngine *m_qmlEngine;
++};
++
++#endif // SHELLAPPLICATION_H
 === added file 'src/ShellView.cpp'
 --- src/ShellView.cpp	1970-01-01 00:00:00 +0000
 +++ src/ShellView.cpp	2015-10-20 16:45:46 +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 "ShellView.h"
++
++// Qt
++#include <QQmlContext>
++#include <QQuickItem>
++
++// local
++#include <paths.h>
++
++ShellView::ShellView(QQmlEngine *engine, QObject *qmlArgs)
++    : QQuickView(engine, nullptr)
++{
++    setResizeMode(QQuickView::SizeRootObjectToView);
++    setColor("black");
++    setTitle(QStringLiteral("Unity8"));
++
++    rootContext()->setContextProperty(QStringLiteral("applicationArguments"), qmlArgs);
++
++    QUrl source(::qmlDirectory() + "/OrientedShell.qml");
++    setSource(source);
++
++    connect(this, &QWindow::widthChanged, this, &ShellView::onWidthChanged);
++    connect(this, &QWindow::heightChanged, this, &ShellView::onHeightChanged);
++}
++
++void ShellView::onWidthChanged(int w)
++{
++    // For good measure in case SizeRootObjectToView doesn't fulfill its promise.
++    //
++    // There's at least one situation that's know to leave the root object with an outdated size.
++    // (really looks like Qt bug)
++    // Happens when starting unity8 with an external monitor already connected.
++    // The QResizeEvent we get still has the size of the first screen and since the resize move is triggered
++    // from the resize event handler, the root item doesn't get resized.
++    // TODO: Confirm the Qt bug and submit a patch upstream
++    rootObject()->setWidth(w);
++}
++
++void ShellView::onHeightChanged(int h)
++{
++    // See comment in ShellView::onWidthChanged()
++    rootObject()->setHeight(h);
++}
 === added file 'src/ShellView.h'
 --- src/ShellView.h	1970-01-01 00:00:00 +0000
 +++ src/ShellView.h	2015-10-20 16:45:46 +0000
@@ -0,0 +1,34 @@
++/*
++ * 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_SHELL_VIEW_H
++#define UNITY_SHELL_VIEW_H
++
++#include <QQuickView>
++
++class ShellView : public QQuickView
++{
++    Q_OBJECT
++
++public:
++    ShellView(QQmlEngine *engine, QObject *qmlArgs);
++
++private Q_SLOTS:
++    void onWidthChanged(int);
++    void onHeightChanged(int);
++};
++
++#endif // UNITY_SHELL_VIEW_H
 === modified file 'src/main.cpp'
 --- src/main.cpp	2015-09-23 15:14:01 +0000
 +++ src/main.cpp	2015-10-20 16:45:46 +0000
@@ -14,26 +14,8 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--// Qt
--#include <QCommandLineParser>
--#include <QtQuick/QQuickView>
--#include <QtGui/QGuiApplication>
--#include <QtQml/QQmlEngine>
--#include <QtQml/QQmlContext>
--#include <QLibrary>
--#include <QDebug>
--#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"
++#include "ShellApplication.h"
  int main(int argc, const char *argv[])
+ {
@@ -43,91 +25,12 @@
          isMirServer = true;
+     }
--    QGuiApplication::setApplicationName(QStringLiteral("unity8"));
--    QGuiApplication *application;
--
--    application = new QGuiApplication(argc, (char**)argv);
--
--    UnityCommandLineParser parser(*application);
--
--    ApplicationArguments qmlArgs;
--
--    if (!parser.deviceName().isEmpty()) {
--        qmlArgs.setDeviceName(parser.deviceName());
--    } else {
--        char buffer[200];
--        property_get("ro.product.device", buffer /* value */, "desktop" /* default_value*/);
--        qmlArgs.setDeviceName(QString(buffer));
--    }
--
--    qmlArgs.setMode(parser.mode());
--
--    // 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.hasTestability() || getenv("QT_LOAD_TESTABILITY")) {
--        QLibrary testLib(QStringLiteral("qttestability"));
--        if (testLib.load()) {
--            typedef void (*TasInitialize)(void);
--            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
--            if (initFunction) {
--                initFunction();
--            } else {
--                qCritical("Library qttestability resolve failed!");
--            }
--        } else {
--            qCritical("Library qttestability load failed!");
--        }
--    }
--
--    bindtextdomain("unity8", translationDirectory().toUtf8().data());
--    textdomain("unity8");
--
--    QQuickView* view = new QQuickView();
--    view->setResizeMode(QQuickView::SizeRootObjectToView);
--    view->setColor("black");
--    view->setTitle(QStringLiteral("Unity8 Shell"));
--
--    if (parser.windowGeometry().isValid()) {
--        view->setWidth(parser.windowGeometry().width());
--        view->setHeight(parser.windowGeometry().height());
--    }
--
--    view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));
--    view->rootContext()->setContextProperty(QStringLiteral("applicationArguments"), &qmlArgs);
--    if (parser.hasFrameless()) {
--        view->setFlags(Qt::FramelessWindowHint);
--    }
--
--    // 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.hasMouseToTouch()) {
--        mouseTouchAdaptor = MouseTouchAdaptor::instance();
--    }
--
--    QUrl source(::qmlDirectory() + "/OrientedShell.qml");
--    prependImportPaths(view->engine(), ::overrideImportPaths());
--    if (!isMirServer) {
--        prependImportPaths(view->engine(), ::nonMirImportPaths());
--    }
--    appendImportPaths(view->engine(), ::fallbackImportPaths());
--
--    CachingNetworkManagerFactory *managerFactory = new CachingNetworkManagerFactory();
--    view->engine()->setNetworkAccessManagerFactory(managerFactory);
--
--    view->setSource(source);
--    QObject::connect(view->engine(), &QQmlEngine::quit, application, &QGuiApplication::quit);
--
--    if (isMirServer || parser.hasFullscreen()) {
--        view->showFullScreen();
--    } else {
--        view->show();
--    }
++    ShellApplication *application = new ShellApplication(argc, (char**)argv, isMirServer);
      int result = application->exec();
--    delete view;
--    delete mouseTouchAdaptor;
++    application->destroyResources();
++
      delete application;
      return result;
 === modified file 'tests/autopilot/unity8/fixture_setup.py'
 --- tests/autopilot/unity8/fixture_setup.py	2015-09-21 12:50:10 +0000
 +++ tests/autopilot/unity8/fixture_setup.py	2015-10-20 16:45:46 +0000
@@ -133,7 +133,7 @@
          args = [binary_arg] + env_args
          self.unity_proxy = process_helpers.restart_unity_with_testability(
              *args)
--        self.main_win = self.unity_proxy.select_single(shell.QQuickView)
++        self.main_win = self.unity_proxy.select_single(shell.ShellView)
      def _create_sensors(self):
          # Wait for unity to start running.
 === modified file 'tests/autopilot/unity8/greeter/tests/__init__.py'
 --- tests/autopilot/unity8/greeter/tests/__init__.py	2015-04-29 19:21:18 +0000
 +++ tests/autopilot/unity8/greeter/tests/__init__.py	2015-10-20 16:45:46 +0000
@@ -24,5 +24,5 @@
  class GreeterTestCase(UnityTestCase):
      def get_shell(self, unity_proxy):
          main_window = (
--            unity_proxy.select_single(shell.QQuickView))
++            unity_proxy.select_single(shell.ShellView))
          return main_window.select_single('Shell')
 === modified file 'tests/autopilot/unity8/launcher.py'
 --- tests/autopilot/unity8/launcher.py	2015-04-29 19:21:18 +0000
 +++ tests/autopilot/unity8/launcher.py	2015-10-20 16:45:46 +0000
@@ -42,7 +42,7 @@
              logger.debug('The launcher is already opened.')
      def _swipe_to_show_launcher(self):
--        view = self.get_root_instance().select_single('QQuickView')
++        view = self.get_root_instance().select_single('ShellView')
          start_y = stop_y = view.y + view.height // 2
          start_x = view.x + 1
 === modified file 'tests/autopilot/unity8/shell/__init__.py'
 --- tests/autopilot/unity8/shell/__init__.py	2015-06-22 15:47:34 +0000
 +++ tests/autopilot/unity8/shell/__init__.py	2015-10-20 16:45:46 +0000
@@ -93,7 +93,7 @@
      return _urgency_enums.get(urgency.upper())
--class QQuickView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++class ShellView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
      """An helper class that makes it easy to interact with the shell"""
      def get_greeter(self):
 === modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
 --- tests/autopilot/unity8/shell/tests/__init__.py	2015-09-21 12:50:10 +0000
 +++ tests/autopilot/unity8/shell/tests/__init__.py	2015-10-20 16:45:46 +0000
@@ -297,7 +297,7 @@
      @property
      def main_window(self):
--        return self._proxy.select_single(shell.QQuickView)
++        return self._proxy.select_single(shell.ShellView)
  class DashBaseTestCase(AutopilotTestCase):
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2015-10-20 16:45:46 +0000
 +++ tests/qmltests/CMakeLists.txt	2015-10-20 16:45:46 +0000
@@ -2,6 +2,7 @@
  add_subdirectory(Components)
  add_unity8_qmltest(. OrientedShell LIGHTDM)
++add_unity8_qmltest(. DisabledScreenNotice)
  add_unity8_qmltest(. Shell LIGHTDM)
  add_unity8_qmltest(. ShellWithPin LIGHTDM)
  add_unity8_qmltest(Components Background)
@@ -15,6 +16,7 @@
  add_unity8_qmltest(Components ResponsiveGridView)
  add_unity8_qmltest(Components ResponsiveVerticalJournal)
  add_unity8_qmltest(Components Showable)
++add_unity8_qmltest(Components WallpaperResolver)
  add_unity8_qmltest(Components ZoomableImage)
  add_unity8_qmltest(Dash Dash)
  add_unity8_qmltest(Dash DashContent)
 === added file 'tests/qmltests/Components/tst_WallpaperResolver.qml'
 --- tests/qmltests/Components/tst_WallpaperResolver.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Components/tst_WallpaperResolver.qml	2015-10-20 16:45:46 +0000
@@ -0,0 +1,89 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import QtTest 1.0
++import Ubuntu.Components 1.3
++import Unity.Test 0.1
++import AccountsService 0.1
++import GSettings 1.0
++
++import "../../../qml/Components"
++
++
++Image {
++    width: units.gu(70)
++    height: units.gu(70)
++
++    source: wallpaperResolver.background
++
++    WallpaperResolver {
++        id: wallpaperResolver
++        width: units.gu(70)
++    }
++
++    UnityTestCase {
++        id: testCase
++        name: "WallpaperResolver"
++        when: windowShown
++
++        function test_background_data() {
++            return [
++                {tag: "color",
++                 accounts: Qt.resolvedUrl("data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>"),
++                 gsettings: "",
++                 output: Qt.resolvedUrl("data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>")},
++
++                {tag: "empty", accounts: "", gsettings: "", output: "defaultBackground"},
++
++                {tag: "as-specified",
++                 accounts: Qt.resolvedUrl("../../data/unity/backgrounds/blue.png"),
++                 gsettings: "",
++                 output: Qt.resolvedUrl("../../data/unity/backgrounds/blue.png")},
++
++                {tag: "gs-specified",
++                 accounts: "",
++                 gsettings: Qt.resolvedUrl("../../data/unity/backgrounds/red.png"),
++                 output: Qt.resolvedUrl("../../data/unity/backgrounds/red.png")},
++
++                {tag: "both-specified",
++                 accounts: Qt.resolvedUrl("../../data/unity/backgrounds/blue.png"),
++                 gsettings: Qt.resolvedUrl("../../data/unity/backgrounds/red.png"),
++                 output: Qt.resolvedUrl("../../data/unity/backgrounds/blue.png")},
++
++                {tag: "invalid-as",
++                 accounts: Qt.resolvedUrl("../../data/unity/backgrounds/nope.png"),
++                 gsettings: Qt.resolvedUrl("../../data/unity/backgrounds/red.png"),
++                 output: Qt.resolvedUrl("../../data/unity/backgrounds/red.png")},
++
++                {tag: "invalid-both",
++                 accounts: Qt.resolvedUrl("../../data/unity/backgrounds/nope.png"),
++                 gsettings: Qt.resolvedUrl("../../data/unity/backgrounds/stillnope.png"),
++                 output: "defaultBackground"},
++            ]
++        }
++        function test_background(data) {
++            AccountsService.backgroundFile = data.accounts;
++            GSettingsController.setPictureUri(data.gsettings);
++
++            if (data.output === "defaultBackground") {
++                tryCompare(wallpaperResolver, "background", wallpaperResolver.defaultBackground);
++            } else {
++                tryCompare(wallpaperResolver, "background", data.output);
++            }
++        }
++    }
++}
 === added file 'tests/qmltests/tst_DisabledScreenNotice.qml'
 --- tests/qmltests/tst_DisabledScreenNotice.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/tst_DisabledScreenNotice.qml	2015-10-20 16:45:46 +0000
@@ -0,0 +1,37 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import QtTest 1.0
++import Unity.Test 0.1
++import "../../qml"
++
++
++Item {
++    id: root
++    width: units.gu(70)
++    height: units.gu(70)
++
++    DisabledScreenNotice {
++        anchors.fill: parent
++    }
++
++    UnityTestCase {
++        id: testCase
++        name: "DisabledScreenNotice"
++        when: windowShown
++    }
++}
 === modified file 'tests/qmltests/tst_OrientedShell.qml'
 --- tests/qmltests/tst_OrientedShell.qml	2015-10-20 16:45:46 +0000
 +++ tests/qmltests/tst_OrientedShell.qml	2015-10-20 16:45:46 +0000
@@ -110,6 +110,22 @@
                  physicalOrientation180: Qt.LandscapeOrientation
                  primaryOrientationAngle: 90
+             }
++        },
++        State {
++            name: "desktop"
++            PropertyChanges {
++                target: orientedShellLoader
++                width: units.gu(100)
++                height: units.gu(56)
++            }
++            PropertyChanges {
++                target: root
++                physicalOrientation270: Qt.InvertedPortraitOrientation
++                physicalOrientation0:  Qt.LandscapeOrientation
++                physicalOrientation90: Qt.PortraitOrientation
++                physicalOrientation180: Qt.InvertedLandscapeOrientation
++                primaryOrientationAngle: 0
++            }
+         }
+     ]
@@ -250,7 +266,7 @@
                  anchors { left: parent.left; right: parent.right }
                  activeFocusOnPress: false
                  text: "Device Name"
--                model: ["mako", "manta", "flo"]
++                model: ["mako", "manta", "flo", "desktop"]
                  onSelectedIndexChanged: {
                      testCase.tearDown();
                      applicationArguments.deviceName = model[selectedIndex];
@@ -310,12 +326,14 @@
              Row {
                  Button {
                      text: "Add mouse"
++                    activeFocusOnPress: false
                      onClicked: {
                          UnityInputInfo.inputInfo.addMockMouse()
+                     }
+                 }
                  Button {
                      text: "Remove mouse"
++                    activeFocusOnPress: false
                      onClicked: {
                          UnityInputInfo.inputInfo.removeMockMouse()
+                     }
@@ -324,17 +342,37 @@
              Row {
                  Button {
                      text: "Add kbd"
++                    activeFocusOnPress: false
                      onClicked: {
                          UnityInputInfo.inputInfo.addMockKeyboard()
+                     }
+                 }
                  Button {
++                    activeFocusOnPress: false
                      text: "Remove kbd"
                      onClicked: {
                          UnityInputInfo.inputInfo.removeMockKeyboard()
+                     }
+                 }
+             }
++
++            // Simulates what happens when the shell is moved to an external monitor and back
++            Button {
++                id: moveToFromMonitorButton
++                text: applicationArguments.deviceName === "desktop" ? "Move to " + prevDevName + " screen" : "Move to desktop screen"
++                activeFocusOnPress: false
++                property string prevDevName: "mako"
++                onClicked: {
++                    usageModeSelector.selectedIndex = 2; // "Automatic"
++
++                    if (applicationArguments.deviceName === "desktop") {
++                        applicationArguments.deviceName = prevDevName;
++                    } else {
++                        prevDevName = applicationArguments.deviceName;
++                        applicationArguments.deviceName = "desktop"
++                    }
++                }
++            }
+         }
+     }
@@ -1054,6 +1092,18 @@
              compare(signalSpy.count, 0);
+         }
++        function test_moveToExternalMonitor() {
++            loadShell("flo");
++
++            compare(orientedShell.orientation, Qt.InvertedLandscapeOrientation);
++            compare(shell.transformRotationAngle, 90);
++
++            moveToFromMonitorButton.clicked();
++
++            tryCompare(orientedShell, "orientation", Qt.LandscapeOrientation);
++            tryCompare(shell, "transformRotationAngle" , 0);
++        }
++
          //  angle - rotation angle in degrees clockwise, relative to the primary orientation.
          function rotateTo(angle) {
              switch (angle) {
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-09-18 12:05:32 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-10-20 16:45:46 +0000
@@ -1240,30 +1240,6 @@
              tryCompare(launcherPanel, "x", -launcherPanel.width);
+         }
--        function test_background_data() {
--            return [
--                {tag: "color", accounts: Qt.resolvedUrl("data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>"), gsettings: "", output: Qt.resolvedUrl("data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>")},
--                {tag: "empty", accounts: "", gsettings: "", output: "defaultBackground"},
--                {tag: "as-specified", accounts: Qt.resolvedUrl("../data/unity/backgrounds/blue.png"), gsettings: "", output: Qt.resolvedUrl("../data/unity/backgrounds/blue.png")},
--                {tag: "gs-specified", accounts: "", gsettings: Qt.resolvedUrl("../data/unity/backgrounds/red.png"), output: Qt.resolvedUrl("../data/unity/backgrounds/red.png")},
--                {tag: "both-specified", accounts: Qt.resolvedUrl("../data/unity/backgrounds/blue.png"), gsettings: Qt.resolvedUrl("../data/unity/backgrounds/red.png"), output: Qt.resolvedUrl("../data/unity/backgrounds/blue.png")},
--                {tag: "invalid-as", accounts: Qt.resolvedUrl("../data/unity/backgrounds/nope.png"), gsettings: Qt.resolvedUrl("../data/unity/backgrounds/red.png"), output: Qt.resolvedUrl("../data/unity/backgrounds/red.png")},
--                {tag: "invalid-both", accounts: Qt.resolvedUrl("../data/unity/backgrounds/nope.png"), gsettings: Qt.resolvedUrl("../data/unity/backgrounds/stillnope.png"), output: "defaultBackground"},
--            ]
--        }
--        function test_background(data) {
--            loadShell("phone");
--            swipeAwayGreeter();
--            AccountsService.backgroundFile = data.accounts;
--            GSettingsController.setPictureUri(data.gsettings);
--
--            if (data.output === "defaultBackground") {
--                tryCompare(shell, "background", shell.defaultBackground);
--            } else {
--                tryCompare(shell, "background", data.output);
--            }
--        }
--
          function test_tabletLogin_data() {
              return [
                  {tag: "auth error", user: "auth-error", loggedIn: false, password: ""},