Ubuntu Music App

Merge lp://staging/~music-app-dev/music-app/fix-1550096-ota10-sdk-update into lp://staging/music-app

  1. fix-1550096-ota10-sdk-update
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Victor Thompson
Approved revision: 986
Merged at revision: 996
Proposed branch: lp://staging/~music-app-dev/music-app/fix-1550096-ota10-sdk-update
Merge into: lp://staging/music-app
Diff against target: 486 lines (+147/-191)
12 files modified
app/components/HeadState/MultiSelectHeadState.qml (+3/-5)
app/components/HeadState/PlaylistsHeadState.qml (+2/-2)
app/components/HeadState/SearchHeadState.qml (+0/-1)
app/components/NowPlayingFullView.qml (+1/-1)
app/components/Style.qml (+2/-2)
app/components/Themes/Ambiance/BubbleShape.qml (+5/-36)
app/components/Themes/Ambiance/SliderStyle.qml (+133/-0)
app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml (+0/-123)
app/components/Themes/artwork/bubble_shadow@20.sci (+0/-7)
app/components/Themes/artwork/bubble_shadow@30.sci (+0/-7)
app/components/Themes/artwork/bubble_shadow@8.sci (+0/-7)
debian/changelog (+1/-0)
To merge this branch: bzr merge lp://staging/~music-app-dev/music-app/fix-1550096-ota10-sdk-update
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+287363@code.staging.launchpad.net

Commit message

* Resolve issues related to SDK changes in OTA10

Description of the change

* Resolve issues related to SDK changes in OTA10

See bug report for a working list of necessary changes.

To post a comment you must log in.
Revision history for this message
Victor Thompson (vthompson) wrote :

I should have done a "bzr mv" for the SliderStyle change. It is verbatim the same as the silo, save the CUSTOM tags added.

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

What still needs doing to make this non-WIP ?

Revision history for this message
Victor Thompson (vthompson) wrote :

Items #4 and #6 still need to be fixed. Item #6 could be argued as fine as-is, however (maybe it's the way it is per design).

4. Disabled header actions are not greyed out.
6. The leadingActions for Remove are no longer red with a white icon.

Revision history for this message
Victor Thompson (vthompson) wrote :

I fixed #4 by making the icons invisible when not enabled. This matched the behavior in the Contacts app. I also added and fixed another issue (#7) with the Dialog views.

This should be ready for review. We can file another bug/issue for #6 if it is seen as an issue.

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Functional:
1) Fixed
2) Fixed
3) Fixed
4) Fixed - Feels a bit weird having them show/hide wonder if we should check if we can dim (I don't like context aware items show/hiding as they are as discoverable so to find the multiselect actions you have to press and hold, then tick something to find out what you can do with it :-/ )
5) This has been fixed in bug 1554897, which I have tested the branch and I think is in silo050 now?
6) The icon colours is red, I sortof like it not sure. But we should check with design if this is expected.
7) Fixed

I think we should land even with the comments for #4, #6 but maybe keep the bug open and add ubuntu-ux ? So we can have a future branch, as landing this will make it easier to spot any other issues.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/music-app-autolanding/94/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5691/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:985
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/97/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/801/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/97/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~music-app-dev/music-app/fix-1550096-ota10-sdk-update updated
986. By Victor Thompson

merge of trunk and resolve conflict

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:986
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/98/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/802/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/music-app-ci/98/rebuild

review: Approve (continuous-integration)

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

to all changes: