Merge lp:~dandrader/unity8/dontRotateDesktop-lp1515977 into lp:unity8

[Daniel d'Andrada]

Desktop stage rotates only to follow screen orientation

* 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

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

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

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

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2136
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/68/
Executed test runs:

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2136
http://jenkins.qa.ubuntu.com/job/unity8-ci/7067/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6025
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/482/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1772
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/475/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/473
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4652
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6036
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6036/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26652
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/226/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/480
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/480/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26651

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

I've tested it, seems to work fine. code looks ok too.

Jenkins reports some test failures which seem to be related. They also fail locally here. The tested functionality however seems to work from a manual test. So probably a matter of updating the tests themselves.

review: Needs Fixing

[lp:~dandrader/unity8/dontRotateDesktop-lp1515977]

2137. By Daniel d'Andrada on 2016-01-14

Reset usageModeSelector on clean up

[Daniel d'Andrada (dandrader)]

On 14/01/2016 17:18, Michael Zanetti wrote:
> Review: Needs Fixing
>
> I've tested it, seems to work fine. code looks ok too.
>
> Jenkins reports some test failures which seem to be related. They also fail locally here. The tested functionality however seems to work from a manual test. So probably a matter of updating the tests themselves.

Fixed. Had to reset a control on clean up. So was leaving the
environment "dirty" for the next test.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2137
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/78/
Executed test runs:

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2137
http://jenkins.qa.ubuntu.com/job/unity8-ci/7074/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6037
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/489/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1779
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/480
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4664
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6048
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6048/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26683
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/233/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/487
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/487/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26684

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

 * 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.

as much as it can, yes.

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

yes

review: Approve

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-11-30 11:55:40 +0000
+++ qml/Shell.qml	2016-01-14 20:00:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical, Ltd.
+ * Copyright (C) 2013-2016 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
@@ -84,8 +84,8 @@
             return Qt.PrimaryOrientation;
         } else if (greeter && greeter.shown) {
             return Qt.PrimaryOrientation;
-        } else if (mainApp) {
-            return shell.orientations.map(mainApp.supportedOrientations);
+        } else if (applicationsDisplayLoader.item) {
+            return shell.orientations.map(applicationsDisplayLoader.item.supportedOrientations);
         } else {
             // we just don't care
             return Qt.PortraitOrientation

=== modified file 'qml/Stages/AbstractStage.qml'
--- qml/Stages/AbstractStage.qml	2015-10-27 21:29:56 +0000
+++ qml/Stages/AbstractStage.qml	2016-01-14 20:00:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-2016 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
@@ -44,6 +44,10 @@
     property var mainApp: null
     property int mainAppWindowOrientationAngle
     property bool orientationChangesEnabled
+    property int supportedOrientations: Qt.PortraitOrientation
+                                      | Qt.LandscapeOrientation
+                                      | Qt.InvertedPortraitOrientation
+                                      | Qt.InvertedLandscapeOrientation
 
     // Shared code for use in stage implementations
     GSettings {

=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2016-01-08 13:29:03 +0000
+++ qml/Stages/DesktopStage.qml	2016-01-14 20:00:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 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
@@ -40,6 +40,11 @@
             ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
             : null
 
+    // application windows never rotate independently
+    mainAppWindowOrientationAngle: shellOrientationAngle
+
+    orientationChangesEnabled: true
+
     Connections {
         target: ApplicationManager
         onApplicationAdded: {

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-12-03 18:10:39 +0000
+++ qml/Stages/PhoneStage.qml	2016-01-14 20:00:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 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
@@ -83,6 +83,10 @@
                                && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)
                                && spreadView.phase === 0
 
+    supportedOrientations: mainApp ? mainApp.supportedOrientations
+                                   : (Qt.PortraitOrientation | Qt.LandscapeOrientation
+                                      | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation)
+
     // How far left the stage has been dragged
     readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
 

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-12-03 18:10:39 +0000
+++ qml/Stages/TabletStage.qml	2016-01-14 20:00:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 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
@@ -72,6 +72,10 @@
 
     orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
 
+    supportedOrientations: mainApp ? mainApp.supportedOrientations
+                                   : (Qt.PortraitOrientation | Qt.LandscapeOrientation
+                                      | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation)
+
     onWidthChanged: {
         spreadView.selectedIndex = -1;
         spreadView.phase = 0;

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2015-12-01 12:17:24 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2016-01-14 20:00:51 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical, Ltd.
+ * Copyright (C) 2015-2016 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
@@ -292,6 +292,9 @@
                 activeFocusOnPress: false
                 text: "Usage Mode"
                 model: ["Staged", "Windowed", "Automatic"]
+                function selectStaged() {selectedIndex = 0;}
+                function selectWindowed() {selectedIndex = 1;}
+                function selectAutomatic() {selectedIndex = 2;}
             }
             MouseTouchEmulationCheckbox {
                 checked: true
@@ -393,7 +396,7 @@
                 activeFocusOnPress: false
                 property string prevDevName: "mako"
                 onClicked: {
-                    usageModeSelector.selectedIndex = 2; // "Automatic"
+                    usageModeSelector.selectAutomatic();
 
                     if (applicationArguments.deviceName === "desktop") {
                         applicationArguments.deviceName = prevDevName;
@@ -457,6 +460,8 @@
             signalSpy.signalName = "";
 
             LightDM.Greeter.authenticate(""); // reset greeter
+
+            usageModeSelector.selectStaged();
         }
 
         function cleanup() {
@@ -997,7 +1002,7 @@
         }
 
         function test_attachRemoveInputDevices() {
-            usageModeSelector.selectedIndex = 2;
+            usageModeSelector.selectAutomatic();
             tryCompare(mockUnity8Settings, "usageMode", "Automatic")
 
             loadShell("mako")
@@ -1140,6 +1145,61 @@
             tryCompare(shell, "transformRotationAngle" , 0);
         }
 
+        /*
+            Regression test for https://launchpad.net/bugs/1515977
+
+            Preconditions:
+            UI in Desktop mode and landscape
+
+            Steps:
+            - Launch a portrait-only application
+
+            Expected outcome:
+            - Shell stays in landscape
+
+            Buggy outcome:
+            - Shell would rotate to portrait as the newly-focused app doesn't support landscape
+         */
+        function test_portraitOnlyAppInLandscapeDesktop_data() {
+            return [
+                {tag: "mako", deviceName: "mako"},
+                {tag: "manta", deviceName: "manta"},
+                {tag: "flo", deviceName: "flo"}
+            ];
+        }
+        function test_portraitOnlyAppInLandscapeDesktop(data) {
+            loadShell(data.deviceName);
+
+            ////
+            // setup preconditions (put shell in Desktop mode and landscape)
+
+            usageModeSelector.selectWindowed();
+
+            orientedShell.physicalOrientation = orientedShell.orientations.landscape;
+            waitUntilShellIsInOrientation(orientedShell.orientations.landscape);
+            waitForRotationAnimationsToFinish();
+
+            ////
+            // Launch a portrait-only application
+
+            var dialerApp = ApplicationManager.startApplication("dialer-app");
+            verify(dialerApp);
+
+            // ensure the mock dialer-app is as we expect
+            compare(dialerApp.rotatesWindowContents, false);
+            compare(dialerApp.supportedOrientations, Qt.PortraitOrientation | Qt.InvertedPortraitOrientation);
+
+            waitUntilAppSurfaceShowsUp("dialer-app");
+            waitUntilAppWindowCanRotate("dialer-app");
+            verify(isAppSurfaceFocused("dialer-app"));
+
+            ////
+            // check outcome (shell should stay in landscape)
+
+            waitForRotationAnimationsToFinish();
+            compare(shell.orientation, orientedShell.orientations.landscape);
+        }
+
         //  angle - rotation angle in degrees clockwise, relative to the primary orientation.
         function rotateTo(angle) {
             switch (angle) {
@@ -1158,7 +1218,10 @@
             default:
                 verify(false);
             }
+            waitForRotationAnimationsToFinish();
+        }
 
+        function waitForRotationAnimationsToFinish() {
             var rotationStates = findInvisibleChild(orientedShell, "rotationStates");
             verify(rotationStates.d);
             verify(rotationStates.d.stateUpdateTimer);