Merge into trunk : desktopRotatedCamera : Code : Unity 8

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-03-11	Approve on 2016-06-03
Lukáš Tinkl (community)		2016-03-11	Approve on 2016-05-24
Michał Sawicz		2016-03-11	Abstain on 2016-05-23
PS Jenkins bot	continuous-integration	2016-03-11	Pending
Review via email: mp+288772@code.launchpad.net

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-25: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/481/rebuild

review: Approve (continuous-integration)

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

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-26: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/499/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-02-26: Posted in a previous version of this proposal

#

Left some inline comments, also seems you want to rotate just the ApplicationWindow inside the delegate, why not do it directly there instead of doing the calculations to take the decoration into account?

Lukáš Tinkl (lukas-kde) wrote on 2016-02-26: Posted in a previous version of this proposal

#

Also, shouldn't there be some transition/animation when the window rotates?

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

#

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> Left some inline comments, also seems you want to rotate just the
> ApplicationWindow inside the delegate, why not do it directly there instead of
> doing the calculations to take the decoration into account?

Yes, only the ApplicationWindow needs rotating and that's what i'm rotating only, no? I'm not sure what you mean with "there" means as instead of what i'm doing now.

Albert Astals Cid (aacid) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> Also, shouldn't there be some transition/animation when the window rotates?

The window doesn't really rotate, you move the phone and the window stays "the same" visually

Lukáš Tinkl (lukas-kde) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> > Left some inline comments, also seems you want to rotate just the
> > ApplicationWindow inside the delegate, why not do it directly there instead
> of
> > doing the calculations to take the decoration into account?
>
> Yes, only the ApplicationWindow needs rotating and that's what i'm rotating
> only, no? I'm not sure what you mean with "there" means as instead of what i'm
> doing now.

Yup sorry, that's what I meant, blaming launchpad diff for not being to show/expand the context...

Albert Astals Cid (aacid) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> Why not just use "rotation: rotationAngle" instead of constructing the Rotation Transform? The "transformOrigin" is by default Item.Center

Because it doesn't work, see current code http://i.imgur.com/SeDA0n4.png vs using rotation as you say http://i.imgur.com/ptyxvQL.png

You need the correct origin otherwise the rotation sends the item away from the rest of the item

Albert Astals Cid (aacid) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> What about other states like "maximized", shouldn't we care about them as well?

They do work already, see tryOrientedShell, mako, windowed, start the second camera app and maximize it, then go to invertedlandscape and see how it works fine

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-26: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/501/rebuild

review: Needs Fixing (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-02-26: Posted in a previous version of this proposal

#

Maybe we would make camera-app not be fullscreen when in desktop mode (have code somewhere calling cameraApplication->setFullcreen(false)) instead of creating another app.

Daniel d'Andrada (dandrader) wrote on 2016-02-26: Posted in a previous version of this proposal

#

Good work, by the way. Completely forgot about implementing RotatesWindowContents in DesktopStage.

Another thing:
"""
{tag: "mako_windowed", deviceName: "mako", orientationAngleAfterRotation: 90, windowed: true},
"""

Wouldn't a "manta_windowed" make more sense? (larger display area)

Daniel d'Andrada (dandrader) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> Maybe we would make camera-app not be fullscreen when in desktop mode (have
> code somewhere calling cameraApplication->setFullcreen(false)) instead of
> creating another app.

