Merge lp:~aacid/unity8/noTouchdownForCardToolCard into lp:unity8
- noTouchdownForCardToolCard
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Andrea Cimitan |
Approved revision: | 2547 |
Merged at revision: | 2618 |
Proposed branch: | lp:~aacid/unity8/noTouchdownForCardToolCard |
Merge into: | lp:unity8 |
Prerequisite: | lp:~aacid/unity8/touchdownLoader |
Diff against target: |
153 lines (+2/-72) 8 files modified
plugins/Dash/CardCreator.js (+1/-1) tests/plugins/Dash/cardcreator/1.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/11.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/12.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/4.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/6.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/8.res.cardcreator (+0/-10) tests/plugins/Dash/cardcreator/9.res.cardcreator (+1/-11) |
To merge this branch: | bzr merge lp:~aacid/unity8/noTouchdownForCardToolCard |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Andrea Cimitan (community) | Approve | ||
Review via email: mp+300739@code.launchpad.net |
Commit message
No need for the touchdown in the card for the cardtool
We only use that card to get some size measurements so the touchdown code adds nothing
Description of the change
* Are there any related MPs required for this MP to build/function as expected?
Prerequisite
* 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) wrote : | # |
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2544
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2545. By Albert Astals Cid
-
Adapt test to code changes
- 2546. By Albert Astals Cid
-
Merge
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2545
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2546
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2547. By Albert Astals Cid
-
Merge
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2547
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Andrea Cimitan (cimi) wrote : | # |
* 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.
old failures in yakkety
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2547
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2547
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'plugins/Dash/CardCreator.js' |
2 | --- plugins/Dash/CardCreator.js 2016-08-08 09:13:47 +0000 |
3 | +++ plugins/Dash/CardCreator.js 2016-08-08 09:13:47 +0000 |
4 | @@ -925,7 +925,7 @@ |
5 | code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor); |
6 | } |
7 | |
8 | - if (artShapeStyle != "shadow" && artShapeStyle != "icon") { |
9 | + if (artShapeStyle != "shadow" && artShapeStyle != "icon" && !isCardTool) { |
10 | var touchdownAnchors; |
11 | if (hasBackground) { |
12 | touchdownAnchors = 'fill: backgroundLoader'; |
13 | |
14 | === modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator' |
15 | --- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-08-08 09:13:47 +0000 |
16 | +++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-08-08 09:13:47 +0000 |
17 | @@ -65,15 +65,5 @@ |
18 | font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; |
19 | horizontalAlignment: Text.AlignHCenter; |
20 | } |
21 | -Loader { |
22 | - active: root.pressed; |
23 | - anchors { fill: artShapeLoader } |
24 | - sourceComponent: UbuntuShape { |
25 | - objectName: "touchdown"; |
26 | - anchors.fill: parent; |
27 | - radius: "medium"; |
28 | - borderSource: "radius_pressed.sci" |
29 | - } |
30 | -} |
31 | implicitHeight: titleLabel.y + titleLabel.height + units.gu(1); |
32 | } |
33 | |
34 | === modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator' |
35 | --- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-08-08 09:13:47 +0000 |
36 | +++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-08-08 09:13:47 +0000 |
37 | @@ -156,15 +156,5 @@ |
38 | |
39 | ] |
40 | } |
41 | -Loader { |
42 | - active: root.pressed; |
43 | - anchors { fill: backgroundLoader } |
44 | - sourceComponent: UbuntuShape { |
45 | - objectName: "touchdown"; |
46 | - anchors.fill: parent; |
47 | - radius: "medium"; |
48 | - borderSource: "radius_pressed.sci" |
49 | - } |
50 | -} |
51 | implicitHeight: row.y + row.height + units.gu(1); |
52 | } |
53 | |
54 | === modified file 'tests/plugins/Dash/cardcreator/12.res.cardcreator' |
55 | --- tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-08-08 09:13:47 +0000 |
56 | +++ tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-08-08 09:13:47 +0000 |
57 | @@ -91,15 +91,5 @@ |
58 | model: cardData && cardData["socialActions"]; |
59 | onClicked: root.action(actionId); |
60 | } |
61 | -Loader { |
62 | - active: root.pressed; |
63 | - anchors { fill: artShapeLoader } |
64 | - sourceComponent: UbuntuShape { |
65 | - objectName: "touchdown"; |
66 | - anchors.fill: parent; |
67 | - radius: "medium"; |
68 | - borderSource: "radius_pressed.sci" |
69 | - } |
70 | -} |
71 | implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1); |
72 | } |
73 | |
74 | === modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator' |
75 | --- tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-08-08 09:13:47 +0000 |
76 | +++ tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-08-08 09:13:47 +0000 |
77 | @@ -95,15 +95,5 @@ |
78 | } |
79 | ] |
80 | } |
81 | -Loader { |
82 | - active: root.pressed; |
83 | - anchors { fill: root } |
84 | - sourceComponent: UbuntuShape { |
85 | - objectName: "touchdown"; |
86 | - anchors.fill: parent; |
87 | - radius: "medium"; |
88 | - borderSource: "radius_pressed.sci" |
89 | - } |
90 | -} |
91 | implicitHeight: row.y + row.height + units.gu(1); |
92 | } |
93 | |
94 | === modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator' |
95 | --- tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-08-08 09:13:47 +0000 |
96 | +++ tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-08-08 09:13:47 +0000 |
97 | @@ -112,15 +112,5 @@ |
98 | |
99 | ] |
100 | } |
101 | -Loader { |
102 | - active: root.pressed; |
103 | - anchors { fill: backgroundLoader } |
104 | - sourceComponent: UbuntuShape { |
105 | - objectName: "touchdown"; |
106 | - anchors.fill: parent; |
107 | - radius: "medium"; |
108 | - borderSource: "radius_pressed.sci" |
109 | - } |
110 | -} |
111 | implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1); |
112 | } |
113 | |
114 | === modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator' |
115 | --- tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-08-08 09:13:47 +0000 |
116 | +++ tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-08-08 09:13:47 +0000 |
117 | @@ -93,15 +93,5 @@ |
118 | |
119 | ] |
120 | } |
121 | -Loader { |
122 | - active: root.pressed; |
123 | - anchors { fill: backgroundLoader } |
124 | - sourceComponent: UbuntuShape { |
125 | - objectName: "touchdown"; |
126 | - anchors.fill: parent; |
127 | - radius: "medium"; |
128 | - borderSource: "radius_pressed.sci" |
129 | - } |
130 | -} |
131 | implicitHeight: row.y + row.height + units.gu(1); |
132 | } |
133 | |
134 | === modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator' |
135 | --- tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-08-08 09:13:47 +0000 |
136 | +++ tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-08-08 09:13:47 +0000 |
137 | @@ -105,15 +105,5 @@ |
138 | onPressAndHold: { |
139 | root.pressAndHold(); |
140 | } |
141 | - }Loader { |
142 | - active: root.pressed; |
143 | - anchors { fill: root } |
144 | - sourceComponent: UbuntuShape { |
145 | - objectName: "touchdown"; |
146 | - anchors.fill: parent; |
147 | - radius: "medium"; |
148 | - borderSource: "radius_pressed.sci" |
149 | - } |
150 | -} |
151 | -implicitHeight: audioButton.height; |
152 | + }implicitHeight: audioButton.height; |
153 | } |
FAILED: Continuous integration, rev:2544 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1781/ /unity8- jenkins. ubuntu. com/job/ build/2335 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= vivid+overlay, testname= qmluitests. sh/1247/ console /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= xenial+ overlay, testname= qmluitests. sh/1247 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= yakkety, testname= qmluitests. sh/1247 /unity8- jenkins. ubuntu. com/job/ build-0- fetch/2363 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 2253 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 2253 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= yakkety/ 2253 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2246/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2246/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 2246/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2246/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2246/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 2246/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2246/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2246/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= yakkety/ 2246 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= yakkety/ 2246/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/1781/ rebuild
https:/