Merge lp:~boiko/dialer-app/fix_text_overlap into lp:dialer-app

[Gustavo Pichorim Boiko]

Fix the overlap between the contact label and the "private" button on conf calls.

Fix the overlap between the contact label and the "private" button on conf calls.

[Tiago Salem Herrmann (tiagosh)]

Looks good.
tested on the device and it works fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:489
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/619/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/132
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5261
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5281
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5281/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25271

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/qml/LiveCallPage/ConferenceCallDisplay.qml'
--- src/qml/LiveCallPage/ConferenceCallDisplay.qml	2015-09-07 15:40:45 +0000
+++ src/qml/LiveCallPage/ConferenceCallDisplay.qml	2015-11-19 13:30:33 +0000
@@ -65,6 +65,7 @@
                 anchors {
                     left: parent.left
                     leftMargin: units.gu(1)
+                    right: splitButton.left
                     verticalCenter: parent.verticalCenter
                 }
                 text: {
@@ -76,6 +77,7 @@
                         return contactWatcher.identifier;
                     }
                 }
+                elide: Text.ElideRight
             }
 
             backgroundIndicator: Rectangle {
@@ -123,7 +125,7 @@
                     bottom: parent.bottom
                     right: durationLabel.left
                 }
-                width: callStatus.width + units.gu(2)
+                width: visible ? callStatus.width + units.gu(2) : 0
 
                 visible: !callManager.backgroundCall
                 onClicked: callEntry.splitCall()