Merge lp:~ken-vandine/ubuntu-system-settings/lp1535822 into lp:ubuntu-system-settings

[Ken VanDine]

Don't display the setting to automatically connect when detected during pairing

Don't display the setting to automatically connect when detected during pairing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1584
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2576/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/759
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6090
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6090/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26800

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2576/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM, works. Thanks!

review: Approve

=== modified file 'plugins/bluetooth/DevicePage.qml'
--- plugins/bluetooth/DevicePage.qml	2015-11-12 09:53:00 +0000
+++ plugins/bluetooth/DevicePage.qml	2016-01-19 20:58:51 +0000
@@ -152,6 +152,7 @@
             ListItem.Standard {
                 id: trustedCheck
                 text: i18n.tr("Connect automatically when detected:")
+                visible: backend.selectedDevice.paired
                 control: CheckBox {
                     property bool serverChecked: backend.selectedDevice ? backend.selectedDevice.trusted : false
                     onServerCheckedChanged: checked = serverChecked