Merge lp:~cimi/unity8/fix-1236286 into lp:unity8

[Andrea Cimitan]

Threshold to activate the left edge swipe to reveal dash is now 26 GU

Threshold to activate the left edge swipe to reveal dash is now 26 GU

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:479
http://jenkins.qa.ubuntu.com/job/unity8-ci/1485/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/38
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/38/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/9
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/38
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/38
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2667
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2718/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/373
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/374

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1485/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

please adjust the left-edge qml test to check for the distance. For example by once releasing at 25 gus and checking if it's NOT going to the dash, and once with 27 gus and check if it does.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/unity8-ci/1491/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/77/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/15
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/68/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/77
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/76
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2754
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/449
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/438

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1491/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

thanks :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/638/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/388
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/24
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/388
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/376
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3043
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/998
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/996

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Grr ;)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/unity8-ci/1561/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/380
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/392
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/392/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/380
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2961
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3046
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1003
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1002

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1561/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/639/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/3087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/25
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/393
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/393/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/381
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/381/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3049
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1007

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Broken maguros, had to restart.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Launcher/Launcher.qml'
--- Launcher/Launcher.qml	2013-09-12 19:08:06 +0000
+++ Launcher/Launcher.qml	2013-10-25 13:53:41 +0000
@@ -28,7 +28,7 @@
 
     property int panelWidth: units.gu(8)
     property int dragAreaWidth: units.gu(1)
-    property int minimizeDistance: panelWidth * 2.5
+    property int minimizeDistance: units.gu(26)
     property real progress: dragArea.dragging  && dragArea.touchX > panelWidth ?
                                 (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
 

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2013-10-09 20:01:12 +0000
+++ tests/qmltests/tst_Shell.qml	2013-10-25 13:53:41 +0000
@@ -111,14 +111,14 @@
             waitUntilApplicationWindowIsFullyVisible();
 
             // Minimize the application we just launched
-            swipeFromLeftEdge();
+            swipeFromLeftEdge(units.gu(27));
 
             waitForUIToSettle();
 
             checkRightEdgeDragWithMinimizedApp();
 
             // Minimize that application once again
-            swipeFromLeftEdge();
+            swipeFromLeftEdge(units.gu(27));
 
             // Right edge behavior should now be the same as before that app,
             // was launched.  Manually cleanup beforehand to get to initial
@@ -130,8 +130,10 @@
 
         function test_leftEdgeDrag_data() {
             return [
-                {tag: "without launcher", revealLauncher: false},
-                {tag: "with launcher", revealLauncher: true},
+                {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true},
+                {tag: "with launcher", revealLauncher: true, swipeLength: units.gu(27), appHides: true},
+                {tag: "small swipe", revealLauncher: false, swipeLength: units.gu(25), appHides: false},
+                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true}
             ];
         }
 
@@ -144,8 +146,11 @@
                 dragLauncherIntoView();
             }
 
-            swipeFromLeftEdge();
-            waitUntilApplicationWindowIsFullyHidden();
+            swipeFromLeftEdge(data.swipeLength);
+            if (data.appHides)
+                waitUntilApplicationWindowIsFullyHidden();
+            else
+                waitUntilApplicationWindowIsFullyVisible();
         }
 
         function test_suspend() {
@@ -293,7 +298,7 @@
             waitUntilApplicationWindowIsFullyVisible();
 
             // Minimize the application we just launched
-            swipeFromLeftEdge();
+            swipeFromLeftEdge(units.gu(27));
 
             // Wait for the whole UI to settle down
             waitUntilApplicationWindowIsFullyHidden();
@@ -376,10 +381,10 @@
             }
         }
 
-        function swipeFromLeftEdge() {
+        function swipeFromLeftEdge(swipeLength) {
             var touchStartX = 2;
             var touchStartY = shell.height / 2;
-            touchFlick(shell, touchStartX, touchStartY, shell.width * 0.75, touchStartY);
+            touchFlick(shell, touchStartX, touchStartY, swipeLength, touchStartY);
         }
 
         function swipeLeftFromCenter() {