Unity 8

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

  1. moreAsyncAudioCard
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 2142
Merged at revision: 2241
Proposed branch: lp:~aacid/unity8/moreAsyncAudioCard
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/cardCreatorFixedHeaderSizeOptimization
Diff against target: 106 lines (+11/-6)
5 files modified
debian/control (+4/-4)
plugins/Dash/AudioProgressBar.qml (+1/-0)
plugins/Dash/CardCreator.js (+3/-1)
tests/plugins/Dash/cardcreator/9.res (+2/-1)
tests/plugins/Dash/cardcreator/9.res.cardcreator (+1/-0)
To merge this branch: bzr merge lp:~aacid/unity8/moreAsyncAudioCard
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
Unity8 CI Bot continuous-integration Pending
PS Jenkins bot continuous-integration Pending
Review via email: mp+288671@code.launchpad.net

This proposal supersedes a proposal from 2016-02-11.

Commit message

Audio Cards: Make some of the image loading async

It improves a bit the smoothness of scrolling the list

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/icon_async/+merge/284599

 * 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

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2137
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/130/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2138
http://jenkins.qa.ubuntu.com/job/unity8-ci/7097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6064
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/512/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1802
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4684
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6075
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6075/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26764
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/251/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/510
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/510/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26765

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2138
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/131/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

I need to merge https://code.launchpad.net/~aacid/unity8/circleForAudioCards/+merge/284747 first

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2139
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/323/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/444/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/467
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/485
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/485
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/481
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/481/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/481/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/481
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/481/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/481/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/481
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/481/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/481/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
ap
 * Did you make sure that the branch does not contain spurious tags?
clean

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2139
http://jenkins.qa.ubuntu.com/job/unity8-ci/7262/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6422
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/677/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1967
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/668
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4916
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6433
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6433/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27488
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/348/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/675
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/675/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27489

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote : Posted in a previous version of this proposal

Reapproving, thanks Saviq for spotting to bump the requirement

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2140
http://jenkins.qa.ubuntu.com/job/unity8-ci/7268/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/683/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1973/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/676/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1868/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1868/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/675/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/674/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6441/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/681/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2141
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/646/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/367
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/367
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/367
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/851
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/867
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/867
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/865/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/865
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/865/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-03-04 21:03:43 +0000
3+++ debian/control 2016-03-10 16:53:55 +0000
4@@ -55,7 +55,7 @@
5 qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
6 qtdeclarative5-ubuntu-content1,
7 qtdeclarative5-ubuntu-settings-components (>= 0.7),
8- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
9+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
10 qtdeclarative5-ubuntu-web-plugin,
11 ttf-ubuntu-font-family,
12 Standards-Version: 3.9.4
13@@ -70,7 +70,7 @@
14 Package: indicators-client
15 Architecture: amd64 armhf i386
16 Depends: qmenumodel-qml (>= 0.2.9),
17- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
18+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
19 unity8 (= ${binary:Version}),
20 ${misc:Depends},
21 ${shlibs:Depends},
22@@ -128,7 +128,7 @@
23 Depends: qml-module-qtquick-layouts,
24 qtdeclarative5-ubuntu-settings-components (>= 0.7),
25 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
26- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
27+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
28 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
29 ubuntu-thumbnailer-impl-0,
30 unity-application-impl-13,
31@@ -158,7 +158,7 @@
32 python3-fixtures,
33 python3-gi,
34 qttestability-autopilot (>= 1.4),
35- ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
36+ ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
37 unity-scope-click,
38 unity8 (= ${source:Version}),
39 unity8-fake-env (= ${source:Version}),
40
41=== modified file 'plugins/Dash/AudioProgressBar.qml'
42--- plugins/Dash/AudioProgressBar.qml 2015-12-03 14:44:08 +0000
43+++ plugins/Dash/AudioProgressBar.qml 2016-03-10 16:53:55 +0000
44@@ -31,6 +31,7 @@
45 anchors { left: parent.left; right: parent.right }
46 height: units.dp(6)
47 source: "graphics/music_progress_bg.png"
48+ asynchronous: true
49 sourceSize.width: width
50 sourceSize.height: height
51 }
52
53=== modified file 'plugins/Dash/CardCreator.js'
54--- plugins/Dash/CardCreator.js 2016-03-10 16:53:55 +0000
55+++ plugins/Dash/CardCreator.js 2016-03-10 16:53:55 +0000
56@@ -146,6 +146,7 @@
57 // %1 is anchors.fill
58 // %2 is width
59 // %3 is height
60+// %4 is whether the icon should be asynchronous or not
61 var kAudioButtonCode = 'AbstractButton { \n\
62 id: audioButton; \n\
63 anchors.fill: %1; \n\
64@@ -171,6 +172,7 @@
65 opacity: 0.9; \n\
66 name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
67 color: "white"; \n\
68+ asynchronous: %4; \n\
69 } \n\
70 onClicked: { \n\
71 if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
72@@ -818,7 +820,7 @@
73 audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
74 : 'root.fixedHeaderHeight + 2 * units.gu(1)';
75 }
76- code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight);
77+ code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight).arg(asynchronous);
78 }
79
80 if (hasSummary) {
81
82=== modified file 'tests/plugins/Dash/cardcreator/9.res'
83--- tests/plugins/Dash/cardcreator/9.res 2016-03-10 16:53:55 +0000
84+++ tests/plugins/Dash/cardcreator/9.res 2016-03-10 16:53:55 +0000
85@@ -91,7 +91,8 @@
86 opacity: 0.9;
87 name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start";
88 color: "white";
89- }
90+ asynchronous: true;
91+ }
92 onClicked: {
93 if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) {
94 if (DashAudioPlayer.playing) {
95
96=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
97--- tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-03-10 16:53:55 +0000
98+++ tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-03-10 16:53:55 +0000
99@@ -90,6 +90,7 @@
100 opacity: 0.9;
101 name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start";
102 color: "white";
103+ asynchronous: false;
104 }
105 onClicked: {
106 if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) {

Subscribers

People subscribed via source and target branches