By the way, that would mimic the magic that will (or already does, don't recall trying) happen on the device.

Albert Astals Cid (aacid) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> Wouldn't a "manta_windowed" make more sense? (larger display area)

Does it matter? I guess the point is that it works on one it "should" work on all, maybe i can just add all three?

Albert Astals Cid (aacid) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> Maybe we would make camera-app not be fullscreen when in desktop mode (have code somewhere
> calling cameraApplication->setFullcreen(false)) instead of creating another app.

This has advantage that we kind of test the "same" camera app that we [will] have on the real world, the disadvantage is that we lose the hability to try/test pure fullscreen apps on the destkop stage (which i guess at some point makes sense too).

That's why i decided to go for the duplication case, but can make it the other way if you prefer.

Daniel d'Andrada (dandrader) wrote on 2016-02-26: Posted in a previous version of this proposal

#

On 26/02/2016 10:36, Albert Astals Cid wrote:
>> Wouldn't a "manta_windowed" make more sense? (larger display area)
> Does it matter? I guess the point is that it works on one it "should" work on all, maybe i can just add all three?

just sugar on top. makes more sense when you look at it or try it out
manually.

Daniel d'Andrada (dandrader) wrote on 2016-02-26: Posted in a previous version of this proposal

#

On 26/02/2016 10:43, Albert Astals Cid wrote:
> This has advantage that we kind of test the "same" camera app that we [will] have on the real world, the disadvantage is that we lose the hability to try/test pure fullscreen apps on the destkop stage (which i guess at some point makes sense too).

We already have other fullscreen apps there: gallery-app, webbrowser-app

Albert Astals Cid (aacid) wrote on 2016-02-26: Posted in a previous version of this proposal

#

> We already have other fullscreen apps there: gallery-app, webbrowser-app

Sure, but they do not have rotatesWindowContents set

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

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-26: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/504/rebuild

review: Needs Fixing (continuous-integration)

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

#

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

review: Needs Fixing (continuous-integration)

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

#

Worked fine from my testing

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

Yes

* Did CI run pass? If not, please explain why.

Yes, unrelated failures

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

Yes

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/649/rebuild

review: Needs Fixing (continuous-integration)

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

#

Approving per superseded MP

review: Approve

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

#

Uh oh: https://drive.google.com/open?id=0B32jwBcbaPloVEZScW9WZC1XSDA

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2016-03-11:

#

> Uh oh: https://drive.google.com/open?id=0B32jwBcbaPloVEZScW9WZC1XSDA

Do you remember the reproduction steps to get into that situation?

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/677/rebuild

review: Approve (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-03-11:

#

W dniu 11.03.2016 o 14:59, Albert Astals Cid pisze:
> Do you remember the reproduction steps to get into that situation?

TBH it was just... start some apps... :S

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-14:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/703/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-14:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/709/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-14:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/724/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24:

#

FAILED: Continuous integration, rev:2101
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/834/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1079/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/834/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/861/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-26:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1067/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-27:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1073/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-05-05:

#

The splash screen is wrongly rotated now. I wonder if this would be the case in phone stage, too, though.

Can't test ATM due to bug #1578112

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-09:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1151/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-05-23:

#

The wrongly oriented splash screen is an issue in staged, too, so a separate one.

review: Abstain

lp:~aacid/unity8/desktopRotatedCamera updated on 2016-05-23

2107. By Albert Astals Cid on 2016-05-23: "compile"
2108. By Albert Astals Cid on 2016-05-23: fix startup of non rotatesWindowContents apps

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-23:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1278/rebuild

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-05-24:

#

Why the unrelated change in plugins/Dash/CardAttributes.qml?

review: Needs Information

lp:~aacid/unity8/desktopRotatedCamera updated on 2016-05-24

2109. By Albert Astals Cid on 2016-05-24: Revert change infected from other branch

Albert Astals Cid (aacid) wrote on 2016-05-24:

#

> Why the unrelated change in plugins/Dash/CardAttributes.qml?

Because i merged from the wrong branch, gone.

Lukáš Tinkl (lukas-kde) wrote on 2016-05-24:

#

Bug: when the window is resized so that height>width (in landscape mode), the controls rotate and never return back: http://developer.kde.org/~lukas/screenshots/unity8/screenshot20160524_132256765.png

review: Needs Fixing

Lukáš Tinkl (lukas-kde) wrote on 2016-05-24:

#

Looks ok, the above failure due to https://bugs.launchpad.net/qtmir/+bug/1542395; otherwise works fine as expected

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

Yes

* Did CI run pass? If not, please explain why.

Yes, except yakkety failures (unrelated to this branch), tests passing locally

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-24:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1290/rebuild

review: Approve (continuous-integration)

Daniel d'Andrada (dandrader) wrote on 2016-05-24:

#

On 24/05/2016 08:26, Lukáš Tinkl wrote:
> Review: Needs Fixing
>
> Bug: when the window is resized so that height>width (in landscape mode), the controls rotate and never return back: http://developer.kde.org/~lukas/screenshots/unity8/screenshot20160524_132256765.png

For the record: that should be the qtubuntu hack acting up, as it's
incompatible with desktop, non-fullscreen, windows.

lp:~aacid/unity8/desktopRotatedCamera updated on 2016-06-02

2110. By Albert Astals Cid on 2016-06-02: Merge

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-03:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1346/rebuild

review: Approve (continuous-integration)

Unity 8

Merge lp:~aacid/unity8/desktopRotatedCamera into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers

 === modified file 'qml/Stages/DecoratedWindow.qml'
 --- qml/Stages/DecoratedWindow.qml	2016-05-27 13:53:03 +0000
 +++ qml/Stages/DecoratedWindow.qml	2016-06-02 07:43:58 +0000
@@ -23,8 +23,8 @@
  FocusScope {
      id: root
--    width: applicationWindow.width
--    height: (decorationShown ? decoration.height : 0) + applicationWindow.height
++    width: !counterRotate ? applicationWindow.width : applicationWindow.height
++    height: visibleDecorationHeight + (!counterRotate ? applicationWindow.height : applicationWindow.width)
      property alias application: applicationWindow.application
      property alias surface: applicationWindow.surface
@@ -36,15 +36,18 @@
      property bool highlightShown: false
      property real shadowOpacity: 1
--    property alias requestedWidth: applicationWindow.requestedWidth
++    property real requestedWidth
      property real requestedHeight
++    property alias surfaceOrientationAngle: applicationWindow.surfaceOrientationAngle
++    readonly property real visibleDecorationHeight: root.decorationShown ? decoration.height : 0
++    readonly property bool counterRotate: surfaceOrientationAngle != 0 && surfaceOrientationAngle != 180
--    property alias minimumWidth: applicationWindow.minimumWidth
--    readonly property int minimumHeight: (root.decorationShown ? decoration.height : 0) + applicationWindow.minimumHeight
--    property alias maximumWidth: applicationWindow.maximumWidth
--    readonly property int maximumHeight: (root.decorationShown ? decoration.height : 0) + applicationWindow.maximumHeight
--    property alias widthIncrement: applicationWindow.widthIncrement
--    property alias heightIncrement: applicationWindow.heightIncrement
++    readonly property int minimumWidth: !counterRotate ? applicationWindow.minimumWidth : applicationWindow.minimumHeight
++    readonly property int minimumHeight: visibleDecorationHeight + (!counterRotate ? applicationWindow.minimumHeight : applicationWindow.minimumWidth)
++    readonly property int maximumWidth: !counterRotate ? applicationWindow.maximumWidth : applicationWindow.maximumHeight
++    readonly property int maximumHeight: visibleDecorationHeight + (!counterRotate ? applicationWindow.maximumHeight : applicationWindow.maximumWidth)
++    readonly property int widthIncrement: !counterRotate ? applicationWindow.widthIncrement : applicationWindow.heightIncrement
++    readonly property int heightIncrement: !counterRotate ? applicationWindow.heightIncrement : applicationWindow.widthIncrement
      signal closeClicked()
      signal maximizeClicked()
@@ -102,8 +105,29 @@
          anchors.top: parent.top
          anchors.topMargin: decoration.height
          anchors.left: parent.left
--        requestedHeight: root.requestedHeight - (root.decorationShown ? decoration.height : 0)
++        readonly property real requestedHeightMinusDecoration: root.requestedHeight - root.visibleDecorationHeight
++        requestedHeight: !counterRotate ? requestedHeightMinusDecoration : root.requestedWidth
++        requestedWidth: !counterRotate ? root.requestedWidth : requestedHeightMinusDecoration
          interactive: true
          focus: true
++
++        transform: Rotation {
++                readonly property int rotationAngle: applicationWindow.application &&
++                                                     applicationWindow.application.rotatesWindowContents
++                                                     ? ((360 - applicationWindow.surfaceOrientationAngle) % 360) : 0
++                origin.x: {
++                    if (rotationAngle == 90) return applicationWindow.height / 2;
++                    else if (rotationAngle == 270) return applicationWindow.width / 2;
++                    else if (rotationAngle == 180) return applicationWindow.width / 2;
++                    else return 0;
++                }
++                origin.y: {
++                    if (rotationAngle == 90) return applicationWindow.height / 2;
++                    else if (rotationAngle == 270) return applicationWindow.width / 2;
++                    else if (rotationAngle == 180) return applicationWindow.height / 2;
++                    else return 0;
++                }
++                angle: rotationAngle
++        }
+     }
+ }
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2016-05-27 13:53:03 +0000
 +++ qml/Stages/DesktopStage.qml	2016-06-02 07:43:58 +0000
@@ -268,14 +268,37 @@
                  width: decoratedWindow.width
                  height: decoratedWindow.height
++
++                Connections {
++                    target: root
++                    onShellOrientationAngleChanged: {
++                        // at this point decoratedWindow.surfaceOrientationAngle is the old shellOrientationAngle
++                        if (application && application.rotatesWindowContents) {
++                            if (state == "normal") {
++                                var angleDiff = decoratedWindow.surfaceOrientationAngle - shellOrientationAngle;
++                                angleDiff = (360 + angleDiff) % 360;
++                                if (angleDiff === 90 || angleDiff === 270) {
++                                    var aux = decoratedWindow.requestedHeight;
++                                    decoratedWindow.requestedHeight = decoratedWindow.requestedWidth + decoratedWindow.visibleDecorationHeight;
++                                    decoratedWindow.requestedWidth = aux - decoratedWindow.visibleDecorationHeight;
++                                }
++                            }
++                            decoratedWindow.surfaceOrientationAngle = shellOrientationAngle;
++                        } else {
++                            decoratedWindow.surfaceOrientationAngle = 0;
++                        }
++                    }
++                }
++
++                readonly property alias application: decoratedWindow.application
++                readonly property alias minimumWidth: decoratedWindow.minimumWidth
++                readonly property alias minimumHeight: decoratedWindow.minimumHeight
++                readonly property alias maximumWidth: decoratedWindow.maximumWidth
++                readonly property alias maximumHeight: decoratedWindow.maximumHeight
++                readonly property alias widthIncrement: decoratedWindow.widthIncrement
++                readonly property alias heightIncrement: decoratedWindow.heightIncrement
                  property int requestedWidth: -1
                  property int requestedHeight: -1
--                property alias minimumWidth: decoratedWindow.minimumWidth
--                property alias minimumHeight: decoratedWindow.minimumHeight
--                property alias maximumWidth: decoratedWindow.maximumWidth
--                property alias maximumHeight: decoratedWindow.maximumHeight
--                property alias widthIncrement: decoratedWindow.widthIncrement
--                property alias heightIncrement: decoratedWindow.heightIncrement
                  readonly property bool maximized: windowState & WindowStateStorage.WindowStateMaximized
                  readonly property bool maximizedLeft: windowState & WindowStateStorage.WindowStateMaximizedLeft
@@ -286,8 +309,6 @@
                  readonly property alias fullscreen: decoratedWindow.fullscreen
                  property int windowState: WindowStateStorage.WindowStateNormal
--
--                readonly property var application: model.application
                  property bool animationsEnabled: true
                  property alias title: decoratedWindow.title
                  readonly property string appName: model.application ? model.application.name : ""
@@ -338,6 +359,12 @@
+                     }
+                 }
                  Component.onCompleted: {
++                    if (application && application.rotatesWindowContents) {
++                        decoratedWindow.surfaceOrientationAngle = shellOrientationAngle;
++                    } else {
++                        decoratedWindow.surfaceOrientationAngle = 0;
++                    }
++
                      // NB: We're differentiating if this delegate was created in response to a new entry in the model
                      //     or if the Repeater is just populating itself with delegates to match the model it received.
                      if (!appRepeater.startingUp) {
@@ -445,8 +472,8 @@
                          name: "fullscreen"; when: decoratedWindow.fullscreen && !appDelegate.minimized
                          PropertyChanges {
                              target: appDelegate;
--                            x: 0;
--                            y: -PanelState.panelHeight
++                            x: rotation == 0 ? 0 : (parent.width - width) / 2 + (shellOrientationAngle == 90 ? -PanelState.panelHeight : PanelState.panelHeight)
++                            y: rotation == 0 ? -PanelState.panelHeight : (parent.height - height) / 2
                              requestedWidth: appContainer.width;
                              requestedHeight: appContainer.height;
+                         }
 === modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
 --- tests/mocks/Unity/Application/ApplicationManager.cpp	2016-04-27 15:01:10 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.cpp	2016-06-02 07:43:58 +0000
@@ -328,6 +328,18 @@
      m_availableApplications.append(application);
      application = new ApplicationInfo(this);
++    application->setAppId("camera-app2");
++    application->setName("Camera2");
++    application->setScreenshotId("camera");
++    application->setIconId("camera");
++    application->setSupportedOrientations(Qt::PortraitOrientation
++                                        | Qt::LandscapeOrientation
++                                        | Qt::InvertedPortraitOrientation
++                                        | Qt::InvertedLandscapeOrientation);
++    application->setRotatesWindowContents(true);
++    m_availableApplications.append(application);
++
++    application = new ApplicationInfo(this);
      application->setAppId("gallery-app");
      application->setName("Gallery");
      application->setScreenshotId("gallery");
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-11-25 10:35:29 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2016-06-02 07:43:58 +0000
@@ -32,6 +32,9 @@
      item->setProgress(10);
      item->setPinned(true);
      m_list.append(item);
++    item = new MockLauncherItem("camera-app2", "/usr/share/applications/camera-app2.desktop", "Camera2", "camera", this);
++    item->setPinned(true);
++    m_list.append(item);
      item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
      item->setProgress(50);
      item->setCountVisible(true);
 === modified file 'tests/qmltests/tst_OrientedShell.qml'
 --- tests/qmltests/tst_OrientedShell.qml	2016-05-27 13:52:13 +0000
 +++ tests/qmltests/tst_OrientedShell.qml	2016-06-02 07:43:58 +0000
@@ -28,6 +28,7 @@
  import Utils 0.1
  import "../../qml"
++import "Stages"
  Rectangle {
      id: root
@@ -423,6 +424,8 @@
+                     }
+                 }
+             }
++
++            SurfaceManagerControls { }
+         }
+     }
@@ -619,12 +622,22 @@
          function test_appRotatesWindowContents_data() {
              return [
                  {tag: "mako", deviceName: "mako", orientationAngleAfterRotation: 90},
++                {tag: "mako_windowed", deviceName: "mako", orientationAngleAfterRotation: 90, windowed: true},
                  {tag: "manta", deviceName: "manta", orientationAngleAfterRotation: 90},
--                {tag: "flo", deviceName: "flo", orientationAngleAfterRotation: 180}
++                {tag: "manta_windowed", deviceName: "manta", orientationAngleAfterRotation: 90, windowed: true},
++                {tag: "flo", deviceName: "flo", orientationAngleAfterRotation: 180},
++                {tag: "flo_windowed", deviceName: "flo", orientationAngleAfterRotation: 180, windowed: true}
              ];
+         }
          function test_appRotatesWindowContents(data) {
              loadShell(data.deviceName);
++
++            if (data.windowed) {
++                usageModeSelector.selectWindowed();
++            } else {
++                usageModeSelector.selectStaged();
++            }
++
              var cameraSurfaceId = topLevelSurfaceList.nextId;
              var cameraApp = ApplicationManager.startApplication("camera-app");
              verify(cameraApp);