Merge lp:~ahayzen/music-app/hide-back-button-on-toolbar-hide into lp:music-app/trusty

[Andrew Hayzen]

* Hide the back button in the now playing page when the toolbar is hidden

* Hide the back button in the now playing page when the toolbar is hidden

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

PASSED: Continuous integration, rev:176
http://91.189.93.70:8080/job/music-app-ci/178/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/935
    SUCCESS: http://91.189.93.70:8080/job/music-app-precise-amd64-ci/178
    SUCCESS: http://91.189.93.70:8080/job/music-app-quantal-amd64-ci/178
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/178
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/180

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Looks good

review: Approve

=== modified file 'MusicNowPlaying.qml'
--- MusicNowPlaying.qml	2013-10-11 12:59:30 +0000
+++ MusicNowPlaying.qml	2013-10-12 18:44:44 +0000
@@ -557,10 +557,36 @@
         id: nowPlayingBackButton
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.top: parent.top
         color: styleMusic.nowPlaying.foregroundColor
         height: units.gu(3)
 
+        state: musicToolbar.opened ? "shown" : "hidden"
+        states: [
+            State {
+                name: "shown"
+                PropertyChanges {
+                    target: nowPlayingBackButton
+                    y: 0
+                }
+            },
+            State {
+                name: "hidden"
+                PropertyChanges {
+                    target: nowPlayingBackButton
+                    y: -height
+                }
+            }
+        ]
+
+        transitions: Transition {
+             from: "hidden,shown"
+             to: "shown,hidden"
+             NumberAnimation {
+                 duration: 100
+                 properties: "y"
+             }
+         }
+
         Image {
             id: expandItem
             anchors.horizontalCenter: parent.horizontalCenter