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

Proposed by Albert Astals Cid on 2013-10-04
Status: Merged
Approved by: Michał Sawicz on 2013-10-04
Approved revision: 394
Merged at revision: 394
Proposed branch: lp:~aacid/unity8/revert_r388
Merge into: lp:unity8
Diff against target: 405 lines (+68/-272)
8 files modified
Components/Tile.qml (+64/-8)
Components/TileStyle.qml (+0/-80)
Dash/Apps/DashPluginFilterGrid.qml (+0/-49)
Dash/Generic/FlatTileStyle.qml (+0/-78)
Dash/Generic/GenericFilterGrid.qml (+3/-0)
Dash/Generic/WeatherFilterGrid.qml (+0/-49)
Dash/GenericScopeView.qml (+0/-7)
run_on_device (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity8/revert_r388
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-10-04
Michał Sawicz 2013-10-04 Approve on 2013-10-04
Review via email: mp+189356@code.launchpad.net

Commit message

Revert r388

Description of the change

Revert r388

Seems to be causing bug #1235268

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:394
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~aacid/unity8/revert_r388/+merge/189356/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/1261/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2095
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1261
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1261/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2329
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2329/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2003
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2016

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

review: Needs Fixing (continuous-integration)
Michał Sawicz (saviq) :
review: Approve
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/Tile.qml'
2--- Components/Tile.qml 2013-10-03 19:10:50 +0000
3+++ Components/Tile.qml 2013-10-04 15:46:55 +0000
4@@ -18,14 +18,70 @@
5 import Ubuntu.Components 0.1
6
7 AbstractButton {
8- property url source
9- property int fillMode: Image.PreserveAspectCrop
10- property int horizontalAlignment: Image.AlignHCenter
11- property int verticalAlignment: Image.AlignVCenter
12- property string text
13+ id: root
14+ property alias source: image.source
15+ property alias fillMode: image.fillMode
16+ property alias horizontalAlignment: image.horizontalAlignment
17+ property alias verticalAlignment: image.verticalAlignment
18+ property alias text: label.text
19 property int imageWidth
20 property int imageHeight
21- property int maximumLineCount: 1
22-
23- style: TileStyle {}
24+
25+ UbuntuShape {
26+ id: icon
27+ anchors {
28+ top: parent.top
29+ horizontalCenter: parent.horizontalCenter
30+ }
31+ radius: "medium"
32+ width: imageWidth
33+ height: imageHeight
34+ image: Image {
35+ id: image
36+ objectName: "image"
37+ sourceSize { width: icon.width; height: icon.height }
38+ asynchronous: true
39+ cache: false
40+ }
41+ }
42+
43+ UbuntuShape {
44+ id: borderPressed
45+ objectName: "borderPressed"
46+
47+ anchors.fill: icon
48+ radius: "medium"
49+ borderSource: "radius_pressed.sci"
50+ opacity: root.pressed ? 1.0 : 0.0
51+ Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
52+ }
53+
54+ Item {
55+ anchors {
56+ left: parent.left
57+ right: parent.right
58+ top: icon.bottom
59+ }
60+ height: units.gu(2)
61+
62+ Label {
63+ id: label
64+ objectName: "label"
65+ anchors {
66+ baseline: parent.bottom
67+ left: parent.left
68+ right: parent.right
69+ leftMargin: units.gu(1)
70+ rightMargin: units.gu(1)
71+ }
72+
73+ color: Theme.palette.selected.backgroundText
74+ opacity: 0.9
75+ style: Text.Raised
76+ styleColor: "black"
77+ fontSize: "small"
78+ elide: Text.ElideMiddle
79+ horizontalAlignment: Text.AlignHCenter
80+ }
81+ }
82 }
83
84=== removed file 'Components/TileStyle.qml'
85--- Components/TileStyle.qml 2013-10-03 19:10:50 +0000
86+++ Components/TileStyle.qml 1970-01-01 00:00:00 +0000
87@@ -1,80 +0,0 @@
88-/*
89- * Copyright (C) 2013 Canonical, Ltd.
90- *
91- * This program is free software; you can redistribute it and/or modify
92- * it under the terms of the GNU General Public License as published by
93- * the Free Software Foundation; version 3.
94- *
95- * This program is distributed in the hope that it will be useful,
96- * but WITHOUT ANY WARRANTY; without even the implied warranty of
97- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
98- * GNU General Public License for more details.
99- *
100- * You should have received a copy of the GNU General Public License
101- * along with this program. If not, see <http://www.gnu.org/licenses/>.
102- */
103-
104-import QtQuick 2.0
105-import Ubuntu.Components 0.1
106-
107-Item {
108- id: tile
109-
110- anchors.fill: parent
111-
112- UbuntuShape {
113- id: icon
114- anchors {
115- top: parent.top
116- horizontalCenter: parent.horizontalCenter
117- }
118- radius: "medium"
119- width: styledItem.imageWidth
120- height: styledItem.imageHeight
121- image: Image {
122- id: image
123- objectName: "image"
124- sourceSize { width: icon.width; height: icon.height }
125- asynchronous: true
126- cache: false
127- source: styledItem.source
128- fillMode: styledItem.fillMode
129- horizontalAlignment: styledItem.horizontalAlignment
130- verticalAlignment: styledItem.verticalAlignment
131- }
132- }
133-
134- UbuntuShape {
135- id: borderPressed
136- objectName: "borderPressed"
137-
138- anchors.fill: icon
139- radius: "medium"
140- borderSource: "radius_pressed.sci"
141- opacity: styledItem.pressed ? 1.0 : 0.0
142- Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
143- }
144-
145- Label {
146- id: label
147- objectName: "label"
148- anchors {
149- baseline: icon.bottom
150- baselineOffset: units.gu(2)
151- left: parent.left
152- right: parent.right
153- leftMargin: units.gu(1)
154- rightMargin: units.gu(1)
155- }
156-
157- color: Theme.palette.selected.backgroundText
158- opacity: 0.9
159- style: Text.Raised
160- styleColor: "black"
161- fontSize: "small"
162- elide: Text.ElideMiddle
163- horizontalAlignment: Text.AlignHCenter
164- text: styledItem.text
165- maximumLineCount: styledItem.maximumLineCount
166- }
167-}
168
169=== removed file 'Dash/Apps/DashPluginFilterGrid.qml'
170--- Dash/Apps/DashPluginFilterGrid.qml 2013-10-03 19:15:55 +0000
171+++ Dash/Apps/DashPluginFilterGrid.qml 1970-01-01 00:00:00 +0000
172@@ -1,49 +0,0 @@
173-/*
174- * Copyright (C) 2013 Canonical, Ltd.
175- *
176- * This program is free software; you can redistribute it and/or modify
177- * it under the terms of the GNU General Public License as published by
178- * the Free Software Foundation; version 3.
179- *
180- * This program is distributed in the hope that it will be useful,
181- * but WITHOUT ANY WARRANTY; without even the implied warranty of
182- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
183- * GNU General Public License for more details.
184- *
185- * You should have received a copy of the GNU General Public License
186- * along with this program. If not, see <http://www.gnu.org/licenses/>.
187- */
188-
189-import QtQuick 2.0
190-import Ubuntu.Components 0.1
191-import "../../Components"
192-import "../Generic"
193-
194-GenericFilterGrid {
195- id: filtergrid
196-
197- delegate: Tile {
198- id: tile
199- objectName: "delegate" + index
200- width: filtergrid.cellWidth
201- height: filtergrid.cellHeight
202- text: model.title
203- imageWidth: filtergrid.iconWidth
204- imageHeight: filtergrid.iconHeight
205- source: model.icon
206-
207- style: FlatTileStyle {
208- disabled: model.rendererHints['scope_disabled'] === 1;
209- }
210-
211- onClicked: {
212- var data = { model: model }
213- filtergrid.clicked(index, data, tile.y)
214- }
215-
216- onPressAndHold: {
217- var data = { model: model }
218- filtergrid.pressAndHold(index, data, tile.y)
219- }
220- }
221-}
222
223=== removed file 'Dash/Generic/FlatTileStyle.qml'
224--- Dash/Generic/FlatTileStyle.qml 2013-10-03 19:10:50 +0000
225+++ Dash/Generic/FlatTileStyle.qml 1970-01-01 00:00:00 +0000
226@@ -1,78 +0,0 @@
227-/*
228- * Copyright (C) 2013 Canonical, Ltd.
229- *
230- * This program is free software; you can redistribute it and/or modify
231- * it under the terms of the GNU General Public License as published by
232- * the Free Software Foundation; version 3.
233- *
234- * This program is distributed in the hope that it will be useful,
235- * but WITHOUT ANY WARRANTY; without even the implied warranty of
236- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
237- * GNU General Public License for more details.
238- *
239- * You should have received a copy of the GNU General Public License
240- * along with this program. If not, see <http://www.gnu.org/licenses/>.
241- */
242-
243-import QtQuick 2.0
244-import Ubuntu.Components 0.1
245-
246-Item {
247- id: tile
248-
249- property bool disabled: false
250-
251- anchors.fill: parent
252-
253- Image {
254- id: icon
255- objectName: "image"
256- width: styledItem.imageWidth
257- height: styledItem.imageHeight
258-
259- anchors.horizontalCenter: parent.horizontalCenter
260-
261- sourceSize { width: width; height: height }
262- asynchronous: true
263- cache: false
264- source: styledItem.source
265- fillMode: styledItem.fillMode
266- opacity: tile.disabled ? 0.3 : 1.0
267- horizontalAlignment: styledItem.horizontalAlignment
268- verticalAlignment: styledItem.verticalAlignment
269- }
270-
271- UbuntuShape {
272- id: borderPressed
273- objectName: "borderPressed"
274-
275- anchors.fill: icon
276- radius: "medium"
277- borderSource: "radius_pressed.sci"
278- opacity: styledItem.pressed ? 1.0 : 0.0
279- Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
280- }
281-
282- Label {
283- id: label
284- objectName: "label"
285- anchors {
286- baseline: icon.bottom
287- baselineOffset: units.gu(2)
288- left: parent.left
289- right: parent.right
290- leftMargin: units.gu(1)
291- rightMargin: units.gu(1)
292- }
293-
294- color: Theme.palette.selected.backgroundText
295- opacity: 0.9
296- style: Text.Raised
297- styleColor: "black"
298- fontSize: "small"
299- elide: Text.ElideMiddle
300- horizontalAlignment: Text.AlignHCenter
301- text: styledItem.text
302- maximumLineCount: styledItem.maximumLineCount
303- }
304-}
305
306=== modified file 'Dash/Generic/GenericFilterGrid.qml'
307--- Dash/Generic/GenericFilterGrid.qml 2013-10-03 19:15:55 +0000
308+++ Dash/Generic/GenericFilterGrid.qml 2013-10-04 15:46:55 +0000
309@@ -39,8 +39,11 @@
310 text: model.title
311 imageWidth: filtergrid.iconWidth
312 imageHeight: filtergrid.iconHeight
313+
314 source: model.icon
315
316+ fillMode: Image.PreserveAspectCrop
317+
318 onClicked: {
319 var data = { model: model }
320 filtergrid.clicked(index, data, tile.y)
321
322=== removed file 'Dash/Generic/WeatherFilterGrid.qml'
323--- Dash/Generic/WeatherFilterGrid.qml 2013-10-03 19:15:55 +0000
324+++ Dash/Generic/WeatherFilterGrid.qml 1970-01-01 00:00:00 +0000
325@@ -1,49 +0,0 @@
326-/*
327- * Copyright (C) 2013 Canonical, Ltd.
328- *
329- * This program is free software; you can redistribute it and/or modify
330- * it under the terms of the GNU General Public License as published by
331- * the Free Software Foundation; version 3.
332- *
333- * This program is distributed in the hope that it will be useful,
334- * but WITHOUT ANY WARRANTY; without even the implied warranty of
335- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
336- * GNU General Public License for more details.
337- *
338- * You should have received a copy of the GNU General Public License
339- * along with this program. If not, see <http://www.gnu.org/licenses/>.
340- */
341-
342-import QtQuick 2.0
343-import Ubuntu.Components 0.1
344-import "../../Components"
345-
346-GenericFilterGrid {
347- id: filtergrid
348-
349- delegateHeight: units.gu(11.5)
350-
351- delegate: Tile {
352- id: tile
353- objectName: "delegate" + index
354- width: filtergrid.cellWidth
355- height: filtergrid.cellHeight
356- text: model.title
357- imageWidth: filtergrid.iconWidth
358- imageHeight: filtergrid.iconHeight
359- source: model.icon
360- maximumLineCount: 2
361-
362- style: FlatTileStyle {}
363-
364- onClicked: {
365- var data = { model: model }
366- filtergrid.clicked(index, data, tile.y)
367- }
368-
369- onPressAndHold: {
370- var data = { model: model }
371- filtergrid.pressAndHold(index, data, tile.y)
372- }
373- }
374-}
375
376=== modified file 'Dash/GenericScopeView.qml'
377--- Dash/GenericScopeView.qml 2013-10-04 05:54:33 +0000
378+++ Dash/GenericScopeView.qml 2013-10-04 15:46:55 +0000
379@@ -209,13 +209,6 @@
380 switch (contentType) {
381 case "video": return "Generic/GenericFilterGridPotrait.qml";
382 case "music": return "Music/MusicFilterGrid.qml";
383- case "apps": {
384- if (rendererHint == "toggled")
385- return "Apps/DashPluginFilterGrid.qml";
386- else
387- return "Generic/GenericFilterGrid.qml";
388- }
389- case "weather": return "Generic/WeatherFilterGrid.qml";
390 default: return "Generic/GenericFilterGrid.qml";
391 }
392 }
393
394=== modified file 'run_on_device'
395--- run_on_device 2013-09-13 14:27:41 +0000
396+++ run_on_device 2013-10-04 15:46:55 +0000
397@@ -52,7 +52,7 @@
398 install_ssh_key() {
399 ssh-keygen -R $TARGET_IP
400 HOME_DIR="${CHROOT_PREFIX}/home/phablet"
401- adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys
402+ adb push ~/.ssh/phone_rsa.pub $HOME_DIR/.ssh/authorized_keys
403 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh
404 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys
405 adb shell chmod 700 $HOME_DIR/.ssh

Subscribers

People subscribed via source and target branches