Ubuntu Music App

Merge lp://qastaging/~vthompson/music-app/music-uc1.3 into lp://qastaging/music-app

  1. music-uc1.3
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 909
Merged at revision: 932
Proposed branch: lp://qastaging/~vthompson/music-app/music-uc1.3
Merge into: lp://qastaging/music-app
Diff against target: 920 lines (+94/-84)
64 files modified
app/components/BlurredBackground.qml (+1/-1)
app/components/BlurredHeader.qml (+1/-1)
app/components/CoverGrid.qml (+1/-1)
app/components/Delegates/Card.qml (+1/-1)
app/components/Delegates/ListItemWithActions.qml (+1/-1)
app/components/Delegates/MusicListItem.qml (+1/-1)
app/components/Dialog/ContentHubErrorDialog.qml (+2/-2)
app/components/Dialog/ContentHubNotFoundDialog.qml (+2/-2)
app/components/Dialog/ContentHubWaitDialog.qml (+1/-2)
app/components/Dialog/EditPlaylistDialog.qml (+2/-2)
app/components/Dialog/NewPlaylistDialog.qml (+2/-2)
app/components/Dialog/RemovePlaylistDialog.qml (+2/-2)
app/components/Flickables/CardView.qml (+1/-1)
app/components/Flickables/MultiSelectListView.qml (+1/-1)
app/components/Flickables/MusicListView.qml (+1/-1)
app/components/HeadState/MultiSelectHeadState.qml (+1/-1)
app/components/HeadState/PlaylistsHeadState.qml (+2/-2)
app/components/HeadState/SearchHeadState.qml (+1/-1)
app/components/HeadState/SearchableHeadState.qml (+1/-1)
app/components/Helpers/ContentHubHelper.qml (+2/-2)
app/components/Helpers/UriHandlerHelper.qml (+1/-1)
app/components/Helpers/UserMetricsHelper.qml (+1/-1)
app/components/ListItemActions/AddToPlaylist.qml (+1/-1)
app/components/ListItemActions/AddToQueue.qml (+1/-1)
app/components/ListItemActions/CheckBox.qml (+1/-1)
app/components/ListItemActions/Remove.qml (+1/-2)
app/components/ListItemReorderComponent.qml (+1/-1)
app/components/LoadingSpinnerComponent.qml (+1/-1)
app/components/MusicPage.qml (+2/-2)
app/components/MusicRow.qml (+1/-1)
app/components/MusicToolbar.qml (+1/-1)
app/components/NowPlayingFullView.qml (+1/-1)
app/components/NowPlayingToolbar.qml (+1/-1)
app/components/PlaylistsEmptyState.qml (+1/-1)
app/components/Queue.qml (+1/-1)
app/components/Style.qml (+1/-1)
app/components/Themes/Ambiance/BubbleShape.qml (+1/-1)
app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml (+1/-1)
app/components/ViewButton/PlayAllButton.qml (+1/-1)
app/components/ViewButton/QueueAllButton.qml (+1/-1)
app/components/ViewButton/ShuffleButton.qml (+1/-1)
app/components/Walkthrough/FirstRunWalkthrough.qml (+1/-1)
app/components/Walkthrough/Slide1.qml (+1/-1)
app/components/Walkthrough/Slide2.qml (+1/-1)
app/components/Walkthrough/Slide3.qml (+1/-1)
app/components/Walkthrough/Walkthrough.qml (+7/-1)
app/components/WorkerWaiter.qml (+1/-1)
app/music-app.qml (+3/-2)
app/ui/AddToPlaylist.qml (+1/-2)
app/ui/Albums.qml (+1/-1)
app/ui/ArtistView.qml (+1/-2)
app/ui/Artists.qml (+1/-2)
app/ui/ContentHubExport.qml (+1/-1)
app/ui/Genres.qml (+1/-1)
app/ui/LibraryEmptyState.qml (+7/-1)
app/ui/NowPlaying.qml (+6/-3)
app/ui/Playlists.qml (+1/-2)
app/ui/Recent.qml (+1/-2)
app/ui/Songs.qml (+1/-1)
app/ui/SongsView.qml (+4/-4)
debian/changelog (+1/-0)
manifest.json.in (+1/-1)
music-app.qmltheme (+1/-1)
tests/autopilot/music_app/__init__.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~vthompson/music-app/music-uc1.3
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Bartosz Kosiorek (community) Approve
Review via email: mp+267889@code.qastaging.launchpad.net

