Merge lp:~ahayzen/music-app/fix-1383870-scroll-close-actions into lp:music-app/remix

[Andrew Hayzen]

* Reset swipe when flicking view (currently ignores if you flick by touching the swiped listitem)

* Reset swipe when flicking view (currently ignores if you flick by touching the swiped listitem)

Currently if you scroll by touching the currently swiped listitem it will not be reset, this aligns us with the SDK and other system app behaviours.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:773
http://91.189.93.70:8080/job/music-app-ci/1192/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/606
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/44

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1192/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM!

review: Approve

=== modified file 'common/ListItemWithActions.qml'
--- common/ListItemWithActions.qml	2014-11-20 01:08:37 +0000
+++ common/ListItemWithActions.qml	2015-01-09 18:30:38 +0000
@@ -261,6 +261,11 @@
     Connections {  // CUSTOM
         target: root.parent.parent
         onClearSelection: selected = false
+        onFlickingChanged: {
+            if (root.parent.parent.flicking) {
+                root.resetSwipe()
+            }
+        }
         onSelectAll: selected = true
         onStateChanged: selectionMode = root.parent.parent.state === "multiselectable"
     }