Merge lp:~vthompson/music-app/use-sdk-back-button-take2 into lp:music-app/trusty

[Victor Thompson]

Support new SDK back button and tab drawer

Support new SDK back button and tab drawer

[lp:~vthompson/music-app/use-sdk-back-button-take2]

452. By Victor Thompson on 2014-05-07

remove debug

453. By Victor Thompson on 2014-05-07

Adjust topMargin

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:453
http://91.189.93.70:8080/job/music-app-ci/774/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2470
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/776
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/495

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Nice work and making it backwards compatible :)

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2014-04-24 22:58:26 +0000
+++ MusicNowPlaying.qml	2014-05-07 00:41:02 +0000
@@ -98,7 +98,7 @@
         objectName: "queuelist"
         anchors.fill: parent
         anchors.bottomMargin: musicToolbar.mouseAreaOffset + musicToolbar.minimizedHeight
-        anchors.topMargin: nowPlayingBackButton.height
+        anchors.topMargin: header.useDeprecatedToolbar === undefined ? nowPlayingBackButton.height : 0
         spacing: units.gu(1)
         delegate: queueDelegate
         model: trackQueue.model
@@ -810,6 +810,7 @@
     // TODO: Remove back button once lp:1256424 is fixed (button will be in header)
     Rectangle {
         id: nowPlayingBackButton
+        visible: header.useDeprecatedToolbar === undefined
         anchors {
             left: parent.left
             right: parent.right

=== modified file 'music-app.qml'
--- music-app.qml	2014-05-04 04:37:52 +0000
+++ music-app.qml	2014-05-07 00:41:02 +0000
@@ -38,6 +38,7 @@
     objectName: "music"
     applicationName: "com.ubuntu.music"
     id: mainView
+    useDeprecatedToolbar: false
 
     // Use toolbar color for header
     headerColor: styleMusic.toolbar.fullBackgroundColor