Merge lp:~unity-team/unity8/fix-slide-to-accept-call into lp:unity8

[Michael Zanetti]

fix positive/negative answer order on the new swipe notification

 * 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:1420
http://jenkins.qa.ubuntu.com/job/unity8-ci/4826/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6483/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1812/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1920/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7735/console

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

review: Needs Fixing (continuous-integration)

[Mirco Müller (macslow)]

That's looking good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1420
http://jenkins.qa.ubuntu.com/job/unity8-ci/4841/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/41
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15544

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

review: Approve (continuous-integration)

=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2014-10-31 10:08:38 +0000
+++ qml/Notifications/Notification.qml	2014-11-05 14:30:44 +0000
@@ -477,11 +477,11 @@
                         width: buttonRow.width
                         leftIconName: "call-end"
                         rightIconName: "call-start"
+                        onRightTriggered: {
+                            notification.notification.invokeAction(notification.actions.data(0, ActionModel.RoleActionId))
+                        }
+
                         onLeftTriggered: {
-                            notification.notification.invokeAction(notification.actions.data(0, ActionModel.RoleActionId))
-                        }
-
-                        onRightTriggered: {
                             notification.notification.invokeAction(notification.actions.data(1, ActionModel.RoleActionId))
                         }
                     }
 
=== modified file 'tests/qmltests/Notifications/tst_SwipeToAct.qml'
--- tests/qmltests/Notifications/tst_SwipeToAct.qml	2014-10-31 10:45:40 +0000
+++ tests/qmltests/Notifications/tst_SwipeToAct.qml	2014-11-05 14:30:44 +0000
@@ -259,14 +259,14 @@
                     var x = swipeMouseArea.width / 2
                     var y = swipeMouseArea.height / 2
 
+                    if(data.checkSwipeToActAccept) {
+                        tryCompareFunction(function() { mouseDrag(slider, x, y, (swipeMouseArea.width / 2) - slider.width, 0); return actionSpy.signalArguments.length > 0; }, true);
+                        compare(actionSpy.signalArguments[0][0], data.actions.data(0, ActionModel.RoleActionId), "got wrong id for positive action")
+                        actionSpy.clear()
+                    }
                     if(data.checkSwipeToActReject) {
                         tryCompareFunction(function() { mouseDrag(slider, x, y, -(swipeMouseArea.width / 2), 0); return actionSpy.signalArguments.length > 0; }, true);
-                        compare(actionSpy.signalArguments[0][0], data.actions.data(0, ActionModel.RoleActionId), "got wrong id for negative action")
-                        actionSpy.clear()
-                    }
-                    if(data.checkSwipeToActAccept) {
-                        tryCompareFunction(function() { mouseDrag(slider, x, y, (swipeMouseArea.width / 2) - slider.width, 0); return actionSpy.signalArguments.length > 0; }, true);
-                        compare(actionSpy.signalArguments[0][0], data.actions.data(1, ActionModel.RoleActionId), "got wrong id for positive action")
+                        compare(actionSpy.signalArguments[0][0], data.actions.data(1, ActionModel.RoleActionId), "got wrong id for negative action")
                         actionSpy.clear()
                     }
                 }