Merge lp:~renatofilho/dialer-app/fix-1362404 into lp:dialer-app

[Renato Araujo Oliveira Filho]

Disable "back" action on live call while in greeter mode.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/448/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5907
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5907/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12971
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3746/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/448/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? NO

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? YES

If you changed UI labels, did you update the pot file? NO NECESSARY
If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?NO NECESSARY

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-09-02 22:34:43 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2014-09-09 18:25:41 +0000
@@ -56,10 +56,6 @@
 
     property list<Action> regularActions: [
         Action {
-            objectName: "fakeBackButton"
-            visible: false
-        },
-        Action {
             id: newCallAction
             objectName: "newCallButton"
             iconName: "contact"
@@ -67,15 +63,18 @@
             onTriggered: pageStack.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
         }
     ]
-    property list<Action> greeterModeActions: [
-        Action {
-            objectName: "fakeBackButton"
-            visible: false
-        }
-    ]
+
+    property Action backAction: Action {
+        id: backAction
+        objectName: "backButton"
+        iconName: "back"
+        visible: !greeter.greeterActive
+        onTriggered: pageStack.pop()
+    }
 
     title: caller
-    head.actions: greeter.greeterActive ? greeterModeActions : regularActions
+    head.actions: greeter.greeterActive ? [] : regularActions
+    head.backAction: backAction
     head.sections.model: multipleAccounts ? [call.account.displayName] : undefined
     x: header ? header.height : 0
 
@@ -124,7 +123,7 @@
                 ListItems.Header { text: "Switch audio source:" }
                 Repeater {
                     model: audioOutputs
-                    ListItems.Standard { 
+                    ListItems.Standard {
                         text: nameForAudioId(modelData.id)
                         showDivider: index != model.count-1
                         onClicked: {