Merge lp:~renatofilho/address-book-app/fix-1383870 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Reset ListWithAction swipe state if list view start to flicking

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/713/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/16
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/566
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/314/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/486
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/564
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/564/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16574
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/263/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/320
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/320/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/713/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/fix-1383870]

346. By Renato Araujo Oliveira Filho on 2014-12-17

Trunk merged.

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? YES

If you changed UI labels, did you update the pot file? No label changed

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? no packaging changed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/717/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/20
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/607/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/340/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/521/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/605
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/605/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16652
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/279/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/346
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/346/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/717/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-10-14 18:53:44 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-12-17 15:01:41 +0000
@@ -53,6 +53,11 @@
 
     onItemClicked: root.clicked(index, contact)
     onItemPressAndHold: root.pressAndHold(index, contact)
+    onFlickingChanged: {
+        if (flicking) {
+            resetSwipe()
+        }
+    }
 
     Item {
         id: delegate