Merge lp:~boiko/dialer-app/rtm-fix_live_call_controls into lp:dialer-app/rtm-14.09

[Gustavo Pichorim Boiko]

Change live call control buttons to follow design.

Change live call control buttons to follow design.

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-12-12 16:12:31 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2014-12-16 01:20:59 +0000
@@ -55,16 +55,6 @@
         }
     }
 
-    property list<Action> regularActions: [
-        Action {
-            id: newCallAction
-            objectName: "newCallButton"
-            iconName: "contact"
-            text: i18n.tr("New Call")
-            onTriggered: pageStack.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
-        }
-    ]
-
     property Action backAction: Action {
         id: backAction
         objectName: "backButton"
@@ -79,7 +69,7 @@
     }
 
     title: caller
-    head.actions: greeter.greeterActive ? [] : regularActions
+    head.actions: []
     head.backAction: backAction
     head.sections.model: multipleAccounts ? [call.account.displayName] : undefined
     x: header ? header.height : 0
@@ -92,7 +82,6 @@
         statusLabel.text = text;
         liveCall.call = callObject;
         liveCall.dtmfVisible = false;
-        newCallAction.visible = false;
         closeTimer.running = true;
     }
 
@@ -519,41 +508,6 @@
         width: childrenRect.width
 
         LiveCallKeypadButton {
-            objectName: "muteButton"
-            iconSource: selected ? "microphone-mute" : "microphone"
-            enabled: !isVoicemail
-            selected: liveCall.isMuted
-            iconWidth: units.gu(3)
-            iconHeight: units.gu(3)
-            onClicked: {
-                if (call) {
-                    call.muted = !call.muted
-                }
-            }
-        }
-
-        LiveCallKeypadButton {
-            objectName: "pauseStartButton"
-            iconSource: {
-                if (callManager.backgroundCall) {
-                    return "swap"
-                } else if (selected) {
-                    return "media-playback-start"
-                } else {
-                    return "media-playback-pause"
-                }
-            }
-            selected: liveCall.onHold
-            iconWidth: units.gu(3)
-            iconHeight: units.gu(3)
-            onClicked: {
-                if (call) {
-                    call.held = !call.held
-                }
-            }
-        }
-
-        LiveCallKeypadButton {
             id: speakerButton
             objectName: "speakerButton"
             iconSource: {
@@ -595,6 +549,51 @@
         }
 
         LiveCallKeypadButton {
+            objectName: "muteButton"
+            iconSource: selected ? "microphone-mute" : "microphone"
+            enabled: !isVoicemail
+            selected: liveCall.isMuted
+            iconWidth: units.gu(3)
+            iconHeight: units.gu(3)
+            onClicked: {
+                if (call) {
+                    call.muted = !call.muted
+                }
+            }
+        }
+
+        LiveCallKeypadButton {
+            id: newCallButton
+            objectName: "newCallButton"
+            iconSource: "add"
+            iconWidth: units.gu(3)
+            iconHeight: units.gu(3)
+            enabled: !greeter.greeterActive
+            onClicked: pageStack.push(Qt.resolvedUrl("../ContactsPage/ContactsPage.qml"))
+        }
+
+        LiveCallKeypadButton {
+            objectName: "pauseStartButton"
+            iconSource: {
+                if (callManager.backgroundCall) {
+                    return "swap"
+                } else if (selected) {
+                    return "media-playback-start"
+                } else {
+                    return "media-playback-pause"
+                }
+            }
+            selected: liveCall.onHold
+            iconWidth: units.gu(3)
+            iconHeight: units.gu(3)
+            onClicked: {
+                if (call) {
+                    call.held = !call.held
+                }
+            }
+        }
+
+        LiveCallKeypadButton {
             id: dtmfButton
             objectName: "dtmfButton"
             iconSource: "keypad"