Merge lp:~aacid/unity8/bring_back_fix_1517830 into lp:unity8

[Albert Astals Cid]

Bring back fix for 1517830

Now with autotest \o/

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
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

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2705
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2575/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3389
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1949
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1949
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1949
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3417
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3268/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3268/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3268/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3268/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3268/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3268/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3268/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3268/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3268
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3268/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2575/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
yes tested on silo and devices
 * Did CI run pass? If not, please explain why.
yes

review: Approve

=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2016-11-03 12:06:32 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2016-11-25 14:48:30 +0000
@@ -70,6 +70,7 @@
                         objectName: "playButton"
                         width: trackRow.column1Width
                         height: width
+                        activeFocusOnPress: false
 
                         onClicked: {
                             if (trackItem.isPlayingItem) {

=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2016-11-14 01:39:43 +0000
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2016-11-25 14:48:30 +0000
@@ -37,6 +37,51 @@
         id: mockPreviewModel
     }
 
+    ListModel {
+        id: tracksModel
+        Component.onCompleted:
+        {
+            tracksModel.append( { "type" : "audio1",
+                                  "widgetId" : "audiopw1",
+                                  "properties" : { "tracks" : [
+                                                                { title: "Some track name", length: "30", source: "/not/existinga/path/testsound1" }
+                                                              ]
+                                                 }
+                                }
+                              );
+            tracksModel.append(
+                                { "type" : "audio",
+                                  "widgetId" : "audiopw",
+                                  "properties" : { "tracks" : [
+                                                                { title: "Some track name", length: "30", source: "/not/existing/path/testsound1" },
+                                                                { title: "Some other track name", subtitle: "Subtitle", length: "83", source: "/not/existing/path/testsound2" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound3" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound4" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound5" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound6" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound7" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound8" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound9" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound10" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound11" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound12" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound13" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound14" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound15" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound16" },
+                                                                { title: "And another one", length: "7425", source: "/not/existing/path/testsound17" }
+                                                              ]
+                                                 }
+                                } );
+        }
+    }
+
+    QtObject {
+        id: audiosModel
+        property int widgetColumnCount: 1
+        property var columnModel: { tracksModel }
+    }
+
     Preview {
         id: preview
         anchors.fill: parent
@@ -57,6 +102,7 @@
         function init() {
             var widget = findChild(preview, "previewListRow0");
             widget.positionViewAtBeginning();
+            preview.previewModel = mockPreviewModel;
         }
 
         function test_triggered() {
@@ -147,5 +193,22 @@
                 skip("preview %1 or widget %2 have been destroyed, thus we can't safely continue this test".arg(preview_str).arg(widget_str))
             }
         }
+
+        function test_audios() {
+            preview.previewModel = audiosModel;
+            waitForRendering(preview);
+
+            // Scroll down
+            var previewListRow0 = findChild(preview, "previewListRow0");
+            flickToYEnd(previewListRow0);
+
+            var previewsContentY = previewListRow0.contentY;
+
+            var trackItem = findChild(preview, "trackItem16");
+            mouseClick(findChild(trackItem, "playButton"));
+
+            expectFail("", "Clicking on a track should not change contentY.");
+            tryCompareFunction(function () { return previewsContentY != previewListRow0.contentY; }, true);
+        }
     }
 }