Unity 8

qml/Components/Orientations.qml (+57/-0)
qml/DeviceConfiguration.qml (+93/-71)
qml/OrientedShell.qml (+35/-25)
qml/Shell.qml (+7/-13)
qml/Stages/DesktopStage.qml (+2/-2)
qml/Stages/PhoneStage.qml (+4/-6)
qml/Stages/SpreadDelegate.qml (+8/-9)
qml/Stages/TabletStage.qml (+13/-7)
tests/qmltests/Stages/tst_PhoneStage.qml (+0/-2)
tests/qmltests/Stages/tst_SpreadDelegate.qml (+6/-2)
tests/qmltests/Stages/tst_TabletStage.qml (+2/-2)
tests/qmltests/tst_OrientedShell.qml (+1/-1)
tests/qmltests/tst_Shell.qml (+2/-2)

To merge this branch:

bzr merge lp:~unity-team/unity8/new_fix_upsidedown

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Approve on 2015-11-05
PS Jenkins bot	continuous-integration	2015-10-26	Needs Fixing on 2015-10-31
Daniel d'Andrada		2015-10-26	Pending
Review via email: mp+275683@code.launchpad.net

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

Commit Message

Enable support for overriding application orientations based on device type

Description of the Change

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

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

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

Branch is intended to supersede lp:~josharenson/unity8/fix_upside_down_apps
by encapsulating the orientation overrides inside a neat QtObject, intended to reduce lines of code and improve clarity.

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

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

review: Needs Fixing (continuous-integration)

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

In tests/qmltests/tst_Shell.qml:

Don't we have to pass an Orientations object to Shell?

I think that's why we're getting the warning and test failures below:

"""
file:///home/dandrader/unity8/new_fix_upsidedown/qml/Stages/SpreadDelegate.qml:159: TypeError: Cannot read property 'primary' of null
"""

"""
FAIL! : qmltestrunner::Shell::test_launchedAppHasActiveFocus(tablet) 'verify()' returned FALSE. ()
Loc: [/home/dandrader/unity8/new_fix_upsidedown/tests/qmltests/tst_Shell.qml(843)]
"""

"""
FAIL! : qmltestrunner::Shell::test_launchedAppKeepsActiveFocusOnUsageModeChange() 'verify()' returned FALSE. ()
Loc: [/home/dandrader/unity8/new_fix_upsidedown/tests/qmltests/tst_Shell.qml(835)]
"""

"""
FAIL! : qmltestrunner::Shell::test_unfocusedAppsAreResumedWhenEnteringWindowedMode() Uncaught exception: Cannot read property 'objectName' of null
   Loc: [/home/dandrader/unity8/new_fix_upsidedown_build/tests/utils/modules/Unity/Test/UnityTestCase.qml(179)]
FAIL! : qmltestrunner::Shell::test_unfocusedAppsGetSuspendedAfterEnteringStagedMode() property requestedState
   Actual (): 1
   Expected (): 2
   Loc: [/home/dandrader/unity8/new_fix_upsidedown/tests/qmltests/tst_Shell.qml(1362)]
"""

review: Needs Fixing

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

In qml/OrientedShell.qml:

"""
orientations: root.orientations ? root.orientations : ""
"""

This looks strange. Passing an empty string in case there's no root.orientations?

In which situation do you expect root.orientations to be null/undefined?

Josh Arenson (josharenson) wrote on 2015-09-28: Posted in a previous version of this proposal

> In qml/OrientedShell.qml:
>
> """
> orientations: root.orientations ? root.orientations : ""
> """
>
> This looks strange. Passing an empty string in case there's no
> root.orientations?
>
> In which situation do you expect root.orientations to be null/undefined?

This was residual debug code that I will remove.

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

Some OrientedShell tests are failing and others don't even compile (PhoneStage and TabletStage)!

Please do check the results from the latest jenkins test run

review: Needs Fixing

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

