Unity 8

Merge lp:~paulliu/unity8/lp1379384 into lp:unity8

  1. lp1379384
  2. Merge into trunk
Proposed by Ying-Chun Liu
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1372
Merged at revision: 1451
Proposed branch: lp:~paulliu/unity8/lp1379384
Merge into: lp:unity8
Diff against target: 33 lines (+10/-3)
1 file modified
qml/Shell.qml (+10/-3)
To merge this branch: bzr merge lp:~paulliu/unity8/lp1379384
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michael Zanetti (community) Approve
Review via email: mp+238986@code.launchpad.net

Commit message

Notifications should be on right side when wide. (LP: 1379384)

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1369
http://jenkins.qa.ubuntu.com/job/unity8-ci/4718/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1704
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1812
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5715
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7339
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7339/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14889

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

review: Needs Fixing (continuous-integration)
lp:~paulliu/unity8/lp1379384 updated
1370. By Ying-Chun Liu

merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1370
http://jenkins.qa.ubuntu.com/job/unity8-ci/4802/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6356/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1896
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5959/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7608
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7608/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15266

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1369
http://jenkins.qa.ubuntu.com/job/unity8-ci/4803/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6357
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1899
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1897
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5960
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7609
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15265

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

review: Needs Fixing (continuous-integration)
lp:~paulliu/unity8/lp1379384 updated
1371. By Ying-Chun Liu

merge trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/unity8-ci/4868/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/92
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15631

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

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

small inline nitpick

review: Needs Fixing
lp:~paulliu/unity8/lp1379384 updated
1372. By Ying-Chun Liu

Change to use anchors on narrow and width on wide.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

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

yes

 * Did CI run pass? If not, please explain why.

waiting, but a previous, very similar version passed fine

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

yes

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1372
http://jenkins.qa.ubuntu.com/job/unity8-ci/4921/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/86
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/242
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15899

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

review: Needs Fixing (continuous-integration)
lp:~paulliu/unity8/lp1379384 updated
1373. By Ying-Chun Liu

merge trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml 2014-11-17 13:47:59 +0000
+++ qml/Shell.qml 2014-11-18 13:03:29 +0000
@@ -764,19 +764,26 @@
764 margin: units.gu(1)764 margin: units.gu(1)
765765
766 y: topmostIsFullscreen ? 0 : panel.panelHeight766 y: topmostIsFullscreen ? 0 : panel.panelHeight
767 width: parent.width
768 height: parent.height - (topmostIsFullscreen ? 0 : panel.panelHeight)767 height: parent.height - (topmostIsFullscreen ? 0 : panel.panelHeight)
769768
770 states: [769 states: [
771 State {770 State {
772 name: "narrow"771 name: "narrow"
773 when: overlay.width <= units.gu(60)772 when: overlay.width <= units.gu(60)
774 AnchorChanges { target: notifications; anchors.left: parent.left }773 AnchorChanges {
774 target: notifications
775 anchors.left: parent.left
776 anchors.right: parent.right
777 }
775 },778 },
776 State {779 State {
777 name: "wide"780 name: "wide"
778 when: overlay.width > units.gu(60)781 when: overlay.width > units.gu(60)
779 AnchorChanges { target: notifications; anchors.left: undefined }782 AnchorChanges {
783 target: notifications
784 anchors.left: undefined
785 anchors.right: parent.right
786 }
780 PropertyChanges { target: notifications; width: units.gu(38) }787 PropertyChanges { target: notifications; width: units.gu(38) }
781 }788 }
782 ]789 ]

Subscribers

People subscribed via source and target branches