Merge lp:~dandrader/unity8/phone-lock-landscape into lp:unity8

[Daniel d'Andrada]

Dismiss the apps spread if greeter gets shown

Enables Shell to rotate itself back into place while greeter is shown because PhoneStage doesn't allow rotations while the apps spread is open

* 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

[lp:~dandrader/unity8/phone-lock-landscape]

1850. By Daniel d'Andrada on 2015-07-10

Dismiss the apps spread if greeter gets shown

Enables Shell to rotate itself back into place while greeter is shown because
PhoneStage doesn't allow rotations while the apps spread is open

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

waiting. I've ran involved tests. seem to pass.

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1853
http://jenkins.qa.ubuntu.com/job/unity8-ci/6019/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/258
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/311
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21787

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-06-23 17:40:03 +0000
+++ qml/Shell.qml	2015-07-10 15:17:19 +0000
@@ -305,7 +305,7 @@
             Binding {
                 target: applicationsDisplayLoader.item
                 property: "spreadEnabled"
-                value: tutorial.spreadEnabled && (!greeter || !greeter.hasLockedApp)
+                value: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
             }
             Binding {
                 target: applicationsDisplayLoader.item

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-06-23 14:20:23 +0000
+++ qml/Stages/PhoneStage.qml	2015-07-10 15:17:19 +0000
@@ -51,6 +51,14 @@
             spreadView.contentX = -spreadView.shift;
         }
     }
+    onSpreadEnabledChanged: {
+        if (!spreadEnabled) {
+            // reset. go back to display the focused app
+            spreadView.selectedIndex = -1;
+            spreadView.phase = 0;
+            spreadView.contentX = -spreadView.shift;
+        }
+    }
     function updateFocusedAppOrientation() {
         if (spreadRepeater.count > 0) {
             spreadRepeater.itemAt(0).matchShellOrientation();
@@ -281,7 +289,13 @@
 
             switch (phase) {
             case 0:
-                if (shiftedContentX > width * positionMarker2) {
+                // the "spreadEnabled" part is because when code does "phase = 0; contentX = -shift" to
+                // dismiss the spread because spreadEnabled went to false, for some reason, during tests,
+                // Flickable might jump in and change contentX value back, causing the code below to do
+                // "phase = 1" which will make the spread stay.
+                // It sucks that we have no control whatsoever over whether or when Flickable animates its
+                // contentX.
+                if (root.spreadEnabled && shiftedContentX > width * positionMarker2) {
                     phase = 1;
                 }
                 break;
@@ -456,6 +470,7 @@
                         enabled: root.spreadEnabled &&
                                  !spreadView.active &&
                                  !snapAnimation.running &&
+                                 !spreadDragArea.pressed &&
                                  priv.animateX &&
                                  !root.beingResized
                         UbuntuNumberAnimation {

=== modified file 'tests/qmltests/tst_OrientedShell.qml'
--- tests/qmltests/tst_OrientedShell.qml	2015-06-23 17:40:03 +0000
+++ tests/qmltests/tst_OrientedShell.qml	2015-07-10 15:17:19 +0000
@@ -951,6 +951,51 @@
             tryCompare(mockOskSettings, "stayHidden", false);
         }
 
+        /*
+            Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1471609
+
+            Steps:
+             - Open an app which can rotate
+             - Rotate the phone to landscape
+             - Open the app spread
+             - Press the power button while the app spread is open
+             - Wait a bit and press power button again
+
+            Expected outcome:
+             You see greeter in portrat (ie, primary orientation)
+
+            Actual outcome:
+             You see greeter in landscape
+
+            Comments:
+             Greeter supports only the primary orientation (portrait in phones) but
+             the stage doesn't allow orientation changes while the apps spread is open,
+             hence the bug.
+         */
+        function test_phoneWithSpreadInLandscapeWhenGreeterShowsUp() {
+            loadShell("mako");
+
+            var gmailApp = ApplicationManager.startApplication("gmail-webapp");
+            verify(gmailApp);
+
+            // ensure the mock gmail-webapp is as we expect
+            compare(gmailApp.rotatesWindowContents, false);
+            compare(gmailApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
+                    | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
+
+            // wait until it's able to rotate
+            tryCompare(shell, "orientationChangesEnabled", true);
+
+            rotateTo(90);
+            tryCompare(shell, "transformRotationAngle", root.primaryOrientationAngle + 90);
+
+            performEdgeSwipeToShowAppSpread();
+
+            showGreeter();
+
+            tryCompare(shell, "transformRotationAngle", root.primaryOrientationAngle);
+        }
+
         //  angle - rotation angle in degrees clockwise, relative to the primary orientation.
         function rotateTo(angle) {
             switch (angle) {