Merge lp:~mzanetti/unity8/disable-swipetoclose-while-schnapping into lp:unity8

[Michael Zanetti]

disable swipeToClose while some snapping is happening

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

n/a

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

n/a

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/unity8-ci/4896/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/73
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/61/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/61/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/192
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/192/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15798

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

The code makes sense but i can't seem to find a way to reproduce making it go bad. Any tip on what to do?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/unity8-ci/4912/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/230
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/77
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/230
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/230/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15877

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

> The code makes sense but i can't seem to find a way to reproduce making it go
> bad. Any tip on what to do?

for the record:

[17:19] <mzanetti> tsdgeos: basically you go to spread, then tap on an app
[17:20] <mzanetti> tsdgeos: and while its animating to front, quickly press and hold again
[17:20] <mzanetti> tsdgeos: then you should be able to drag it up/down, even though it's in foreground

[Albert Astals Cid (aacid)]

 * 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.
autopilot is borked

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

review: Approve

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2014-11-13 12:22:03 +0000
+++ qml/Stages/PhoneStage.qml	2014-11-18 09:50:22 +0000
@@ -286,7 +286,7 @@
                     otherSelected: spreadView.selectedIndex >= 0 && !selected
                     interactive: !spreadView.interactive && spreadView.phase === 0
                             && spreadView.shiftedContentX === 0 && root.interactive && index === 0
-                    swipeToCloseEnabled: spreadView.interactive
+                    swipeToCloseEnabled: spreadView.interactive && !snapAnimation.running
                     maximizedAppTopMargin: root.maximizedAppTopMargin
                     dropShadow: spreadView.active ||
                                 (priv.focusedAppDelegate && priv.focusedAppDelegate.x !== 0)

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2014-11-13 12:22:03 +0000
+++ qml/Stages/TabletStage.qml	2014-11-18 09:50:22 +0000
@@ -490,7 +490,7 @@
                     otherSelected: spreadView.selectedIndex >= 0 && !selected
                     isInSideStage: priv.sideStageAppId == model.appId
                     interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
-                    swipeToCloseEnabled: spreadView.interactive
+                    swipeToCloseEnabled: spreadView.interactive && !snapAnimation.running
                     maximizedAppTopMargin: root.maximizedAppTopMargin
                     dragOffset: !isDash && model.appId == priv.mainStageAppId && root.inverseProgress > 0 ? root.inverseProgress : 0
                     application: ApplicationManager.get(index)

=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
--- tests/qmltests/Stages/tst_PhoneStage.qml	2014-11-04 12:52:02 +0000
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2014-11-18 09:50:22 +0000
@@ -274,7 +274,7 @@
             compare(ApplicationManager.focusedApplicationId, selectedApp.appId);
         }
 
-        function test_orientation_change_sent_to_focused_app() {
+        function test_orientationChangeSentToFocusedApp() {
             phoneStage.orientation = Qt.PortraitOrientation;
             addApps(1);
 
@@ -286,7 +286,7 @@
             tryCompare(app, "orientation", Qt.LandscapeOrientation);
         }
 
-        function test_orientation_change_not_sent_to_apps_while_spread_open() {
+        function test_orientationChangeNotSentToAppsWhileSpreadOpen() {
             phoneStage.orientation = Qt.PortraitOrientation;
             addApps(1);
 
@@ -299,7 +299,7 @@
             tryCompare(app, "orientation", Qt.PortraitOrientation);
         }
 
-        function test_orientation_change_not_sent_to_unfocused_app_until_it_focused() {
+        function test_orientationChangeNotSentToUnfocusedAppUntilItFocused() {
             phoneStage.orientation = Qt.PortraitOrientation;
             addApps(1);
 
@@ -357,5 +357,35 @@
             tryCompare(firstApp, "state", ApplicationInfoInterface.Running);
             tryCompare(firstApp, "focused", true);
         }
+
+        function test_cantCloseWhileSnapping() {
+            addApps(2);
+
+            goToSpread();
+
+            var spreadView = findChild(phoneStage, "spreadView");
+            var selectedApp = ApplicationManager.get(2);
+
+            goToSpread();
+
+            var app0 = findChild(spreadView, "appDelegate0");
+            var app1 = findChild(spreadView, "appDelegate1");
+            var app2 = findChild(spreadView, "appDelegate2");
+
+            var dragArea0 = findChild(app0, "dragArea");
+            var dragArea1 = findChild(app1, "dragArea");
+            var dragArea2 = findChild(app2, "dragArea");
+
+            compare(dragArea0.enabled, true);
+            compare(dragArea1.enabled, true);
+            compare(dragArea2.enabled, true);
+
+            phoneStage.select(selectedApp.appId);
+
+            // Make sure all drag areas are disabled instantly. Don't use tryCompare here!
+            compare(dragArea0.enabled, false);
+            compare(dragArea1.enabled, false);
+            compare(dragArea2.enabled, false);
+        }
     }
 }