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

[Tiago Salem Herrmann]

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

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

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telepathy-ofono/fix-1398525/+merge/243676

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/dialer-app) on device or emulator?
Yes

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

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-11-13 14:40:57 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2014-12-04 14:34:12 +0000
@@ -87,6 +87,12 @@
         closeTimer.running = true;
     }
 
+    function isDefaultAudioOutput(id) {
+        return (id == "default" ||
+                id == "wired_headset" ||
+                id == "earpiece")
+    }
+
     Connections {
         target: callManager
         onHasCallsChanged: {
@@ -544,7 +550,7 @@
                     }
                 }
             }
-            selected: activeAudioOutput != "default"
+            selected: !isDefaultAudioOutput(activeAudioOutput)
             iconWidth: units.gu(3)
             iconHeight: units.gu(3)
             onClicked: {
@@ -557,7 +563,7 @@
                         PopupUtils.open(audioOutputsPopover, speakerButton)
                         return
                     }
-                    if (call.activeAudioOutput == "default") {
+                    if (isDefaultAudioOutput(call.activeAudioOutput)) {
                         call.activeAudioOutput = "speaker"
                     } else {
                         call.activeAudioOutput = "default"