Merge lp:~feng-kylin/unity8/forbidClosingAppsDuringGesture into lp:unity8

[handsome_feng]

Forbid closing apps during the edge gesture.

Forbid closing apps during the edge gesture.

 * 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

[Michael Zanetti (mzanetti)]

Looks good. Please add a test for it.

review: Needs Fixing

[lp:~feng-kylin/unity8/forbidClosingAppsDuringGesture]

1778. By handsome_feng on 2015-05-15

add a test for it

[handsome_feng (feng-kylin)]

> Looks good. Please add a test for it.

done

[Michael Zanetti (mzanetti)]

Thanks!

I noticed that the email address you've set up on Launchpad to sign the CLA is a different one that you've used to commit this patch.

Can you please either add this qq.com mail address to your Launchpad account or change the commits to use <email address hidden>

review: Needs Information

[handsome_feng (feng-kylin)]

> Thanks!
>
> I noticed that the email address you've set up on Launchpad to sign the CLA is
> a different one that you've used to commit this patch.
>
> Can you please either add this qq.com mail address to your Launchpad account
> or change the commits to use <email address hidden>

Done, I add the qq.com mail address to my Launchpad account.

[Albert Astals Cid (aacid)]

Triggered CI

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1604
http://jenkins.qa.ubuntu.com/job/unity8-ci/5748/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/26
    None: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/27
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20660

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1778
http://jenkins.qa.ubuntu.com/job/unity8-ci/5749/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/27
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/28
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20661

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

This looks nice, do you think you could try making it so that when you vertically swipe starting the horizontal swipe the animation does not break?

review: Needs Information

[lp:~feng-kylin/unity8/forbidClosingAppsDuringGesture]

1779. By handsome_feng on 2015-05-26

Use a MouseArea to eat touch events while edge gesture, because the second touch point will cause the valuse of contendX of the spreadView unpredictable

1780. By handsome_feng on 2015-05-26

Use a MouseArea to eat touch events while edge gesture, because the second touch point will cause the value of contentX of the spreadView unpredictable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1780
http://jenkins.qa.ubuntu.com/job/unity8-ci/5767/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/46
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/30/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/45
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/46
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20741

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

"""
8+ //eat touch events during the right edge gesture
9+ MouseArea {
10+ objectName: "MouseArea"
11+ anchors.fill: parent
"""

Could use a more descriptive object name like "eventEaterArea"

[lp:~feng-kylin/unity8/forbidClosingAppsDuringGesture]

1781. By handsome_feng on 2015-05-27

use a more descriptive object name

[handsome_feng (feng-kylin)]

> """
> 8+ //eat touch events during the right edge gesture
> 9+ MouseArea {
> 10+ objectName: "MouseArea"
> 11+ anchors.fill: parent
> """
>
> Could use a more descriptive object name like "eventEaterArea"

Yeah, done. thanks!

[Michael Zanetti (mzanetti)]

Thanks a lot for this! Looks and works great.

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

Need to be manually triggered on 3rd Party contribution. I've triggered it but I also verified manually that the tests are working.

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1781
http://jenkins.qa.ubuntu.com/job/unity8-ci/5787/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/66
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/50/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/66
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/66/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20844

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2015-05-18 23:03:25 +0000
+++ qml/Stages/PhoneStage.qml	2015-05-27 01:21:49 +0000
@@ -449,6 +449,13 @@
         }
     }
 
+    //eat touch events during the right edge gesture
+    MouseArea {
+        objectName: "eventEaterArea"
+        anchors.fill: parent
+        enabled: spreadDragArea.dragging
+    }
+
     DirectionalDragArea {
         id: spreadDragArea
         objectName: "spreadDragArea"
 
=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2015-05-18 23:03:25 +0000
+++ qml/Stages/TabletStage.qml	2015-05-27 01:21:49 +0000
@@ -596,6 +596,12 @@
         }
     }
 
+    //eat touch events during the right edge gesture
+    MouseArea {
+        anchors.fill: parent
+        enabled: spreadDragArea.dragging
+    }
+
     DirectionalDragArea {
         id: spreadDragArea
         anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
 
=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
--- tests/qmltests/Stages/tst_PhoneStage.qml	2015-04-10 21:16:37 +0000
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-05-27 01:21:49 +0000
@@ -399,6 +399,25 @@
             tryCompare(spreadView, "contentX", -spreadView.shift)
         }
 
+        function test_cantAccessPhoneStageWhileRightEdgeGesture() {
+            var spreadView = findChild(phoneStage, "spreadView");
+            var eventEaterArea = findChild(phoneStage, "eventEaterArea")
+
+            var startX = phoneStage.width - 2;
+            var startY = phoneStage.height / 2;
+            var endY = startY;
+            var endX = phoneStage.width / 2;
+
+            touchFlick(phoneStage, startX, startY, endX, endY,
+                       true /* beginTouch */, false /* endTouch */, units.gu(10), 50);
+
+            compare(eventEaterArea.enabled, true);
+
+            touchRelease(phoneStage, endX, endY);
+
+            compare(eventEaterArea.enabled, false);
+        }
+
         function test_leftEdge_data() {
             return [
                 { tag: "normal", inSpread: false, leftEdgeDragWidth: units.gu(5), shouldMoveApp: true },