Unity 8

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

  1. revert_r388
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
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
Michał Sawicz Approve
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.
Revision history for this message
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)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Components/Tile.qml'
--- Components/Tile.qml 2013-10-03 19:10:50 +0000
+++ Components/Tile.qml 2013-10-04 15:46:55 +0000
@@ -18,14 +18,70 @@
18import Ubuntu.Components 0.118import Ubuntu.Components 0.1
1919
20AbstractButton {20AbstractButton {
21 property url source21 id: root
22 property int fillMode: Image.PreserveAspectCrop22 property alias source: image.source
23 property int horizontalAlignment: Image.AlignHCenter23 property alias fillMode: image.fillMode
24 property int verticalAlignment: Image.AlignVCenter24 property alias horizontalAlignment: image.horizontalAlignment
25 property string text25 property alias verticalAlignment: image.verticalAlignment
26 property alias text: label.text
26 property int imageWidth27 property int imageWidth
27 property int imageHeight28 property int imageHeight
28 property int maximumLineCount: 129
2930 UbuntuShape {
30 style: TileStyle {}31 id: icon
32 anchors {
33 top: parent.top
34 horizontalCenter: parent.horizontalCenter
35 }
36 radius: "medium"
37 width: imageWidth
38 height: imageHeight
39 image: Image {
40 id: image
41 objectName: "image"
42 sourceSize { width: icon.width; height: icon.height }
43 asynchronous: true
44 cache: false
45 }
46 }
47
48 UbuntuShape {
49 id: borderPressed
50 objectName: "borderPressed"
51
52 anchors.fill: icon
53 radius: "medium"
54 borderSource: "radius_pressed.sci"
55 opacity: root.pressed ? 1.0 : 0.0
56 Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
57 }
58
59 Item {
60 anchors {
61 left: parent.left
62 right: parent.right
63 top: icon.bottom
64 }
65 height: units.gu(2)
66
67 Label {
68 id: label
69 objectName: "label"
70 anchors {
71 baseline: parent.bottom
72 left: parent.left
73 right: parent.right
74 leftMargin: units.gu(1)
75 rightMargin: units.gu(1)
76 }
77
78 color: Theme.palette.selected.backgroundText
79 opacity: 0.9
80 style: Text.Raised
81 styleColor: "black"
82 fontSize: "small"
83 elide: Text.ElideMiddle
84 horizontalAlignment: Text.AlignHCenter
85 }
86 }
31}87}
3288
=== removed file 'Components/TileStyle.qml'
--- Components/TileStyle.qml 2013-10-03 19:10:50 +0000
+++ Components/TileStyle.qml 1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import Ubuntu.Components 0.1
19
20Item {
21 id: tile
22
23 anchors.fill: parent
24
25 UbuntuShape {
26 id: icon
27 anchors {
28 top: parent.top
29 horizontalCenter: parent.horizontalCenter
30 }
31 radius: "medium"
32 width: styledItem.imageWidth
33 height: styledItem.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 source: styledItem.source
41 fillMode: styledItem.fillMode
42 horizontalAlignment: styledItem.horizontalAlignment
43 verticalAlignment: styledItem.verticalAlignment
44 }
45 }
46
47 UbuntuShape {
48 id: borderPressed
49 objectName: "borderPressed"
50
51 anchors.fill: icon
52 radius: "medium"
53 borderSource: "radius_pressed.sci"
54 opacity: styledItem.pressed ? 1.0 : 0.0
55 Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
56 }
57
58 Label {
59 id: label
60 objectName: "label"
61 anchors {
62 baseline: icon.bottom
63 baselineOffset: units.gu(2)
64 left: parent.left
65 right: parent.right
66 leftMargin: units.gu(1)
67 rightMargin: units.gu(1)
68 }
69
70 color: Theme.palette.selected.backgroundText
71 opacity: 0.9
72 style: Text.Raised
73 styleColor: "black"
74 fontSize: "small"
75 elide: Text.ElideMiddle
76 horizontalAlignment: Text.AlignHCenter
77 text: styledItem.text
78 maximumLineCount: styledItem.maximumLineCount
79 }
80}
810
=== removed file 'Dash/Apps/DashPluginFilterGrid.qml'
--- Dash/Apps/DashPluginFilterGrid.qml 2013-10-03 19:15:55 +0000
+++ Dash/Apps/DashPluginFilterGrid.qml 1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import Ubuntu.Components 0.1
19import "../../Components"
20import "../Generic"
21
22GenericFilterGrid {
23 id: filtergrid
24
25 delegate: Tile {
26 id: tile
27 objectName: "delegate" + index
28 width: filtergrid.cellWidth
29 height: filtergrid.cellHeight
30 text: model.title
31 imageWidth: filtergrid.iconWidth
32 imageHeight: filtergrid.iconHeight
33 source: model.icon
34
35 style: FlatTileStyle {
36 disabled: model.rendererHints['scope_disabled'] === 1;
37 }
38
39 onClicked: {
40 var data = { model: model }
41 filtergrid.clicked(index, data, tile.y)
42 }
43
44 onPressAndHold: {
45 var data = { model: model }
46 filtergrid.pressAndHold(index, data, tile.y)
47 }
48 }
49}
500
=== removed file 'Dash/Generic/FlatTileStyle.qml'
--- Dash/Generic/FlatTileStyle.qml 2013-10-03 19:10:50 +0000
+++ Dash/Generic/FlatTileStyle.qml 1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import Ubuntu.Components 0.1
19
20Item {
21 id: tile
22
23 property bool disabled: false
24
25 anchors.fill: parent
26
27 Image {
28 id: icon
29 objectName: "image"
30 width: styledItem.imageWidth
31 height: styledItem.imageHeight
32
33 anchors.horizontalCenter: parent.horizontalCenter
34
35 sourceSize { width: width; height: height }
36 asynchronous: true
37 cache: false
38 source: styledItem.source
39 fillMode: styledItem.fillMode
40 opacity: tile.disabled ? 0.3 : 1.0
41 horizontalAlignment: styledItem.horizontalAlignment
42 verticalAlignment: styledItem.verticalAlignment
43 }
44
45 UbuntuShape {
46 id: borderPressed
47 objectName: "borderPressed"
48
49 anchors.fill: icon
50 radius: "medium"
51 borderSource: "radius_pressed.sci"
52 opacity: styledItem.pressed ? 1.0 : 0.0
53 Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
54 }
55
56 Label {
57 id: label
58 objectName: "label"
59 anchors {
60 baseline: icon.bottom
61 baselineOffset: units.gu(2)
62 left: parent.left
63 right: parent.right
64 leftMargin: units.gu(1)
65 rightMargin: units.gu(1)
66 }
67
68 color: Theme.palette.selected.backgroundText
69 opacity: 0.9
70 style: Text.Raised
71 styleColor: "black"
72 fontSize: "small"
73 elide: Text.ElideMiddle
74 horizontalAlignment: Text.AlignHCenter
75 text: styledItem.text
76 maximumLineCount: styledItem.maximumLineCount
77 }
78}
790
=== modified file 'Dash/Generic/GenericFilterGrid.qml'
--- Dash/Generic/GenericFilterGrid.qml 2013-10-03 19:15:55 +0000
+++ Dash/Generic/GenericFilterGrid.qml 2013-10-04 15:46:55 +0000
@@ -39,8 +39,11 @@
39 text: model.title39 text: model.title
40 imageWidth: filtergrid.iconWidth40 imageWidth: filtergrid.iconWidth
41 imageHeight: filtergrid.iconHeight41 imageHeight: filtergrid.iconHeight
42
42 source: model.icon43 source: model.icon
4344
45 fillMode: Image.PreserveAspectCrop
46
44 onClicked: {47 onClicked: {
45 var data = { model: model }48 var data = { model: model }
46 filtergrid.clicked(index, data, tile.y)49 filtergrid.clicked(index, data, tile.y)
4750
=== removed file 'Dash/Generic/WeatherFilterGrid.qml'
--- Dash/Generic/WeatherFilterGrid.qml 2013-10-03 19:15:55 +0000
+++ Dash/Generic/WeatherFilterGrid.qml 1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import Ubuntu.Components 0.1
19import "../../Components"
20
21GenericFilterGrid {
22 id: filtergrid
23
24 delegateHeight: units.gu(11.5)
25
26 delegate: Tile {
27 id: tile
28 objectName: "delegate" + index
29 width: filtergrid.cellWidth
30 height: filtergrid.cellHeight
31 text: model.title
32 imageWidth: filtergrid.iconWidth
33 imageHeight: filtergrid.iconHeight
34 source: model.icon
35 maximumLineCount: 2
36
37 style: FlatTileStyle {}
38
39 onClicked: {
40 var data = { model: model }
41 filtergrid.clicked(index, data, tile.y)
42 }
43
44 onPressAndHold: {
45 var data = { model: model }
46 filtergrid.pressAndHold(index, data, tile.y)
47 }
48 }
49}
500
=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml 2013-10-04 05:54:33 +0000
+++ Dash/GenericScopeView.qml 2013-10-04 15:46:55 +0000
@@ -209,13 +209,6 @@
209 switch (contentType) {209 switch (contentType) {
210 case "video": return "Generic/GenericFilterGridPotrait.qml";210 case "video": return "Generic/GenericFilterGridPotrait.qml";
211 case "music": return "Music/MusicFilterGrid.qml";211 case "music": return "Music/MusicFilterGrid.qml";
212 case "apps": {
213 if (rendererHint == "toggled")
214 return "Apps/DashPluginFilterGrid.qml";
215 else
216 return "Generic/GenericFilterGrid.qml";
217 }
218 case "weather": return "Generic/WeatherFilterGrid.qml";
219 default: return "Generic/GenericFilterGrid.qml";212 default: return "Generic/GenericFilterGrid.qml";
220 }213 }
221 }214 }
222215
=== modified file 'run_on_device'
--- run_on_device 2013-09-13 14:27:41 +0000
+++ run_on_device 2013-10-04 15:46:55 +0000
@@ -52,7 +52,7 @@
52install_ssh_key() {52install_ssh_key() {
53 ssh-keygen -R $TARGET_IP53 ssh-keygen -R $TARGET_IP
54 HOME_DIR="${CHROOT_PREFIX}/home/phablet"54 HOME_DIR="${CHROOT_PREFIX}/home/phablet"
55 adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys55 adb push ~/.ssh/phone_rsa.pub $HOME_DIR/.ssh/authorized_keys
56 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh56 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh
57 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys57 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys
58 adb shell chmod 700 $HOME_DIR/.ssh58 adb shell chmod 700 $HOME_DIR/.ssh

Subscribers

People subscribed via source and target branches