Commit message

* Update app to use the Ubuntu Components version 1.3

Description of the change

Upgrade to Ubuntu Components 1.3. For now, this is mostly just useful to use as a springboard for testing the new AdaptivePageLayout and other convergence features in UC 1.3.

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

If we upgrade to UC1.3 we get the new header and other goodies. Since OTA-6 has landed--should we land this update?

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

Note that this will break Vivid desktop.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:897
http://91.189.93.70:8080/job/music-app-ci/1369/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/221

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1369/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

This should bump the framework to 15.04.1 so then it doesn't appear on devices that don't support it :-)

review: Needs Fixing
lp://qastaging/~vthompson/music-app/music-uc1.3 updated
898. By Victor Thompson

update changelog and 1 file.

899. By Victor Thompson

Merge of trunk and resolve conflict

900. By Victor Thompson

Update framework

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:900
http://91.189.93.70:8080/job/music-app-ci/1387/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/239

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1387/rebuild

review: Approve (continuous-integration)
lp://qastaging/~vthompson/music-app/music-uc1.3 updated
901. By Victor Thompson

Change to SuruDark theme to resolve theme issues for now

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:901
http://91.189.93.70:8080/job/music-app-ci/1390/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/242

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1390/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Some inline comments

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

@Bartosz, Listitems are in a separate branch [0] which we will land at the same time, same story for weather.

Also as a note I'm trying to sort out header.height issues in that branch as well, so this should not land in trunk until the listitems one is ready.

0 - https://code.launchpad.net/~ahayzen/music-app/refactor-use-sdk-listitems/+merge/274829

lp://qastaging/~vthompson/music-app/music-uc1.3 updated
902. By Victor Thompson

Update Popups.

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

I'll update the popups, but leave the list items to be updated.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:902
http://91.189.93.70:8080/job/music-app-ci/1393/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/245

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1393/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

You could also update debian/changelog file with ticket number (LP: #1508363)

Besides that it is perfectly fine.

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

We need to check that the header.height and header.width issues are all resolved in either this or the second branch before landing. I will hopefully be on this later today.

review: Needs Fixing
lp://qastaging/~vthompson/music-app/music-uc1.3 updated
903. By Victor Thompson

Fix for SongsView

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:903
http://91.189.93.70:8080/job/music-app-ci/1394/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/246

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1394/rebuild

review: Approve (continuous-integration)
lp://qastaging/~vthompson/music-app/music-uc1.3 updated
904. By Victor Thompson

Hardcode header height.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:904
http://91.189.93.70:8080/job/music-app-ci/1395/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/247

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1395/rebuild

review: Approve (continuous-integration)
lp://qastaging/~vthompson/music-app/music-uc1.3 updated
905. By Victor Thompson

Hide the header in the Walkthrough and the LibraryEmptyState.

906. By Victor Thompson

Update changelog

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:906
http://91.189.93.70:8080/job/music-app-ci/1396/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/248

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1396/rebuild

review: Approve (continuous-integration)
lp://qastaging/~vthompson/music-app/music-uc1.3 updated
907. By Victor Thompson

Fix changelog

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:907
http://91.189.93.70:8080/job/music-app-ci/1397/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/249

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1397/rebuild

review: Approve (continuous-integration)
lp://qastaging/~vthompson/music-app/music-uc1.3 updated
908. By Victor Thompson

Fix walkthrough AP issue.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:908
http://91.189.93.70:8080/job/music-app-ci/1403/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/255

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1403/rebuild

review: Approve (continuous-integration)
lp://qastaging/~vthompson/music-app/music-uc1.3 updated
909. By Victor Thompson

More AP tweaks

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:909
http://91.189.93.70:8080/job/music-app-ci/1404/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/256

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1404/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

AP is passing on the listitems branch [1] now, so once that branch is approved, they can land together.

1 - https://code.launchpad.net/~ahayzen/music-app/refactor-use-sdk-listitems/+merge/274829

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