Unity 8

Merge lp:~unity-team/unity8/fixBlackHeader into lp:unity8

  1. fixBlackHeader
  2. Merge into trunk
Proposed by Michał Sawicz on 2016-03-04
Status: Merged
Approved by: Michał Sawicz on 2016-03-05
Approved revision: 2218
Merged at revision: 2221
Proposed branch: lp:~unity-team/unity8/fixBlackHeader
Merge into: lp:unity8
Prerequisite: lp:~unity-team/unity8/indicator-color-fixes
Diff against target: 107 lines (+11/-4)
4 files modified
debian/control (+4/-4)
qml/Components/Header.qml (+1/-0)
qml/Dash/DashPageHeader.qml (+4/-0)
qml/Stages/Splash.qml (+2/-0)
To merge this branch: bzr merge lp:~unity-team/unity8/fixBlackHeader
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration 2016-03-04 Needs Fixing on 2016-03-05
Michał Sawicz Approve on 2016-03-05
PS Jenkins bot continuous-integration 2016-03-04 Pending
Zoltan Balogh 2016-03-04 Pending
Albert Astals Cid 2016-03-04 Pending
Review via email: mp+288176@code.launchpad.net

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

Commit Message

Update headers for Dash and Splash to work properly with the new UI toolkit release.

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/headerNoClip/+merge/281738

That is included in the current UITK landing in silo 50. When the changes below for unity8 are approved, we will include the current MR in the landing.

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes, tested dash and app splash screen on mako.

 * Did you make sure that your branch does not contain spurious tags?

$ python strip-u8-tags.py lp:~tpeeters/unity8/fixBlackHeader
lp:~tpeeters/unity8/fixBlackHeader: clean

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Not applicable.

 * If you changed the UI, has there been a design review?

UI should look the same as before.

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

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

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

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

Please increase the qtdeclarative5-ubuntu-ui-toolkit-plugin dependency on the debian/control file since if we try to run this code with older versions it will just fail

review: Needs Fixing
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

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

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

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

FAILED: Continuous integration, rev:2144
http://jenkins.qa.ubuntu.com/job/unity8-ci/7148/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6175
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/563/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1853
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/555
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/554
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4765
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6186
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6186/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27004
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/294/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/561
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/561/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27003

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

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

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

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

review: Needs Fixing (continuous-integration)
Zoltan Balogh (bzoltan) wrote : Posted in a previous version of this proposal
review: Approve
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2145
http://jenkins.qa.ubuntu.com/job/unity8-ci/7149/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/564/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1854/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1749/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1749/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/556/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/555/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6188/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/562/console

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

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

FAILED: Continuous integration, rev:2146
http://jenkins.qa.ubuntu.com/job/unity8-ci/7150/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/565/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1855/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/558/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1750/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1750/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/556/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/563/console

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

review: Needs Fixing (continuous-integration)
Albert Astals Cid (aacid) 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?
Yes

 * Did CI run pass?
No, needs a newer SDK, running locally before top-approval

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve
Tim Peeters (tpeeters) wrote : Posted in a previous version of this proposal

I resubmitted this MR to add the prerequisite to avoid a merge conflict.

Albert Astals Cid (aacid) : Posted in a previous version of this proposal
review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2148
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/525/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/690/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/713
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/731
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/731
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/727/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/727/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/727/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/727/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/727/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/727/console

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

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

Approving as per superseeded branch.

review: Approve
Unity8 CI Bot (unity8-ci-bot) wrote :

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

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

review: Needs Fixing (continuous-integration)

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:04:22 +0000
3+++ debian/control 2016-03-04 21:04:22 +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.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
9+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
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.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
18+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
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.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
27+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
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.2.1485+15.04.20150417.1-0ubuntu1),
36+ ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
37 unity-scope-click,
38 unity8 (= ${source:Version}),
39 unity8-fake-env (= ${source:Version}),
40
41=== modified file 'qml/Components/Header.qml'
42--- qml/Components/Header.qml 2015-07-10 07:47:35 +0000
43+++ qml/Components/Header.qml 2016-03-04 21:04:22 +0000
44@@ -18,6 +18,7 @@
45 import Ubuntu.Components.Themes.Ambiance 1.3
46
47 PageHeadStyle {
48+ // FIXME: Don't use this but PageHeader from Ubuntu.Components 1.3.
49 id: root
50
51 property var styledItem: root
52
53=== modified file 'qml/Dash/DashPageHeader.qml'
54--- qml/Dash/DashPageHeader.qml 2015-12-21 12:14:57 +0000
55+++ qml/Dash/DashPageHeader.qml 2016-03-04 21:04:22 +0000
56@@ -170,6 +170,7 @@
57 anchors { left: parent.left; right: parent.right }
58
59 PageHeadStyle {
60+ // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
61 id: searchHeader
62 anchors { left: parent.left; right: parent.right }
63 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
64@@ -179,6 +180,7 @@
65 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
66 property color panelColor: background.topColor
67 panelForegroundColor: config.foregroundColor
68+ backgroundColor: "transparent"
69 config: PageHeadConfiguration {
70 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
71 backAction: Action {
72@@ -241,6 +243,7 @@
73 }
74
75 PageHeadStyle {
76+ // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
77 id: header
78 objectName: "innerPageHeader"
79 anchors { left: parent.left; right: parent.right }
80@@ -251,6 +254,7 @@
81 property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
82 property color panelColor: background.topColor
83 panelForegroundColor: config.foregroundColor
84+ backgroundColor: "transparent"
85 config: PageHeadConfiguration {
86 title: root.title
87 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
88
89=== modified file 'qml/Stages/Splash.qml'
90--- qml/Stages/Splash.qml 2016-01-20 08:51:48 +0000
91+++ qml/Stages/Splash.qml 2016-03-04 21:04:22 +0000
92@@ -76,6 +76,7 @@
93 }
94
95 Ambiance.PageHeadStyle {
96+ // FIXME: Replace PageHeadStyle by PageHeader from Ubuntu.Components 1.3.
97 id: header
98 anchors {
99 left: parent.left;
100@@ -86,6 +87,7 @@
101 property color dividerColor: Qt.darker(styledItem.backgroundColor, 1.1)
102 property color panelColor: Qt.lighter(styledItem.backgroundColor, 1.1)
103 panelForegroundColor: config.foregroundColor
104+ backgroundColor: "transparent"
105 config: PageHeadConfiguration {
106 id: headerConfig
107 foregroundColor: styledItem.fakeTheme.palette.selected.backgroundText

Subscribers

People subscribed via source and target branches