Merge lp:~michael-sheldon/ubuntu-system-settings/fix-wallpaper-preview into lp:ubuntu-system-settings

[Michael Sheldon]

Stop wallpaper preview overlapping buttons and fix flake8 test.

Stop wallpaper preview overlapping buttons and fix flake8 test.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1775
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/26/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2364
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2364
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2181/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2181
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2181/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/26/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/background/Preview.qml'
--- plugins/background/Preview.qml	2017-01-12 12:38:45 +0000
+++ plugins/background/Preview.qml	2017-03-28 23:45:02 +0000
@@ -70,7 +70,12 @@
 
     Image {
         id: previewImage
-        anchors.fill: parent
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: divider.top
+        }
         source: uri
         sourceSize.height: height
         sourceSize.width: 0
@@ -78,8 +83,9 @@
     }
 
     ListItem.ThinDivider {
+        id: divider
         anchors.bottom: previewButtons.top
-        anchors.bottomMargin: units.gu(1)
+        anchors.bottomMargin: units.gu(2)
     }
 
     ListItem.Base {
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/ofono.py'
--- tests/autopilot/ubuntu_system_settings/tests/ofono.py	2015-08-10 11:01:34 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/ofono.py	2017-03-28 23:45:02 +0000
@@ -357,7 +357,6 @@
             'LineIdentification': dbus.String(number, variant_level=1),
             'Name': dbus.String('', variant_level=1),
             'Multiparty': dbus.Boolean(False, variant_level=1),
-            'Multiparty': dbus.Boolean(False, variant_level=1),
             'RemoteHeld': dbus.Boolean(False, variant_level=1),
             'RemoteMultiparty': dbus.Boolean(False, variant_level=1),
             'Emergency': dbus.Boolean(False, variant_level=1),