Merge lp:~mzanetti/unity8/dont-tease-while-moving into lp:unity8

[Michael Zanetti]

don't trigger the greeter teasing during a movement of the greeter

This fixes an issue with the Greeter getting stuck in the middle of a transition.

To reproduce: swipe the greeter a bit to the left and release it so that it moves back to locking the device. While it's moving back, quickly tap on it. The teasing animation will kick in and leave the greeter at the position where it was when the click happened.

We don't really need the teasing animation in any other case than the user no knowing how to unlock. So this commit changes the teaser to only kick in when idling at x == 0.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:479
http://jenkins.qa.ubuntu.com/job/unity8-ci/1483/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/33
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/33/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/7
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/33
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/33
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/33/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2662/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2713/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/363
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/362

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

== 0 or >= 0?

[Michael Zanetti (mzanetti)]

hmm. I don't think we can move the greeter to the right. but even if we could I guess the teaser should be disabled there too. We really only want the teasing to work when the greeter is at 0,0

[lp:~mzanetti/unity8/dont-tease-while-moving]

480. By Michael Zanetti on 2013-10-29

improve comments

[Andrea Cimitan (cimi)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Greeter/Greeter.qml'
--- Greeter/Greeter.qml	2013-09-13 15:17:02 +0000
+++ Greeter/Greeter.qml	2013-10-29 14:20:30 +0000
@@ -52,7 +52,7 @@
     signal unlocked(int uid)
 
     onRightTeaserPressedChanged: {
-        if (rightTeaserPressed && !locked) {
+        if (rightTeaserPressed && !locked && x == 0) {
             teasingTimer.start();
         }
     }

=== modified file 'tests/qmltests/Greeter/tst_Phone.qml'
--- tests/qmltests/Greeter/tst_Phone.qml	2013-09-30 16:03:59 +0000
+++ tests/qmltests/Greeter/tst_Phone.qml	2013-10-29 14:20:30 +0000
@@ -83,8 +83,9 @@
 
         function test_teaseLockedUnlocked_data() {
             return [
-                {tag: "unlocked", locked: false},
-                {tag: "locked", locked: true}
+                {tag: "unlocked", locked: false, moved: false},
+                {tag: "locked", locked: true, moved: false},
+                {tag: "moved", locked: false, moved: true}
             ];
         }
 
@@ -93,10 +94,16 @@
             tryCompare(greeter, "x", 0);
             greeter.locked = data.locked;
 
+            // simulate greeter being in the middle of a swipe
+            if (data.moved) {
+                greeter.x = -units.gu(4);
+                tryCompare(greeter, "x", -units.gu(4));
+            }
+
             mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
             greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating
 
-            if (!data.locked) {
+            if (!data.locked && !data.moved) {
                 // Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area
                 // because animation duration and teaseTimer are the same duration and
                 // might cause slight offsets
@@ -104,10 +111,16 @@
             } else {
                 // waiting 100ms to make sure nothing moves
                 wait(100);
-                compare(greeter.minX, 0, "Greeter moved even tho its locked");
-            }
+                compare(greeter.minX, 0, "Greeter teasing not disabled even though it's locked or moving.");
+            }
+
+            // Restore position in case we moved it for the test
+            if (data.moved) {
+                greeter.x = 0;
+            }
+
             // Wait until we're back to 0
-            tryCompareFunction(function() { return greeter.x;},  0);
+            tryCompareFunction(function() { return greeter.x;}, 0);
         }
 
         function test_statsWelcomeScreen() {