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

Proposed by Albert Astals Cid
Status: Superseded
Proposed branch: lp:~aacid/unity8/moreAsyncAudioCard
Merge into: lp:unity8
Diff against target: 78 lines (+27/-6)
3 files modified
plugins/Dash/AudioProgressBar.qml (+1/-0)
plugins/Dash/CardCreator.js (+12/-2)
tests/plugins/Dash/cardcreator/9.res (+14/-4)
To merge this branch: bzr merge lp:~aacid/unity8/moreAsyncAudioCard
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+283013@code.launchpad.net

This proposal has been superseded by 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?
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

To post a comment you must log in.
lp:~aacid/unity8/moreAsyncAudioCard updated
2138. By Albert Astals Cid

fix test

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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 :

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 :

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 :
lp:~aacid/unity8/moreAsyncAudioCard updated
2139. By Albert Astals Cid

Merge circleForAudioCards

2140. By Albert Astals Cid

Require newer sdk

2141. By Albert Astals Cid

Merge

2142. By Albert Astals Cid

Merge cardCreatorFixedHeaderSizeOptimization

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Dash/AudioProgressBar.qml'
2--- plugins/Dash/AudioProgressBar.qml 2015-12-03 14:44:08 +0000
3+++ plugins/Dash/AudioProgressBar.qml 2016-02-11 09:42:14 +0000
4@@ -31,6 +31,7 @@
5 anchors { left: parent.left; right: parent.right }
6 height: units.dp(6)
7 source: "graphics/music_progress_bg.png"
8+ asynchronous: true
9 sourceSize.width: width
10 sourceSize.height: height
11 }
12
13=== modified file 'plugins/Dash/CardCreator.js'
14--- plugins/Dash/CardCreator.js 2016-01-29 11:52:58 +0000
15+++ plugins/Dash/CardCreator.js 2016-02-11 09:42:14 +0000
16@@ -152,11 +152,21 @@
17 visible: parent.pressed; \n\
18 radius: "medium"; \n\
19 } \n\
20+ Rectangle { \n\
21+ color: Qt.rgba(0, 0, 0, 0.5); \n\
22+ anchors.centerIn: parent; \n\
23+ width: parent.width * 0.5; \n\
24+ height: width; \n\
25+ radius: width / 2; \n\
26+ } \n\
27 Icon { \n\
28- anchors.fill: parent; \n\
29- anchors.margins: parent.height > units.gu(5) ? units.gu(2) : 0; \n\
30+ anchors.centerIn: parent; \n\
31+ width: parent.width * 0.3; \n\
32+ height: width; \n\
33 opacity: 0.9; \n\
34 name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
35+ color: "white"; \n\
36+ asynchronous: true; \n\
37 } \n\
38 onClicked: { \n\
39 if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
40
41=== modified file 'tests/plugins/Dash/cardcreator/9.res'
42--- tests/plugins/Dash/cardcreator/9.res 2016-01-11 15:40:59 +0000
43+++ tests/plugins/Dash/cardcreator/9.res 2016-02-11 09:42:14 +0000
44@@ -3,7 +3,7 @@
45 property var components;
46 property var cardData;
47 property string artShapeStyle: "inset";
48- property string backgroundShapeStyle: "inset";
49+ property string backgroundShapeStyle: "inset";
50 property real fontScale: 1.0;
51 property var scopeStyle: null;
52 property int titleAlignment: Text.AlignLeft;
53@@ -80,12 +80,22 @@
54 visible: parent.pressed;
55 radius: "medium";
56 }
57+ Rectangle {
58+ color: Qt.rgba(0, 0, 0, 0.5);
59+ anchors.centerIn: parent;
60+ width: parent.width * 0.5;
61+ height: width;
62+ radius: width / 2;
63+ }
64 Icon {
65- anchors.fill: parent;
66- anchors.margins: parent.height > units.gu(5) ? units.gu(2) : 0;
67+ anchors.centerIn: parent;
68+ width: parent.width * 0.3;
69+ height: width;
70 opacity: 0.9;
71 name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start";
72- }
73+ color: "white";
74+ asynchronous: true;
75+ }
76 onClicked: {
77 if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) {
78 if (DashAudioPlayer.playing) {

Subscribers

People subscribed via source and target branches