Merge lp://staging/~mterry/unity8/statsWelcomeScreen into lp://staging/unity8

Proposed by Michael Terry
Status: Superseded
Proposed branch: lp://staging/~mterry/unity8/statsWelcomeScreen
Merge into: lp://staging/unity8
Diff against target: 855 lines (+426/-60) (has conflicts)
20 files modified
Components/EdgeDemo.qml (+4/-4)
Greeter/GreeterContent.qml (+28/-6)
Greeter/Infographics.qml (+8/-1)
Shell.qml (+2/-0)
plugins/AccountsService/AccountsBindings.cpp (+116/-0)
plugins/AccountsService/AccountsBindings.h (+72/-0)
plugins/AccountsService/AccountsService.cpp (+58/-6)
plugins/AccountsService/AccountsService.h (+13/-3)
plugins/AccountsService/CMakeLists.txt (+1/-0)
plugins/AccountsService/plugin.cpp (+3/-3)
plugins/Unity/Launcher/backend/launcherbackend.cpp (+6/-1)
tests/mocks/AccountsService/AccountsBindings.cpp (+35/-14)
tests/mocks/AccountsService/AccountsBindings.h (+31/-7)
tests/mocks/AccountsService/CMakeLists.txt (+3/-1)
tests/mocks/AccountsService/plugin.cpp (+3/-3)
tests/mocks/libusermetrics/UserMetrics.cpp (+5/-1)
tests/plugins/AccountsService/CMakeLists.txt (+1/-0)
tests/plugins/AccountsService/client.cpp (+18/-6)
tests/qmltests/Greeter/tst_Infographics.qml (+4/-4)
tests/qmltests/Greeter/tst_Phone.qml (+15/-0)
Text conflict in plugins/Unity/Launcher/backend/launcherbackend.cpp
To merge this branch: bzr merge lp://staging/~mterry/unity8/statsWelcomeScreen
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email:

This proposal has been superseded by a proposal from 2013-09-05.

Commit message

Listen to the system setting StatsWelcomeScreen, which tells us whether to show user-specific infographic data in the greeter.

Description of the change

Listen to the system setting StatsWelcomeScreen, which tells us whether to show user-specific infographic data in the greeter.

In addition to the main attraction, I fixed a bug with animations when switching between data and no-data in the infographic (the change in Infographic.qml). And I added a tiny test for the new feature.

Support for StatsWelcomeScreen is part of bug 1207857, and the option can be seen in the Privacy section of the system settings. Note that toggling that value, as of this writing, doesn't actually work due to a policykit issue. But to manually change the setting, these dbus commands can be used:

To turn stats off:
dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User32011 org.freedesktop.DBus.Properties.Set string:com.ubuntu.touch.AccountsService.SecurityPrivacy string:StatsWelcomeScreen variant:boolean:false

To turn back on again:
dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User32011 org.freedesktop.DBus.Properties.Set string:com.ubuntu.touch.AccountsService.SecurityPrivacy string:StatsWelcomeScreen variant:boolean:true

To post a comment you must log in.
276. By Michael Terry

Merge from wallpaper branch

277. By Michael Terry

Merge from trunk

278. By Michael Terry

Merge from trunk

279. By Michael Terry

Merge from trunk

280. By Michael Terry

Make function naming match unity8 style

281. By Michael Terry

Don't use auto

282. By Michael Terry

Merge from trunk

283. By Michael Terry

Merge from trunk

284. By Michael Terry

Prevent overlapping animations

285. By Michael Terry

Merge from trunk

286. By Michael Terry

Don't crash if we only ever set an empty username in our mock libusermetrics

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches