Merge lp:~dandrader/unity8/shouldNotRotate-lp1476757 into lp:unity8

[Daniel d'Andrada]

PhoneStage: ensure you're left in a consistent state after being reset

* 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

[Michael Zanetti (mzanetti)]

Change makes sense, fixes the bug.

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

waiting

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1971
http://jenkins.qa.ubuntu.com/job/unity8-ci/6328/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4290
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/699
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1040
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/567
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4287
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23538
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/699
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/699/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23539

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-08-03 13:47:44 +0000
+++ qml/Stages/PhoneStage.qml	2015-09-21 13:52:42 +0000
@@ -48,17 +48,12 @@
     onBeingResizedChanged: {
         if (beingResized) {
             // Brace yourselves for impact!
-            spreadView.selectedIndex = -1;
-            spreadView.phase = 0;
-            spreadView.contentX = -spreadView.shift;
+            priv.reset();
         }
     }
     onSpreadEnabledChanged: {
         if (!spreadEnabled) {
-            // reset. go back to display the focused app
-            spreadView.selectedIndex = -1;
-            spreadView.phase = 0;
-            spreadView.contentX = -spreadView.shift;
+            priv.reset();
         }
     }
     function updateFocusedAppOrientation() {
@@ -94,6 +89,7 @@
     readonly property var mainApp: applicationManager.focusedApplicationId
             ? applicationManager.findApplication(applicationManager.focusedApplicationId)
             : null
+
     property int mainAppWindowOrientationAngle: 0
     readonly property bool orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
                                                    && !priv.focusedAppDelegateIsDislocated
@@ -216,6 +212,18 @@
         // Is more stable than "spreadView.shiftedContentX === 0" as it filters out noise caused by
         // Flickable.contentX changing due to resizes.
         property bool fullyShowingFocusedApp: true
+
+        function reset() {
+            // The app that's about to go to foreground has to be focused, otherwise
+            // it would leave us in an inconsistent state.
+            if (!root.applicationManager.focusedApplicationId && root.applicationManager.count > 0) {
+                root.applicationManager.focusApplication(root.applicationManager.get(0).appId);
+            }
+
+            spreadView.selectedIndex = -1;
+            spreadView.phase = 0;
+            spreadView.contentX = -spreadView.shift;
+        }
     }
     Timer {
         id: fullyShowingFocusedAppUpdateTimer

=== modified file 'qml/Stages/SpreadDelegate.qml'
--- qml/Stages/SpreadDelegate.qml	2015-07-10 15:55:50 +0000
+++ qml/Stages/SpreadDelegate.qml	2015-09-21 13:52:42 +0000
@@ -268,7 +268,7 @@
                 focus: true
                 anchors {
                     fill: parent
-                    topMargin: appWindow.fullscreen || application.rotatesWindowContents
+                    topMargin: appWindow.fullscreen || (application && application.rotatesWindowContents)
                                    ? 0 : maximizedAppTopMargin
                 }
 

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2015-09-02 13:42:24 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2015-09-21 13:52:42 +0000
@@ -996,6 +996,60 @@
             tryCompare(shell, "transformRotationAngle", root.primaryOrientationAngle);
         }
 
+        /*
+           Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1476757
+
+           Steps:
+           1- have a portrait-only app in foreground (eg unity8-dash)
+           2- launch or switch to some other application
+           3- right-edge swipe to show the apps spread
+           4- swipe up to close the current app (the one from step 2)
+           5- lock the phone (press the power button)
+           6- unlock the phone (press power button again and swipe greeter away)
+               * app from step 1 should be on foreground and focused
+           7- rotate phone
+
+           Expected outcome:
+           - The portrait-only application stays put
+
+           Actual outcome:
+           - The portrait-only application rotates freely
+         */
+        function test_lockPhoneAfterClosingAppInSpreadThenUnlockAndRotate() {
+            loadShell("mako");
+
+            var gmailApp = ApplicationManager.startApplication("gmail-webapp");
+            verify(gmailApp);
+
+            waitUntilAppSurfaceShowsUp("gmail-webapp");
+
+            performEdgeSwipeToShowAppSpread();
+
+            swipeToCloseCurrentAppInSpread();
+
+            // press the power key once
+            Powerd.setStatus(Powerd.Off, Powerd.Unknown);
+            var greeter = findChild(shell, "greeter");
+            tryCompare(greeter, "fullyShown", true);
+
+            // and a second time to turn the display back on
+            Powerd.setStatus(Powerd.On, Powerd.Unknown);
+
+            swipeAwayGreeter();
+
+            verify(isAppSurfaceFocused("unity8-dash"))
+
+            signalSpy.clear();
+            signalSpy.target = shell;
+            signalSpy.signalName = "widthChanged";
+            verify(signalSpy.valid);
+
+            rotateTo(90);
+
+            // shell shouldn't have change its orientation at any moment
+            compare(signalSpy.count, 0);
+        }
+
         //  angle - rotation angle in degrees clockwise, relative to the primary orientation.
         function rotateTo(angle) {
             switch (angle) {
@@ -1016,6 +1070,12 @@
             }
 
             var rotationStates = findInvisibleChild(orientedShell, "rotationStates");
+            verify(rotationStates.d);
+            verify(rotationStates.d.stateUpdateTimer);
+
+            // wait for the delayed state update to take place, if any
+            tryCompare(rotationStates.d.stateUpdateTimer, "running", false);
+
             waitUntilTransitionsEnd(rotationStates);
         }
 
@@ -1239,7 +1299,6 @@
             var childs = new Array(0);
             childs.push(obj)
             while (childs.length > 0) {
-                console.log("Checking " + childs[0].objectName);
                 if (childs[0].objectName === "surfaceItem"
                         && childs[0].surface !== undefined
                         && childs[0].surface === surface) {
@@ -1252,5 +1311,51 @@
             }
             return null;
         }
+
+        function swipeToCloseCurrentAppInSpread() {
+            var spreadView = findChild(shell, "spreadView");
+            verify(spreadView);
+
+            var delegateToClose = findChild(spreadView, "appDelegate0");
+            verify(delegateToClose);
+
+            var appIdToClose = ApplicationManager.get(0).appId;;
+            var appCountBefore = ApplicationManager.count;
+
+            // ensure the current app is widely visible by swiping to the right,
+            // which will move the app windows accordingly
+            touchFlick(shell,
+                shell.width * 0.25, shell.width / 2,
+                shell.width, shell.width / 2);
+
+            tryCompare(spreadView, "flicking", false);
+            tryCompare(spreadView, "moving", false);
+
+            // Swipe up close to its left edge, as it is the only area of it guaranteed to be exposed
+            // in the spread. Eg: its center could be covered by some other delegate.
+            touchFlick(delegateToClose,
+                1, delegateToClose.height / 2,
+                1, - delegateToClose.height / 4);
+
+            // ensure it got closed
+            tryCompare(ApplicationManager, "count", appCountBefore - 1);
+            compare(ApplicationManager.findApplication(appIdToClose), null);
+        }
+
+        function isAppSurfaceFocused(appId) {
+            var appWindow = findChild(shell, "appWindow_" + appId);
+            verify(appWindow);
+
+            var app = ApplicationManager.findApplication(appId);
+            verify(app);
+
+            var surface = app.session.surface;
+            verify(surface);
+
+            var surfaceItem = findSurfaceItem(appWindow, surface);
+            verify(surfaceItem);
+
+            return surfaceItem.activeFocus;
+        }
     }
 }