Merge lp:~renatofilho/address-book-app/fix-1375513 into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

Make bottom edge hint invisible when not active.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/346/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3848
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6577
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6577/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13929
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4161
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4161/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/346/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

review: Approve

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected!

review: Approve

=== modified file 'src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml'
--- src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml	2014-09-18 13:27:28 +0000
+++ src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml	2014-09-30 14:11:24 +0000
@@ -149,6 +149,7 @@
         property bool hidden: (activeFocus === false) || ((bottomEdge.y - units.gu(1)) < tip.y)
 
         enabled: mouseArea.enabled
+        visible: page.bottomEdgeEnabled
         anchors {
             bottom: parent.bottom
             horizontalCenter: bottomEdge.horizontalCenter
@@ -221,6 +222,7 @@
             maximumY: page.height
         }
         enabled: edgeLoader.status == Loader.Ready
+        visible: page.bottomEdgeEnabled
 
         anchors {
             left: parent.left
@@ -275,7 +277,7 @@
         }
         height: page.height
         y: height
-        visible: page.bottomEdgeEnabled && !page.isCollapsed
+        visible: !page.isCollapsed
         state: "collapsed"
         states: [
             State {