In tests/qmltests/tst_Shell.qml:

"""
orientations: Orientations{ id: orientations }
"""

This id is not being referenced anywhere. Please remove it.

review: Needs Fixing

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-10-08: Posted in a previous version of this proposal

Has wrong branches

Josh Arenson (josharenson) wrote on 2015-10-13: Posted in a previous version of this proposal

Stripped tags, merged trunk

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

FAIL! : qmltestrunner::OrientedShell::test_portraitOnlyAppInSideStage(flo) Compared values are not the same
   Actual (): 8
   Expected (): undefined
   Loc: [/home/dandrader/unity8/new_fix_upsidedown/tests/qmltests/tst_OrientedShell.qml(801)]

review: Needs Fixing

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

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

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2015-10-14: Posted in a previous version of this proposal

The solution was already in some code that I must have accidentally removed. qmltestrunner::OrientedShell should pass now. Tags also stripped.

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

whitespace check fails:
qml/Stages/TabletStage.qml: bad whitespace in line 695

You're mixing tabs and spaces there.

Otherwise it looks good and tests pass now (at least the ones I tried)

review: Needs Fixing

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

review: Approve

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new_fix_upsidedown updated on 2015-10-26

1946. By Michał Sawicz on 2015-10-26: Merge lp:~mzanetti/unity8/panel-button-fixes

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

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new_fix_upsidedown updated on 2015-10-26

1947. By Michał Sawicz on 2015-10-26: Bump QtQuick import

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

FAILED: Continuous integration, rev:1947
http://jenkins.qa.ubuntu.com/job/unity8-ci/6553/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4833
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/936/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1265
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/581/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1161
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/792/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/793/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4830
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24578
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/936/console

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new_fix_upsidedown updated on 2015-10-27

1948. By Michał Sawicz on 2015-10-27: lp:~mzanetti/unity8/panel-button-fixes

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

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

review: Needs Fixing (continuous-integration)

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

This seems to enable rotation when connected to an external screen.

review: Needs Fixing

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

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new_fix_upsidedown updated on 2015-10-28

1949. By Daniel d'Andrada on 2015-10-28: DeviceConfiguration.qml: Fix bogus merge with trunk

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

> This seems to enable rotation when connected to an external screen.

Fixed. Was due to a bogus merge with trunk.

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

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/new_fix_upsidedown updated on 2015-10-29

1950. By Daniel d'Andrada on 2015-10-29: Another bug from a bad merge with trunk
1951. By Daniel d'Andrada on 2015-10-29: Fix

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

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

review: Needs Fixing (continuous-integration)

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

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

review: Needs Fixing (continuous-integration)

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

qmltestrunner.OrientedShell::test_moveToExternalMonitor
property transformRotationAngle Actual (): 90 Expected (): 0

review: Needs Fixing

lp:~unity-team/unity8/new_fix_upsidedown updated on 2015-10-30

1952. By Daniel d'Andrada on 2015-10-30: Fix bug in OrientedShell.orientationChangesEnabled

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

> qmltestrunner.OrientedShell::test_moveToExternalMonitor
> property transformRotationAngle Actual (): 90 Expected (): 0

Fixed. It was actually a bug in trunk!

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

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

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2015-11-05:

All fixed, thanks.

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

 === added file 'qml/Components/Orientations.qml'
 --- qml/Components/Orientations.qml	1970-01-01 00:00:00 +0000
 +++ qml/Components/Orientations.qml	2015-10-30 13:37:41 +0000
