ubuntu-system-settings

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

Proposed by Michael Sheldon on 2017-03-28

Status:	Merged
Approved by:	Ken VanDine on 2017-03-29
Approved revision:	1775
Merged at revision:	1775
Proposed branch:	lp:~michael-sheldon/ubuntu-system-settings/fix-wallpaper-preview
Merge into:	lp:ubuntu-system-settings
Diff against target:	40 lines (+8/-3) 2 files modified plugins/background/Preview.qml (+8/-2) tests/autopilot/ubuntu_system_settings/tests/ofono.py (+0/-1)
To merge this branch:	bzr merge lp:~michael-sheldon/ubuntu-system-settings/fix-wallpaper-preview
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2017-03-29
Ubuntu Touch System Settings		2017-03-28	Pending
Review via email: mp+321234@code.launchpad.net

Stop wallpaper preview overlapping buttons and fix flake8 test.

Stop wallpaper preview overlapping buttons and fix flake8 test.

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2017-03-29:

review: Approve (continuous-integration)

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'plugins/background/Preview.qml'
2	--- plugins/background/Preview.qml 2017-01-12 12:38:45 +0000
3	+++ plugins/background/Preview.qml 2017-03-28 23:45:02 +0000
4	@@ -70,7 +70,12 @@
5
6	Image {
7	id: previewImage
8	- anchors.fill: parent
9	+ anchors {
10	+ top: parent.top
11	+ left: parent.left
12	+ right: parent.right
13	+ bottom: divider.top
14	+ }
15	source: uri
16	sourceSize.height: height
17	sourceSize.width: 0
18	@@ -78,8 +83,9 @@
19	}
20
21	ListItem.ThinDivider {
22	+ id: divider
23	anchors.bottom: previewButtons.top
24	- anchors.bottomMargin: units.gu(1)
25	+ anchors.bottomMargin: units.gu(2)
26	}
27
28	ListItem.Base {
29
30	=== modified file 'tests/autopilot/ubuntu_system_settings/tests/ofono.py'
31	--- tests/autopilot/ubuntu_system_settings/tests/ofono.py 2015-08-10 11:01:34 +0000
32	+++ tests/autopilot/ubuntu_system_settings/tests/ofono.py 2017-03-28 23:45:02 +0000
33	@@ -357,7 +357,6 @@
34	'LineIdentification': dbus.String(number, variant_level=1),
35	'Name': dbus.String('', variant_level=1),
36	'Multiparty': dbus.Boolean(False, variant_level=1),
37	- 'Multiparty': dbus.Boolean(False, variant_level=1),
38	'RemoteHeld': dbus.Boolean(False, variant_level=1),
39	'RemoteMultiparty': dbus.Boolean(False, variant_level=1),
40	'Emergency': dbus.Boolean(False, variant_level=1),