Merge lp:~unity-team/unity8/older-months into lp:unity8

[Michael Terry]

Ensure the past circle animations complete

Currently, all the animations stop as soon as the present circles are all visible. This change ensures that the animations run to completion.

Pete Woods said this patch was necessary. Pete, please fill this description and commit message out.

Pete says:
This change ensures the past circle animations complete, regardless of the amount of current circles.

You will notice the bug as soon as you are near the start of the month (like right now).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity8-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/402
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/677
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/677/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/605

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/112/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Can this be unit-tested?

review: Needs Information

[Pete Woods (pete-woods)]

It probably could be. There are no unit tests for the infographic circles at present, AFAIK.

It would be a little bit of a pain to do the tests, as there is animation involved here, and I'm not sure when exactly you'd have the test wait until.

[Albert Astals Cid (aacid)]

Ok, no test then, can you point me at what difference i should be seeing visually between having or not having this patch?

review: Needs Information

[Pete Woods (pete-woods)]

It makes no different with all the mock backend, as all that data has the "current day" be somewhere late in the month, allowing the "past month" animations to complete purely by chance.

If you run it against the real libusermetrics backend, create yourself a pretend data source using the usermetricsinput command (libusermetrics-tools package):

usermetricsinput twitter "%1 tweets received" "No tweets" single 1.0 0.9 0.8 0.7 0.6 0.0 0.6 0.8 0.9 1.0 0.9 0.8 0.7 0.6 0.7

You should see that the past month data is invisible without this patch.

[Pete Woods (pete-woods)]

Where "single" is the name of the user for the lightdm mock you have chosen.

[Albert Astals Cid (aacid)]

Ok

review: Approve

=== modified file 'Greeter/Infographics.qml'
--- Greeter/Infographics.qml	2013-06-05 22:03:08 +0000
+++ Greeter/Infographics.qml	2013-07-03 16:59:26 +0000
@@ -81,7 +81,7 @@
                     var nextCircle = presentCircles.itemAt(presentCircleCounter++)
                     if (nextCircle !== null) nextCircle.presentCircleGrowAnim.start()
                 }
-                if (presentCircleCounter > infographic.model.currentDay) {
+                if (presentCircleCounter > infographic.model.currentDay && pastCircleCounter >= pastCircles.count) {
                     stop()
                 }
             }