Merge lp:~tiagosh/dialer-app/rtm-14.09-fix-1398525 into lp:dialer-app/rtm-14.09

[Tiago Salem Herrmann]

Consider "wired_headset" and "earpiece" as default audio outputs.

Consider "wired_headset" and "earpiece" as default audio outputs.

[Bill Filler (bfiller)]

tested, approved

review: Approve

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-12-04 13:15:18 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2014-12-12 16:24:44 +0000
@@ -96,6 +96,12 @@
         closeTimer.running = true;
     }
 
+    function isDefaultAudioOutput(id) {
+        return (id == "default" ||
+                id == "wired_headset" ||
+                id == "earpiece")
+    }
+
     Connections {
         target: callManager
         onHasCallsChanged: {
@@ -566,7 +572,7 @@
                     }
                 }
             }
-            selected: activeAudioOutput != "default"
+            selected: !isDefaultAudioOutput(activeAudioOutput)
             iconWidth: units.gu(3)
             iconHeight: units.gu(3)
             onClicked: {
@@ -579,7 +585,7 @@
                         PopupUtils.open(audioOutputsPopover, speakerButton)
                         return
                     }
-                    if (call.activeAudioOutput == "default") {
+                    if (isDefaultAudioOutput(call.activeAudioOutput)) {
                         call.activeAudioOutput = "speaker"
                     } else {
                         call.activeAudioOutput = "default"