Merge lp:~mterry/unity8/infographic-white into lp:unity8

[Michael Terry]

Make infographic bubbles white even on the default wallpaper.

Make infographic bubbles white even on the default wallpaper.

This was a request from Alex M in Design. He liked the white infographics uses on custom wallpapers and felt it was better than our colored bubbles even for the default wallpaper.

This means we no longer pay attention to the color set in libusermetrics.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 No, just pre-reqs

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 Not really, but it is a direct request and he knows what it will look like already.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2571
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2111/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2776
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1538
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1538
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1538
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2804
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2664/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2664
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2664/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2111/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
Unrelated launcher failures

review: Approve

=== modified file 'qml/Greeter/CoverPage.qml'
--- qml/Greeter/CoverPage.qml	2016-09-07 17:19:09 +0000
+++ qml/Greeter/CoverPage.qml	2016-09-07 17:19:10 +0000
@@ -109,8 +109,6 @@
         model: root.infographicModel
         clip: true // clip large data bubbles
 
-        useColor: !root.hasCustomBackground
-
         anchors {
             verticalCenter: parent.verticalCenter
             left: parent.left

=== modified file 'qml/Greeter/Infographics.qml'
--- qml/Greeter/Infographics.qml	2016-09-07 17:19:09 +0000
+++ qml/Greeter/Infographics.qml	2016-09-07 17:19:10 +0000
@@ -24,7 +24,6 @@
     property var model
 
     property int animDuration: 10
-    property bool useColor: true
 
     QtObject {
         id: d
@@ -36,7 +35,6 @@
                               || circleChangeAnimTimer.running
     }
 
-    // Define a replacement white-based color theme when useColor is false
     QtObject {
         id: whiteTheme
         property color main: "white"
@@ -177,10 +175,7 @@
                             ColorAnimation {
                                 target: pastCircle
                                 property: "color"
-                                to: Gradient.threeColorByIndex(index, count,
-                                                               useColor ?
-                                                               infographic.model.secondColor :
-                                                               whiteTheme)
+                                to: Gradient.threeColorByIndex(index, count, whiteTheme)
                                 easing.type: Easing.OutCurve
                                 duration: circleChangeAnimTimer.interval * d.circleModifier
                             }
@@ -242,10 +237,7 @@
                             ColorAnimation {
                                 target: presentCircle
                                 property: "color"
-                                to: Gradient.threeColorByIndex(index, infographic.model.currentDay,
-                                                               useColor ?
-                                                               infographic.model.firstColor :
-                                                               whiteTheme)
+                                to: Gradient.threeColorByIndex(index, infographic.model.currentDay, whiteTheme)
                                 easing.type: Easing.OutCurve
                                 duration: circleChangeAnimTimer.interval * d.circleModifier
                             }

=== modified file 'qml/Greeter/WideView.qml'
--- qml/Greeter/WideView.qml	2016-09-07 17:19:09 +0000
+++ qml/Greeter/WideView.qml	2016-09-07 17:19:10 +0000
@@ -111,8 +111,6 @@
         infographics {
             height: 0.75 * parent.height
             anchors.leftMargin: loginList.x + loginList.width
-
-            useColor: !root.hasCustomBackground
         }
 
         onTease: root.tease()