@@ -0,0 +1,57 @@
++/*
++ * Copyright 2015 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++
++QtObject {
++    id: root
++
++    // Just because "native" is a reserved keyword :(
++    property int native_: Qt.PortraitOrientation
++
++    property int primary: Qt.PortraitOrientation
++
++    property int landscape: Qt.LandscapeOrientation
++    property int invertedLandscape: Qt.InvertedLandscapeOrientation
++    property int portrait: Qt.PortraitOrientation
++    property int invertedPortrait: Qt.InvertedPortraitOrientation
++
++    function map(orientations) {
++        var result = 0;
++
++        if (orientations & Qt.PortraitOrientation) {
++            result |= root.portrait;
++        }
++
++        if (orientations & Qt.InvertedPortraitOrientation) {
++            result |= root.invertedPortrait;
++        }
++
++        if (orientations & Qt.LandscapeOrientation) {
++            result |= root.landscape;
++        }
++
++        if (orientations & Qt.InvertedLandscapeOrientation) {
++            result |= root.invertedLandscape;
++        }
++
++        if (result == 0) {
++            result = root.primary;
++        }
++
++        return result;
++    }
++}
 === modified file 'qml/DeviceConfiguration.qml'
 --- qml/DeviceConfiguration.qml	2015-10-05 16:43:41 +0000
 +++ qml/DeviceConfiguration.qml	2015-10-30 13:37:41 +0000
@@ -16,79 +16,101 @@
  import QtQuick 2.0
--StateGroup {
++QtObject {
      id: root
      readonly property int useNativeOrientation: -1
--    property int primaryOrientation: useNativeOrientation
--
--    property int supportedOrientations: Qt.PortraitOrientation
--                                      | Qt.InvertedPortraitOrientation
--                                      | Qt.LandscapeOrientation
--                                      | Qt.InvertedLandscapeOrientation
--
--    // Supported values so far:
--    // "phone", "tablet" or "desktop"
--    property string category: "phone"
--
--    property int ignoredMice: 0
--
--
--    property alias name: root.state
--
--    states: [
--        State {
--            name: "mako"
--            PropertyChanges {
--                target: root
--                supportedOrientations: Qt.PortraitOrientation
--                                     | Qt.LandscapeOrientation
--                                     | Qt.InvertedLandscapeOrientation
--            }
--        },
--        State {
--            name: "krillin"
--            PropertyChanges {
--                target: root
--                supportedOrientations: Qt.PortraitOrientation
--                                     | Qt.LandscapeOrientation
--                                     | Qt.InvertedLandscapeOrientation
--            }
--        },
--        State {
--            name: "arale"
--            PropertyChanges {
--                target: root
--                supportedOrientations: Qt.PortraitOrientation
--                                     | Qt.LandscapeOrientation
--                                     | Qt.InvertedLandscapeOrientation
--                ignoredMice: 1
--            }
--        },
--        State {
--            name: "manta"
--            PropertyChanges {
--                target: root
--                category: "tablet"
--            }
--        },
--        State {
--            name: "flo"
--            PropertyChanges {
--                target: root
--                primaryOrientation: Qt.InvertedLandscapeOrientation
--                category: "tablet"
--            }
--        },
--        State {
--            name: "desktop"
--            PropertyChanges {
--                target: root
--                category: "desktop"
--                supportedOrientations: root.useNativeOrientation
--            }
--        }
--    ]
--
++    // The only writable property in the API
++    // all other properties are set according to the device name
++    property alias name: priv.state
++
++    readonly property alias primaryOrientation: priv.primaryOrientation
++    readonly property alias supportedOrientations: priv.supportedOrientations
++    readonly property alias landscapeOrientation: priv.landscapeOrientation
++    readonly property alias invertedLandscapeOrientation: priv.invertedLandscapeOrientation
++    readonly property alias portraitOrientation: priv.portraitOrientation
++    readonly property alias invertedPortraitOrientation: priv.invertedPortraitOrientation
++
++    readonly property alias category: priv.category
++
++    readonly property alias ignoredMice: priv.ignoredMice
++
++    readonly property var priv: StateGroup {
++        id: priv
++
++        property int primaryOrientation: root.useNativeOrientation
++
++        property int supportedOrientations: Qt.PortraitOrientation
++                                          | Qt.InvertedPortraitOrientation
++                                          | Qt.LandscapeOrientation
++                                          | Qt.InvertedLandscapeOrientation
++
++        property int landscapeOrientation: Qt.LandscapeOrientation
++        property int invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
++        property int portraitOrientation: Qt.PortraitOrientation
++        property int invertedPortraitOrientation: Qt.InvertedPortraitOrientation
++
++        // Supported values so far:
++        // "phone", "tablet" or "desktop"
++        property string category: "phone"
++
++        property int ignoredMice: 0
++
++        states: [
++            State {
++                name: "mako"
++                PropertyChanges {
++                    target: priv
++                    supportedOrientations: Qt.PortraitOrientation
++                                         | Qt.LandscapeOrientation
++                                         | Qt.InvertedLandscapeOrientation
++                }
++            },
++            State {
++                name: "krillin"
++                PropertyChanges {
++                    target: priv
++                    supportedOrientations: Qt.PortraitOrientation
++                                         | Qt.LandscapeOrientation
++                                         | Qt.InvertedLandscapeOrientation
++                }
++            },
++            State {
++                name: "arale"
++                PropertyChanges {
++                    target: priv
++                    supportedOrientations: Qt.PortraitOrientation
++                                         | Qt.LandscapeOrientation
++                                         | Qt.InvertedLandscapeOrientation
++                    ignoredMice: 1
++                }
++            },
++            State {
++                name: "manta"
++                PropertyChanges {
++                    target: priv
++                    category: "tablet"
++                }
++            },
++            State {
++                name: "flo"
++                PropertyChanges {
++                    target: priv
++                    landscapeOrientation: Qt.InvertedLandscapeOrientation
++                    invertedLandscapeOrientation: Qt.LandscapeOrientation
++                    primaryOrientation: Qt.InvertedLandscapeOrientation
++                    category: "tablet"
++                }
++            },
++            State {
++                name: "desktop"
++                PropertyChanges {
++                    target: priv
++                    category: "desktop"
++                    supportedOrientations: root.useNativeOrientation
++                }
++            }
++        ]
++    }
+ }
 === modified file 'qml/OrientedShell.qml'
 --- qml/OrientedShell.qml	2015-10-05 19:15:03 +0000
 +++ qml/OrientedShell.qml	2015-10-30 13:37:41 +0000
@@ -32,20 +32,31 @@
      implicitWidth: units.gu(40)
      implicitHeight: units.gu(71)
--    // NB: native and primary orientations here don't map exactly to their QScreen counterparts
--    readonly property int nativeOrientation: width > height ? Qt.LandscapeOrientation : Qt.PortraitOrientation
--
--    readonly property int primaryOrientation:
--            deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
--                   ? nativeOrientation : deviceConfiguration.primaryOrientation
--
      DeviceConfiguration {
          id: deviceConfiguration
          name: applicationArguments.deviceName
+     }
--
--    // to be overwritten by tests
++    property alias orientations: d.orientations
++
++    Item {
++        id: d
++
++        property Orientations orientations: Orientations {
++            id: orientations
++            // NB: native and primary orientations here don't map exactly to their QScreen counterparts
++            native_: root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation
++
++            primary: deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
++                ? native_ : deviceConfiguration.primaryOrientation
++
++            landscape: deviceConfiguration.landscapeOrientation
++            invertedLandscape: deviceConfiguration.invertedLandscapeOrientation
++            portrait: deviceConfiguration.portraitOrientation
++            invertedPortrait: deviceConfiguration.invertedPortraitOrientation
++        }
++    }
++        // to be overwritten by tests
      property var unity8Settings: Unity8Settings {}
      property var oskSettings: GSettings { schema.id: "com.canonical.keyboard.maliit" }
@@ -78,8 +89,8 @@
      // we must rotate to a supported orientation regardless of shell's preference
      property bool orientationChangesEnabled:
--        (orientation & supportedOrientations) === 0 ? true
--                                                    : shell.orientationChangesEnabled
++        (shell.orientation & supportedOrientations) === 0 ? true
++                                                          : shell.orientationChangesEnabled
      Binding {
@@ -96,12 +107,12 @@
      readonly property int supportedOrientations: shell.supportedOrientations
          & (deviceConfiguration.supportedOrientations == deviceConfiguration.useNativeOrientation
--                ? nativeOrientation
++                ? orientations.native_
                  : deviceConfiguration.supportedOrientations)
      property int acceptedOrientationAngle: {
          if (orientation & supportedOrientations) {
--            return Screen.angleBetween(nativeOrientation, orientation);
++            return Screen.angleBetween(orientations.native_, orientation);
          } else if (shell.orientation & supportedOrientations) {
              // stay where we are
              return shell.orientationAngle;
@@ -111,16 +122,16 @@
              // rotate to some supported orientation as we can't stay where we currently are
              // TODO: Choose the closest to the current one
              if (supportedOrientations & Qt.PortraitOrientation) {
--                return Screen.angleBetween(nativeOrientation, Qt.PortraitOrientation);
++                return Screen.angleBetween(orientations.native_, Qt.PortraitOrientation);
              } else if (supportedOrientations & Qt.LandscapeOrientation) {
--                return Screen.angleBetween(nativeOrientation, Qt.LandscapeOrientation);
++                return Screen.angleBetween(orientations.native_, Qt.LandscapeOrientation);
              } else if (supportedOrientations & Qt.InvertedPortraitOrientation) {
--                return Screen.angleBetween(nativeOrientation, Qt.InvertedPortraitOrientation);
++                return Screen.angleBetween(orientations.native_, Qt.InvertedPortraitOrientation);
              } else if (supportedOrientations & Qt.InvertedLandscapeOrientation) {
--                return Screen.angleBetween(nativeOrientation, Qt.InvertedLandscapeOrientation);
++                return Screen.angleBetween(orientations.native_, Qt.InvertedLandscapeOrientation);
              } else {
                  // if all fails, fallback to primary orientation
--                return Screen.angleBetween(nativeOrientation, primaryOrientation);
++                return Screen.angleBetween(orientations.native_, orientations.primary);
+             }
+         }
+     }
@@ -128,19 +139,19 @@
      function angleToOrientation(angle) {
          switch (angle) {
          case 0:
--            return nativeOrientation;
++            return orientations.native_;
          case 90:
--            return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
++            return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation
                                                                  : Qt.PortraitOrientation;
          case 180:
--            return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
++            return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation
                                                                  : Qt.InvertedLandscapeOrientation;
          case 270:
--            return nativeOrientation === Qt.PortraitOrientation ? Qt.LandscapeOrientation
++            return orientations.native_ === Qt.PortraitOrientation ? Qt.LandscapeOrientation
                                                                  : Qt.InvertedPortraitOrientation;
          default:
              console.warn("angleToOrientation: Invalid orientation angle: " + angle);
--            return primaryOrientation;
++            return orientations.primary;
+         }
+     }
@@ -159,8 +170,7 @@
          width: root.width
          height: root.height
          orientation: root.angleToOrientation(orientationAngle)
--        primaryOrientation: root.primaryOrientation
--        nativeOrientation: root.nativeOrientation
++        orientations: root.orientations
          nativeWidth: root.width
          nativeHeight: root.height
          mode: applicationArguments.mode
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2015-10-30 13:37:40 +0000
 +++ qml/Shell.qml	2015-10-30 13:37:41 +0000
@@ -49,8 +49,7 @@
      // to be set from outside
      property int orientationAngle: 0
      property int orientation
--    property int primaryOrientation
--    property int nativeOrientation
++    property Orientations orientations
      property real nativeWidth
      property real nativeHeight
      property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress
@@ -86,7 +85,7 @@
          } else if (greeter && greeter.shown) {
              return Qt.PrimaryOrientation;
          } else if (mainApp) {
--            return mainApp.supportedOrientations;
++            return shell.orientations.map(mainApp.supportedOrientations);
          } else {
              // we just don't care
              return Qt.PortraitOrientation
@@ -299,21 +298,16 @@
+             }
              Binding {
                  target: applicationsDisplayLoader.item
++                property: "orientations"
++                value: shell.orientations
++            }
++            Binding {
++                target: applicationsDisplayLoader.item
                  property: "background"
                  value: wallpaperResolver.background
+             }
              Binding {
                  target: applicationsDisplayLoader.item
--                property: "shellPrimaryOrientation"
--                value: shell.primaryOrientation
--            }
--            Binding {
--                target: applicationsDisplayLoader.item
--                property: "nativeOrientation"
--                value: shell.nativeOrientation
--            }
--            Binding {
--                target: applicationsDisplayLoader.item
                  property: "nativeWidth"
                  value: shell.nativeWidth
+             }
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2015-10-30 13:37:40 +0000
 +++ qml/Stages/DesktopStage.qml	2015-10-30 13:37:41 +0000
@@ -22,6 +22,7 @@
  import Unity.Application 0.1
  import "../Components"
  import "../Components/PanelState"
++import "../Components"
  import Utils 0.1
  import Ubuntu.Gestures 0.1
@@ -37,8 +38,7 @@
      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 QtObject orientations
      property bool beingResized: false
      property bool keepDashRunning: true
      property bool suspended: false
 === modified file 'qml/Stages/PhoneStage.qml'
 --- qml/Stages/PhoneStage.qml	2015-09-21 13:37:47 +0000
 +++ qml/Stages/PhoneStage.qml	2015-10-30 13:37:41 +0000
@@ -39,9 +39,9 @@
      property bool keepDashRunning: true
      property bool suspended: false
      property int shellOrientationAngle: 0
++
      property int shellOrientation
--    property int shellPrimaryOrientation
--    property int nativeOrientation
++    property QtObject orientations
      property real nativeWidth
      property real nativeHeight
      property bool beingResized: false
@@ -71,7 +71,7 @@
              var supportedOrientations = spreadDelegate.application.supportedOrientations;
              if (supportedOrientations === Qt.PrimaryOrientation) {
--                supportedOrientations = spreadDelegate.shellPrimaryOrientation;
++                supportedOrientations = root.orientations.primary;
+             }
              if (delta === 180 && (supportedOrientations & spreadDelegate.shellOrientation)) {
@@ -535,11 +535,9 @@
                      visible: (progress >= 0 && progress < 1.7)
                              || (isDash && priv.focusedAppDelegateIsDislocated)
--
                      shellOrientationAngle: root.shellOrientationAngle
                      shellOrientation: root.shellOrientation
--                    shellPrimaryOrientation: root.shellPrimaryOrientation
--                    nativeOrientation: root.nativeOrientation
++                    orientations: root.orientations
                      onClicked: {
                          if (root.altTabEnabled && spreadView.phase == 2) {
 === modified file 'qml/Stages/SpreadDelegate.qml'
 --- qml/Stages/SpreadDelegate.qml	2015-09-21 13:10:02 +0000
 +++ qml/Stages/SpreadDelegate.qml	2015-10-30 13:37:41 +0000
@@ -42,8 +42,7 @@
      property alias application: appWindow.application
      property int shellOrientationAngle
      property int shellOrientation
--    property int shellPrimaryOrientation
--    property int nativeOrientation
++    property QtObject orientations
      function matchShellOrientation() {
          if (!root.application)
@@ -157,7 +156,7 @@
                              var supportedOrientations = root.application.supportedOrientations;
                              if (supportedOrientations === Qt.PrimaryOrientation) {
--                                supportedOrientations = root.shellPrimaryOrientation;
++                                supportedOrientations = root.orientations.primary;
+                             }
                              // If it doesn't support shell's current orientation
@@ -166,18 +165,18 @@
                              if (supportedOrientations & root.shellOrientation) {
                                  chosenOrientation = root.shellOrientation;
                              } else if (supportedOrientations & Qt.PortraitOrientation) {
--                                chosenOrientation = Qt.PortraitOrientation;
++                                chosenOrientation = root.orientations.portrait;
                              } else if (supportedOrientations & Qt.LandscapeOrientation) {
--                                chosenOrientation = Qt.LandscapeOrientation;
++                                chosenOrientation = root.orientations.landscape;
                              } else if (supportedOrientations & Qt.InvertedPortraitOrientation) {
--                                chosenOrientation = Qt.InvertedPortraitOrientation;
++                                chosenOrientation = root.orientations.invertedPortrait;
                              } else if (supportedOrientations & Qt.InvertedLandscapeOrientation) {
--                                chosenOrientation = Qt.InvertedLandscapeOrientation;
++                                chosenOrientation = root.orientations.invertedLandscape;
                              } else {
--                                chosenOrientation = root.shellPrimaryOrientation;
++                                chosenOrientation = root.orientations.primary;
+                             }
--                            return Screen.angleBetween(root.nativeOrientation, chosenOrientation);
++                            return Screen.angleBetween(root.orientations.native_, chosenOrientation);
+                         }
                          rotation: normalizeAngle(appWindowWithShadow.orientationAngle - root.shellOrientationAngle)
 === modified file 'qml/Stages/TabletStage.qml'
 --- qml/Stages/TabletStage.qml	2015-08-03 13:47:44 +0000
 +++ qml/Stages/TabletStage.qml	2015-10-30 13:37:41 +0000
@@ -39,11 +39,12 @@
      property bool keepDashRunning: true
      property bool suspended: false
      property int shellOrientationAngle: 0
++
      property int shellOrientation
--    property int shellPrimaryOrientation
--    property int nativeOrientation
++    property QtObject orientations
      property real nativeWidth
      property real nativeHeight
++
      function updateFocusedAppOrientation() {
          var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
          if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {
@@ -64,7 +65,7 @@
              var supportedOrientations = spreadDelegate.application.supportedOrientations;
              if (supportedOrientations === Qt.PrimaryOrientation) {
--                supportedOrientations = spreadDelegate.shellPrimaryOrientation;
++                supportedOrientations = spreadDelegate.orientations.primary;
+             }
              if (delta === 180 && (supportedOrientations & spreadDelegate.shellOrientation)) {
@@ -130,7 +131,7 @@
          property string oldFocusedAppId: ""
          property bool mainAppOrientationChangesEnabled: false
--        property real landscapeHeight: root.nativeOrientation == Qt.LandscapeOrientation ?
++        property real landscapeHeight: root.orientations.native_ == Qt.LandscapeOrientation ?
                  root.nativeHeight : root.nativeWidth
          property bool shellIsLandscape: root.shellOrientation === Qt.LandscapeOrientation
@@ -691,9 +692,14 @@
                      shellOrientationAngle: wantsMainStage ? root.shellOrientationAngle : 0
                      shellOrientation: wantsMainStage ? root.shellOrientation : Qt.PortraitOrientation
--                    shellPrimaryOrientation: wantsMainStage ? root.shellPrimaryOrientation : Qt.PortraitOrientation
--                    nativeOrientation: wantsMainStage ? root.nativeOrientation : Qt.PortraitOrientation
--
++                    orientations: Orientations {
++                        primary: spreadTile.wantsMainStage ? root.orientations.primary : Qt.PortraitOrientation
++                        native_: spreadTile.wantsMainStage ? root.orientations.native_ : Qt.PortraitOrientation
++                        portrait: root.orientations.portrait
++                        invertedPortrait: root.orientations.invertedPortrait
++                        landscape: root.orientations.landscape
++                        invertedLandscape: root.orientations.invertedLandscape
++                    }
                      onClicked: {
                          if (spreadView.phase == 2) {
 === modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
 --- tests/qmltests/Stages/tst_PhoneStage.qml	2015-08-12 15:08:09 +0000
 +++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-10-30 13:37:41 +0000
@@ -34,8 +34,6 @@
          maximizedAppTopMargin: units.gu(3) + units.dp(2)
          interactive: true
          shellOrientation: Qt.PortraitOrientation
--        shellPrimaryOrientation: Qt.PortraitOrientation
--        nativeOrientation: Qt.PortraitOrientation
+     }
      Binding {
 === modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
 --- tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-03-06 04:44:11 +0000
 +++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-10-30 13:37:41 +0000
@@ -18,6 +18,7 @@
  import QtTest 1.0
  import Unity.Test 0.1 as UT
  import ".."
++import "../../../qml/Components"
  import "../../../qml/Stages"
  import Ubuntu.Components 0.1
  import Ubuntu.Components.ListItems 1.0 as ListItem
@@ -73,8 +74,11 @@
                          return Qt.LandscapeOrientation;
+                     }
+                 }
--                shellPrimaryOrientation: Qt.PortraitOrientation
--                nativeOrientation: Qt.PortraitOrientation
++
++                orientations: Orientations {
++                    // the default values will do
++                }
++
                  maximizedAppTopMargin: units.gu(3)
                  Component.onDestruction: {
                      spreadDelegateLoader.itemDestroyed = true;
 === modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
 --- tests/qmltests/Stages/tst_TabletStage.qml	2015-09-02 14:26:43 +0000
 +++ tests/qmltests/Stages/tst_TabletStage.qml	2015-10-30 13:37:41 +0000
@@ -22,6 +22,7 @@
  import Unity.Test 0.1
  import "../../../qml/Stages"
++import "../../../qml/Components"
  Rectangle {
      id: root
@@ -50,10 +51,9 @@
                  maximizedAppTopMargin: units.gu(3) + units.dp(2)
                  interactive: true
                  shellOrientation: Qt.LandscapeOrientation
--                shellPrimaryOrientation: Qt.LandscapeOrientation
--                nativeOrientation: Qt.LandscapeOrientation
                  nativeWidth: width
                  nativeHeight: height
++                orientations: Orientations{} // Defaults are fine for testing
                  focus: true
+             }
+         }
 === modified file 'tests/qmltests/tst_OrientedShell.qml'
 --- tests/qmltests/tst_OrientedShell.qml	2015-10-05 22:04:32 +0000
 +++ tests/qmltests/tst_OrientedShell.qml	2015-10-30 13:37:41 +0000
@@ -840,7 +840,7 @@
              // shell should remain in its primery orientation as the app in the main stage
              // is the one that dictates its orientation. In this case it's unity8-dash
              // which supports only primary orientation
--            compare(shell.orientation, orientedShell.primaryOrientation);
++            compare(shell.orientation, orientedShell.orientations.primary);
+         }
          function test_sideStageAppsRemainPortraitInSpread_data() {
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-10-30 13:37:40 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-10-30 13:37:41 +0000
@@ -32,6 +32,7 @@
  import Utils 0.1
  import "../../qml"
++import "../../qml/Components"
  import "../../qml/Components/PanelState"
  import "Stages"
@@ -99,8 +100,7 @@
                      id: __shell
                      usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
                      orientation: Qt.PortraitOrientation
--                    primaryOrientation: Qt.PortraitOrientation
--                    nativeOrientation: Qt.PortraitOrientation
++                    orientations: Orientations{} // Defaults are fine for testing
                      Component.onDestruction: {
                          shellLoader.itemDestroyed = true;
+                     }