Merge lp:~mpt/libusermetrics/1286276-no-data-sources into lp:libusermetrics

[Matthew Paul Thomas]

Fixes bug 1286276 (Lock screen whines that "No data sources available" on first use), simply by changing that string to "". First use is just the most obvious situation where this happens. There is never a situation where it would be appropriate to say "No data sources available" to someone who has bought your phone.

Fixes bug 1286276 (Lock screen whines that "No data sources available" on first use), simply by changing that string to "". First use is just the most obvious situation where this happens. There is never a situation where it would be appropriate to say "No data sources available" to someone who has bought your phone.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/libusermetrics-ci/109/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/libusermetrics-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libusermetrics-ci/109/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

thanks, that makes sense to me

review: Approve

[Sebastien Bacher (seb128)]

Testing that change it seems the greeter doesn't display the infographic circle at all if there is no string (the phone lockscreen just displays the date at the top and the wallpaper), Matthew is that fine from a design perspective? Or do we want to display the circle? (in which case more work is needed)

review: Needs Information

[Sebastien Bacher (seb128)]

That's because the greeter hides the Infographics component if the string is ""
http://bazaar.launchpad.net/~unity-team/unity8/trunk/view/head:/qml/Greeter/Infographics.qml#L76

We can fix that either by not having that condition in unity8 (unsure why it was there though, subscribing Michael who seems to have added it and might know) or by changing the "" here to be " " (which feels a bit hackish but should work)

[Michael Terry (mterry)]

I *believe* that behavior on unity8's part (hiding circle if no message) is because: (a) it was an error (like unity8 giving a libusermetrics user that didn't exist) and (b) it looked weird, since there would be no infographic history either. So we just had a purple circle in the middle of the screen. Looked like an incomplete UI element.

I'm happy to take that check out now that a blank message is considered not-an-error-case.

However... Can I propose an alternative? Is it possible we can make libusermetrics behave the same as once the user has logged in once? i.e. show "0 texts received today" and "0 calls made" etc. It feels really weird that there's such a display difference between 1 second before first login and 1s after first login.

All those infographic templates are available at that point, eh? libusermetrics *could* show those strings...

[Sebastien Bacher (seb128)]

urg, the libusermetrics silo landed by error, now that it's in I would prefer pushing forward and fixing the remaining issue rather than reverting. Matthew, could you comment on what would be the right behaviour for the first boot? (cf Michael's comment)

[Matthew Paul Thomas (mpt)]

I dislike the "0 texts/photos/calls today" strings because they sound whiny. "Why aren't you using the phone for this particular purpose? Why? Why?" However, that's a problem that should be fixed generally, not just some of the time.

I don't know what "before first login" means. When you turn on the phone for the first time, you go through the setup, then you enter a session that looks indistinguishable from a normal session, without having seen the lock screen anyway.

But even if you explained to me when "" stops and "0 somethings today" begins, that wouldn't explain it to everyone, so I agree with Michael's proposal of just making it behave the same way all the time.

[Michael Terry (mterry)]

Ah.. OK. After some research, I figured out when it stops showing "" and does "X things today". The first time any of those "things" categories happen ever, they start showing up in the infographic.

So if I receive a call, but never make a call, I won't ever see "0 calls made today", but I will see "1 call received today" today and "0 calls received today" tomorrow.

So at least there's some rhyme and reason to it.

I'm still not convinced we can't do something better in the initial-state case. And am also not convinced that accidentally landing something under discussion is a better reason for further changes rather than backing it out. But I can whip up a unity8 branch that handles "" better. Stay tuned.

[Michael Terry (mterry)]

https://code.launchpad.net/~mterry/unity8/handle-empty-infographic-label/+merge/271323

=== modified file 'src/libusermetricsoutput/UserMetricsImpl.cpp'
--- src/libusermetricsoutput/UserMetricsImpl.cpp	2014-10-15 17:12:16 +0000
+++ src/libusermetricsoutput/UserMetricsImpl.cpp	2015-08-14 08:08:25 +0000
@@ -195,7 +195,7 @@
 		updateMonth(*m_secondMonth, 0, secondMonthDate.daysInMonth(), dataIndex,
 				end);
 
-		setLabel(_("No data sources available"));
+		setLabel("");
 	} else {
 		updateCurrentDataSet(0);
 		connect(m_dataSet.data(), SIGNAL(dataChanged(const QVariantList *)),

=== modified file 'tests/unit/libusermetricsoutput/TestUserMetricsImpl.cpp'
--- tests/unit/libusermetricsoutput/TestUserMetricsImpl.cpp	2014-10-15 17:12:16 +0000
+++ tests/unit/libusermetricsoutput/TestUserMetricsImpl.cpp	2015-08-14 08:08:25 +0000
@@ -143,7 +143,7 @@
 	model->readyForDataChangeSlot();
 
 	EXPECT_EQ("non-existing-user", model->username());
-	EXPECT_EQ(QString("No data sources available"), model->label());
+	EXPECT_EQ(QString(""), model->label());
 
 	// the first month should be entirely empty
 	{
@@ -169,7 +169,7 @@
 	model->readyForDataChangeSlot();
 
 	EXPECT_EQ("soon-to-exist-user", model->username());
-	EXPECT_EQ(QString("No data sources available"), model->label());
+	EXPECT_EQ(QString(""), model->label());
 
 	// the first month should be entirely empty
 	{
@@ -243,7 +243,7 @@
 	model->readyForDataChangeSlot();
 
 	EXPECT_EQ("existing-user", model->username());
-	EXPECT_EQ(QString("No data sources available"), model->label());
+	EXPECT_EQ(QString(""), model->label());
 
 	// the first month should be entirely empty
 	{