lp:~ahayzen/music-app/remix-remove-legacy-toolbar

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:music-app/remix at revision 655

Victor Thompson: Approve on 2014-10-08

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-10-07

Diff: 1418 lines (+192/-740)

6 files modified

MusicNowPlaying.qml (+28/-16)
MusicToolbar.qml (+3/-594)
common/MusicPage.qml (+1/-1)
music-app.qml (+1/-2)
tests/autopilot/music_app/__init__.py (+99/-81)
tests/autopilot/music_app/tests/test_music.py (+60/-46)

api

Superseded for merging into lp:music-app/trusty

Music App Developers: Pending requested 2014-10-06

Diff: 3358 lines (+926/-1391) (has conflicts)

19 files modified

MusicArtists.qml (+3/-2)
MusicNowPlaying.qml (+316/-29)
MusicPlaylists.qml (+3/-2)
MusicSettings.qml (+0/-11)
MusicToolbar.qml (+168/-934)
MusicTracks.qml (+3/-2)
MusicaddtoPlaylist.qml (+0/-1)
Player.qml (+5/-1)
Style.qml (+2/-2)
com.ubuntu.music_music.desktop.in.in (+3/-0)
common/AlbumsPage.qml (+0/-2)
common/BlurredBackground.qml (+11/-9)
common/MusicPage.qml (+4/-0)
common/MusicRow.qml (+7/-4)
common/SongsPage.qml (+142/-119)
music-app.qml (+16/-27)
po/com.ubuntu.music.pot (+69/-59)
po/pt_BR.po (+172/-154)
tests/autopilot/music_app/__init__.py (+2/-33)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

664. By Andrew Hayzen on 2014-10-07

* Use custom back button

663. By Andrew Hayzen on 2014-10-07

* Add objectName for back button

662. By Andrew Hayzen on 2014-10-07

* Merge of trunk

661. By Andrew Hayzen on 2014-10-07

* Fix for pagestack jumping
* Added extra code comment

660. By Andrew Hayzen on 2014-10-06

* Reget now playing page after switching

659. By Andrew Hayzen on 2014-10-06

* Wait for now playing page to be visible when switching

658. By Andrew Hayzen on 2014-10-06

* Fix for pyflakes

657. By Andrew Hayzen on 2014-10-06

* Further fixes for autopilot

656. By Andrew Hayzen on 2014-10-06

* Remove ensuring visible as this method is called sometimes when the now playing is not the currentPage

655. By Andrew Hayzen on 2014-10-06

* Fix for missed case