Unity 8

Merge lp://staging/~unity-team/unity8/indicator-color-fixes into lp://staging/unity8

  1. indicator-color-fixes
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2217
Merged at revision: 2220
Proposed branch: lp://staging/~unity-team/unity8/indicator-color-fixes
Merge into: lp://staging/unity8
Diff against target: 383 lines (+33/-179)
11 files modified
debian/control (+2/-2)
qml/Panel/Handle.qml (+2/-2)
qml/Panel/IndicatorItem.qml (+3/-3)
qml/Panel/Indicators/MenuItemFactory.qml (+3/-3)
qml/Panel/Indicators/ModemInfoItem.qml (+0/-111)
qml/Panel/Indicators/RoamingIndication.qml (+0/-40)
qml/Panel/IndicatorsMenu.qml (+3/-2)
qml/Panel/MenuContent.qml (+1/-1)
qml/Panel/Panel.qml (+1/-1)
tests/qmltests/Panel/tst_IndicatorItem.qml (+16/-14)
tests/qmltests/Panel/tst_Panel.qml (+2/-0)
To merge this branch: bzr merge lp://staging/~unity-team/unity8/indicator-color-fixes
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Albert Astals Cid Pending
Unity8 CI Bot continuous-integration Pending
PS Jenkins bot continuous-integration Pending
Zsombor Egri Pending
Review via email: mp+288175@code.staging.launchpad.net

This proposal supersedes a proposal from 2016-01-27.

Commit message

Fixed colours palette value set. Moved ModemItem to USC.

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~bzoltan/ubuntu-ui-toolkit/OTA10-landing-2016-01-20/+merge/283385
https://code.launchpad.net/~nick-dedekind/ubuntu-settings-components/indicator-color-fixes/+merge/285702

 * 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?
Yes

To post a comment you must log in.
Revision history for this message
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/214/
Executed test runs:

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

review: Needs Fixing (continuous-integration)
Revision history for this message
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/7164/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/579/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1869
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1764
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/571
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/570
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4795/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6233
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27079
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/298/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/577
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/577/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27078

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

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

I guess we need to increase the USC dependency?

review: Needs Information
Revision history for this message
Zsombor Egri (zsombi) wrote : Posted in a previous version of this proposal

Please also update to use palette.disabled instead of palette.inactive valueset. Silo 050 shoudl already have these values there.

review: Needs Fixing
Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> Please also update to use palette.disabled instead of palette.inactive
> valueset. Silo 050 shoudl already have these values there.

Done.

Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> Please also update to use palette.disabled instead of palette.inactive
> valueset. Silo 050 shoudl already have these values there.

Done.

Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> I guess we need to increase the USC dependency?

done

Revision history for this message
Zsombor Egri (zsombi) wrote : Posted in a previous version of this proposal

I am good with the colors. I see in few places the use of UbuntuColors instead of palette colors, but that may be a design request, so it's good to go. In case those should be themed, those should be checked again with design.

review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

Code looks good, waiting on silo to be available to do testing.

Revision history for this message
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/526/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/691/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/714
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/732
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/732
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/728/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/728/console

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

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

Testing looks good

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

Approving as per the superseded MP.

The diff² is s/SuruGradient/SuruDark/ that happened in lp:~ubuntu-sdk-team/unity8/unity-theme instead.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches