Merge lp:~ci-train-bot/ubuntu-settings-components/ubuntu-settings-components-ubuntu-yakkety-landing-077 into lp:ubuntu-settings-components

[Michał Sawicz]

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-19 17:52:24 +0000
+++ debian/changelog	2016-06-17 12:59:22 +0000
@@ -1,3 +1,11 @@
+ubuntu-settings-components (0.7+16.10.20160615.2-0ubuntu1) yakkety; urgency=medium
+
+  * Make sure a size is specified for the albumArtImage for indicator-
+    sound or else the albumart lookup via thumbnailer will fail and the
+    albumArtImage will not render.
+
+ -- Jim Hodapp <[e-mail]>  Wed, 15 Jun 2016 20:33:30 +0000
+
 ubuntu-settings-components (0.7+16.10.20160519-0ubuntu1) yakkety; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml'
--- plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml	2016-02-11 11:23:02 +0000
+++ plugins/Ubuntu/Settings/Menus/MediaPlayerMenu.qml	2016-06-17 12:59:22 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import QtQuick.Layouts 1.1
+import Ubuntu.Thumbnailer 0.1
 
 ListItem.Empty {
     id: menu
@@ -81,6 +82,11 @@
 
                 image: Image {
                     id: albumArtImage
+                    width: units.gu(8)
+                    height: width
+                    fillMode: Image.PreserveAspectFit
+                    sourceSize: Qt.size(width, height)
+                    anchors.centerIn: parent
                 }
             }