Unity 8

Merge lp:~mterry/unity8/tutorial-redesign into lp:unity8

tutorial-redesign
Merge into trunk

Proposed by Michael Terry on 2016-03-10

Status:

Superseded

Proposed branch:

lp:~mterry/unity8/tutorial-redesign

Merge into:

lp:unity8

Prerequisite:

lp:~mzanetti/unity8/catch-osk

Diff against target:

19733 lines (+9629/-3653)

233 files modified

CMakeLists.txt (+2/-1)
cmake/modules/QmlTest.cmake (+1/-1)
data/com.canonical.Unity8.gschema.xml (+11/-0)
data/unity8-dash.conf (+1/-0)
debian/changelog (+97/-0)
debian/control (+9/-7)
debian/unity8-common.udev (+2/-0)
debian/unity8-doc.install (+1/-0)
doc/devices.conf (+30/-0)
plugins/AccountsService/AccountsService.cpp (+286/-399)
plugins/AccountsService/AccountsService.h (+42/-24)
plugins/AccountsService/AccountsService.qmltypes (+5/-0)
plugins/AccountsService/AccountsServiceDBusAdaptor.cpp (+11/-4)
plugins/AccountsService/AccountsServiceDBusAdaptor.h (+5/-6)
plugins/AccountsService/com.canonical.unity.AccountsService.xml (+5/-0)
plugins/Dash/AudioProgressBar.qml (+1/-0)
plugins/Dash/CardCreator.js (+69/-34)
plugins/Dash/CardCreatorCache.qml (+3/-3)
plugins/Dash/plugin.cpp (+6/-6)
plugins/GlobalShortcut/globalshortcutregistry.cpp (+4/-4)
plugins/IntegratedLightDM/liblightdm/CMakeLists.txt (+16/-3)
plugins/IntegratedLightDM/liblightdm/UsersModel.cpp (+4/-18)
plugins/IntegratedLightDM/liblightdm/UsersModel.h (+1/-1)
plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+44/-10)
plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h (+15/-3)
plugins/ScreenGrabber/screengrabber.cpp (+0/-2)
plugins/Ubuntu/Gestures/DirectionalDragArea.cpp (+40/-5)
plugins/Ubuntu/Gestures/DirectionalDragArea.h (+8/-0)
plugins/Ubuntu/Gestures/DirectionalDragArea_p.h (+2/-0)
plugins/Unity/Indicators/indicatorsmanager.cpp (+2/-2)
plugins/Unity/Indicators/rootstateparser.h (+1/-0)
plugins/Unity/Launcher/desktopfilehandler.cpp (+2/-2)
plugins/Unity/Launcher/launcheritem.cpp (+1/-0)
plugins/Unity/Launcher/launcheritem.h (+1/-1)
plugins/Unity/Launcher/launchermodel.cpp (+15/-5)
plugins/Unity/Launcher/launchermodel.h (+1/-1)
plugins/Utils/CMakeLists.txt (+2/-1)
plugins/Utils/Utils.qmltypes (+2/-2)
plugins/Utils/deviceconfigparser.cpp (+150/-0)
plugins/Utils/deviceconfigparser.h (+62/-0)
plugins/Utils/plugin.cpp (+4/-2)
plugins/Utils/timezoneFormatter.cpp (+10/-0)
plugins/Utils/timezoneFormatter.h (+1/-0)
plugins/Utils/windowinputfilter.cpp (+14/-16)
plugins/Utils/windowinputfilter.h (+11/-11)
plugins/Wizard/CMakeLists.txt (+7/-1)
plugins/Wizard/LocalePlugin.cpp (+291/-0)
plugins/Wizard/LocalePlugin.h (+58/-0)
plugins/Wizard/PageList.cpp (+4/-4)
plugins/Wizard/Status.cpp (+143/-0)
plugins/Wizard/Status.h (+60/-0)
plugins/Wizard/System.cpp (+5/-4)
plugins/Wizard/System.h (+3/-2)
plugins/Wizard/plugin.cpp (+7/-8)
plugins/Wizard/plugin.h (+1/-2)
plugins/Wizard/timezonemodel.cpp (+239/-0)
plugins/Wizard/timezonemodel.h (+80/-0)
po/unity8.pot (+29/-27)
qml/Components/EdgeBarrier.qml (+1/-1)
qml/Components/Lockscreen.qml (+86/-100)
qml/Components/ModeSwitchWarningDialog.qml (+1/-1)
qml/Components/PassphraseLockscreen.qml (+5/-4)
qml/Components/PhysicalKeysMapper.qml (+24/-0)
qml/Components/PinLockscreen.qml (+22/-1)
qml/Components/ShellDialog.qml (+8/-0)
qml/Dash/CardCarousel.qml (+0/-1)
qml/Dash/CardGrid.qml (+0/-1)
qml/Dash/CardHorizontalList.qml (+0/-1)
qml/Dash/CardTool.qml (+2/-26)
qml/Dash/CardVerticalJournal.qml (+0/-1)
qml/Dash/Dash.qml (+11/-11)
qml/Dash/GenericScopeView.qml (+2/-0)
qml/Dash/Previews/PreviewHeader.qml (+37/-9)
qml/Dash/Previews/PreviewOverlay.qml (+1/-1)
qml/Dash/Previews/PreviewSharing.qml (+17/-7)
qml/Dash/ScopesListCategoryItem.qml (+8/-4)
qml/DeviceConfiguration.qml (+56/-18)
qml/DisabledScreenNotice.qml (+44/-20)
qml/Greeter/CoverPage.qml (+13/-2)
qml/Greeter/Greeter.qml (+10/-6)
qml/Greeter/Infographics.qml (+2/-1)
qml/Greeter/NarrowView.qml (+14/-1)
qml/Launcher/Launcher.qml (+144/-12)
qml/Launcher/LauncherDelegate.qml (+55/-20)
qml/Launcher/LauncherPanel.qml (+122/-51)
qml/Launcher/graphics/launcher-app-focus-ring.svg (+12/-0)
qml/Notifications/Notification.qml (+6/-2)
qml/OrientedShell.qml (+26/-1)
qml/Panel/Handle.qml (+2/-2)
qml/Panel/Indicators/MenuItemFactory.qml (+0/-1)
qml/Panel/IndicatorsMenu.qml (+1/-3)
qml/Panel/Panel.qml (+5/-1)
qml/ScopeTool.qml (+0/-8)
qml/Shell.qml (+77/-46)
qml/Stages/AbstractStage.qml (+4/-1)
qml/Stages/ApplicationWindow.qml (+0/-2)
qml/Stages/DesktopSpread.qml (+64/-17)
qml/Stages/DesktopSpreadDelegate.qml (+15/-1)
qml/Stages/DesktopStage.qml (+34/-34)
qml/Stages/PhoneStage.qml (+80/-9)
qml/Stages/SpreadDelegate.qml (+20/-0)
qml/Stages/TabletStage.qml (+98/-14)
qml/Stages/WindowResizeArea.qml (+8/-5)
qml/Tutorial/Arrow.qml (+0/-56)
qml/Tutorial/InactivityTimer.qml (+62/-0)
qml/Tutorial/Slider.qml (+0/-123)
qml/Tutorial/Tick.qml (+0/-29)
qml/Tutorial/Tutorial.qml (+43/-18)
qml/Tutorial/TutorialBottom.qml (+0/-104)
qml/Tutorial/TutorialBottomFinish.qml (+0/-41)
qml/Tutorial/TutorialContent.qml (+250/-80)
qml/Tutorial/TutorialLeft.qml (+28/-75)
qml/Tutorial/TutorialLeftFinish.qml (+0/-41)
qml/Tutorial/TutorialLeftLong.qml (+54/-0)
qml/Tutorial/TutorialPage.qml (+66/-190)
qml/Tutorial/TutorialRight.qml (+0/-223)
qml/Tutorial/TutorialTop.qml (+61/-0)
qml/Tutorial/graphics/arrow.svg (+19/-0)
qml/Wizard/CheckableSetting.qml (+10/-2)
qml/Wizard/Page.qml (+274/-58)
qml/Wizard/Pages.qml (+76/-32)
qml/Wizard/Pages/10-welcome.qml (+129/-56)
qml/Wizard/Pages/30-wifi.qml (+119/-128)
qml/Wizard/Pages/40-location.qml (+216/-75)
qml/Wizard/Pages/50-timezone.qml (+275/-0)
qml/Wizard/Pages/60-account.qml (+74/-0)
qml/Wizard/Pages/60-reporting.qml (+0/-64)
qml/Wizard/Pages/70-passwd-type.qml (+105/-79)
qml/Wizard/Pages/75-report-check.qml (+91/-0)
qml/Wizard/Pages/80-finished.qml (+106/-28)
qml/Wizard/Pages/here-terms.qml (+80/-73)
qml/Wizard/Pages/passcode-confirm.qml (+13/-30)
qml/Wizard/Pages/passcode-desktop.qml (+132/-0)
qml/Wizard/Pages/passcode-set.qml (+12/-28)
qml/Wizard/Pages/password-set.qml (+149/-0)
qml/Wizard/Pages/sim.qml (+71/-40)
qml/Wizard/PasswordMeter.qml (+106/-0)
qml/Wizard/StackButton.qml (+6/-11)
qml/Wizard/Wizard.qml (+0/-9)
qml/Wizard/WizardTextField.qml (+25/-0)
src/CMakeLists.txt (+1/-1)
src/CachingNetworkManagerFactory.cpp (+2/-2)
src/CachingNetworkManagerFactory.h (+3/-2)
src/Dash/CMakeLists.txt (+1/-1)
tests/autopilot/unity8/dash.py (+1/-2)
tests/autopilot/unity8/shell/emulators.py (+0/-2)
tests/autopilot/unity8/shell/tests/test_helpers.py (+0/-2)
tests/autopilot/unity8/shell/tests/test_tutorial.py (+0/-57)
tests/autopilot/unity8/tutorial.py (+0/-73)
tests/mocks/AccountsService/AccountsService.cpp (+43/-3)
tests/mocks/AccountsService/AccountsService.h (+22/-5)
tests/mocks/AccountsService/AccountsService.qmltypes (+5/-0)
tests/mocks/GSettings.1.0/fake_gsettings.cpp (+64/-0)
tests/mocks/GSettings.1.0/fake_gsettings.h (+18/-0)
tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpp (+0/-14)
tests/mocks/MeeGo/QOfono/MockOfonoSimManager.qml (+1/-0)
tests/mocks/Ubuntu/Connectivity/plugin.cpp (+1/-0)
tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt (+2/-0)
tests/mocks/Ubuntu/SystemSettings/Diagnostics/CMakeLists.txt (+1/-0)
tests/mocks/Ubuntu/SystemSettings/Diagnostics/MockDiagnostics.qml (+24/-0)
tests/mocks/Ubuntu/SystemSettings/Diagnostics/qmldir (+2/-0)
tests/mocks/Ubuntu/SystemSettings/LanguagePlugin/MockLanguagePlugin.qml (+2/-2)
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp (+1/-1)
tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt (+1/-0)
tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml (+25/-0)
tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir (+2/-0)
tests/mocks/Unity/Application/ApplicationInfo.h (+1/-1)
tests/mocks/Unity/Application/MirSurface.cpp (+3/-0)
tests/mocks/Unity/Launcher/MockLauncherModel.cpp (+2/-0)
tests/mocks/Utils/CMakeLists.txt (+3/-2)
tests/mocks/Utils/Utils.qmltypes (+2/-2)
tests/mocks/Utils/plugin.cpp (+7/-2)
tests/mocks/Wizard/CMakeLists.txt (+6/-1)
tests/mocks/Wizard/MockSystem.cpp (+4/-2)
tests/mocks/Wizard/MockSystem.h (+2/-2)
tests/mocks/Wizard/mockplugin.cpp (+7/-8)
tests/plugins/AccountsService/CMakeLists.txt (+5/-0)
tests/plugins/AccountsService/PropertiesServer.cpp (+17/-4)
tests/plugins/AccountsService/PropertiesServer.h (+2/-1)
tests/plugins/AccountsService/UscServer.cpp (+28/-0)
tests/plugins/AccountsService/UscServer.h (+39/-0)
tests/plugins/AccountsService/client.cpp (+100/-9)
tests/plugins/AccountsService/interfaces.xml (+16/-0)
tests/plugins/AccountsService/server.cpp (+12/-0)
tests/plugins/Dash/cardcreator/1.res (+4/-6)
tests/plugins/Dash/cardcreator/1.res.cardcreator (+119/-0)
tests/plugins/Dash/cardcreator/10.res (+3/-5)
tests/plugins/Dash/cardcreator/10.res.cardcreator (+137/-0)
tests/plugins/Dash/cardcreator/11.res (+5/-7)
tests/plugins/Dash/cardcreator/11.res.cardcreator (+210/-0)
tests/plugins/Dash/cardcreator/2.res (+3/-5)
tests/plugins/Dash/cardcreator/2.res.cardcreator (+136/-0)
tests/plugins/Dash/cardcreator/3.res (+3/-5)
tests/plugins/Dash/cardcreator/3.res.cardcreator (+137/-0)
tests/plugins/Dash/cardcreator/4.res (+3/-5)
tests/plugins/Dash/cardcreator/4.res.cardcreator (+109/-0)
tests/plugins/Dash/cardcreator/5.res (+5/-7)
tests/plugins/Dash/cardcreator/5.res.cardcreator (+156/-0)
tests/plugins/Dash/cardcreator/6.res (+2/-4)
tests/plugins/Dash/cardcreator/6.res.cardcreator (+126/-0)
tests/plugins/Dash/cardcreator/7.res (+3/-5)
tests/plugins/Dash/cardcreator/7.res.cardcreator (+149/-0)
tests/plugins/Dash/cardcreator/8.res (+3/-5)
tests/plugins/Dash/cardcreator/8.res.cardcreator (+107/-0)
tests/plugins/Dash/cardcreator/9.res (+4/-5)
tests/plugins/Dash/cardcreator/9.res.cardcreator (+119/-0)
tests/plugins/Dash/cardcreatortest.cpp (+35/-25)
tests/plugins/Dash/cardcreatortest.qml (+4/-4)
tests/plugins/IntegratedLightDM/CMakeLists.txt (+25/-0)
tests/plugins/IntegratedLightDM/integrated.cpp (+91/-0)
tests/plugins/Utils/CMakeLists.txt (+7/-1)
tests/plugins/Utils/DeviceConfigParserTest.cpp (+70/-0)
tests/qmltests/CMakeLists.txt (+1/-0)
tests/qmltests/Components/tst_Lockscreen.qml (+14/-7)
tests/qmltests/Components/tst_PhysicalKeysMapper.qml (+3/-3)
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml (+18/-1)
tests/qmltests/Dash/Previews/tst_PreviewSharing.qml (+17/-3)
tests/qmltests/Dash/tst_CardTool.qml (+4/-4)
tests/qmltests/Dash/tst_Dash.qml (+89/-0)
tests/qmltests/Greeter/tst_Greeter.qml (+7/-1)
tests/qmltests/Greeter/tst_NarrowView.qml (+9/-0)
tests/qmltests/Launcher/tst_Launcher.qml (+254/-18)
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml (+2/-4)
tests/qmltests/Stages/tst_DesktopStage.qml (+2/-1)
tests/qmltests/Stages/tst_PhoneStage.qml (+19/-6)
tests/qmltests/Stages/tst_SpreadDelegate.qml (+7/-0)
tests/qmltests/Stages/tst_TabletStage.qml (+19/-1)
tests/qmltests/Tutorial/tst_Tutorial.qml (+639/-245)
tests/qmltests/Wizard/tst_Wizard.qml (+186/-215)
tests/qmltests/tst_DeviceConfiguration.qml (+49/-0)
tests/qmltests/tst_DisabledScreenNotice.qml (+76/-2)
tests/qmltests/tst_Shell.qml (+245/-68)
tests/qmltests/tst_ShellWithPin.qml (+0/-22)

To merge this branch:

bzr merge lp:~mterry/unity8/tutorial-redesign

Related bugs:

Bug #1443869: [Edge Education] New wizard in Vivid doesn't excercise indicator gesture	Undecided	Fix Released
Bug #1484383: [Edge education] Tutorial doesn't teach you about the long swipe from left	Medium	Fix Released
Bug #1519779: A PhoneStage gets loaded and unloaded during desktop start up	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-03-10	Needs Fixing on 2016-03-11
PS Jenkins bot	continuous-integration	2016-03-10	Pending
Albert Astals Cid	merges fine	2016-03-10	Pending
Michael Zanetti		2016-03-10	Pending
Review via email: mp+288674@code.launchpad.net

This proposal supersedes a proposal from 2015-09-16.

This proposal has been superseded by a proposal from 2016-03-11.

Commit message

Redesign the first-boot edge tutorial

Description of the change

Based on new design specs [1], this is whole new tutorial code.

Some of the interesting things going on here:

- New DDA feature "monitorOnly" which lets input events "fall through" (i.e. it doesn't own them) but continues to monitor them. This is how we implement the bottom edge tutorial fading out without having to communicate with the app.

- New AccountsService key to keep track of which particular edges are done, now that they are presented separately. We still use the old key for overall "done" status.

- Renamed WindowKeysFilter to WindowInputFilter. I needed a way to keep track of input inactivity. And since WindowKeysFilter was already injecting itself into the event stream and already kept track of timestamps for us (which usually isn't exposed to Qml), I just modified it a bit. I felt like the new scope should be indicated in the name, so I renamed it.

- I took out some old hacks only needed for the old tutorial.

[1] https://docs.google.com/document/d/1pZ-Ro--2eaRzjZKNRoYAeDvQHMkCuyvVuPFWFQfPW4s/edit

== Checklist ==

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes. A new phablet-tools branch for your desktop [2] and a new upload of dbus-property-service (not in a VCS). Both are in silo 33.

[2] https://code.launchpad.net/~mterry/phablet-tools/tutorial-redesign/+merge/277764

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

* Did you make sure that your branch does not contain spurious tags?
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?
Yes. Patricia is on board with this MP. She has another screen coming (long swipe on left), but I'll do that as a separate MP.

Revision history for this message

Michael Terry (mterry) wrote on 2015-11-17: Posted in a previous version of this proposal

<dandrader> mterry, DDA changes in lp:~mterry/unity8/tutorial-redesign look fine
<mterry> dandrader, awesome, thanks
will quote you in the MP :)
<dandrader> mterry, only unsure about the property name. Because it will work all the same, only difference is that it won't claim ownership over the touch point once it recognizes it's performing a gesture
<mterry> dandrader, yeah. I'm happy to rename it. Got something you like better?
<dandrader> mterry, no :)

Revision history for this message

Michael Terry (mterry) wrote on 2015-11-18: Posted in a previous version of this proposal

OK, I'm opening this up to review, although the final design review isn't done yet and I need to add a couple more qmltests. But I'd like to get the review train started on its way.

Revision history for this message

Michael Terry (mterry) wrote on 2015-11-18: Posted in a previous version of this proposal

OK, added more tests and cleaned up existing ones. Hopefully this is "done-ish" from a technical POV and only design-related changes will happen now (like changes to strings or alignment).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-19: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-11-19: Posted in a previous version of this proposal

Hmm... I've just flashed a device and enabled the edges-intro with phablet-config. I could see the intro for left, top and bottom edges, however, still waiting for the right edge one to appear.

====

As you renamed WindowKeyFilter, please update this comment too

qml/Shell.qml: // dummy shortcut to force creation of GlobalShortcutRegistry before WindowKeyFilter

===

- readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
+ dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0

Given that it's not obvious what the dragProgress is used for, please add a comment in the stages code to indicate it. otherwise it's likely to be removed at some point because noone knows what it does.

===

+ ////

Is there a purpose to this? :)

===
+ sourceSize.height: 1080
+ sourceSize.width: 1916

erm... can you explain the values? Looks wrong to me

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-11-19: Posted in a previous version of this proposal

Notes for myself:

* test if CPU usage drops if screen locks during animation
* test what happens if plugging external screen while in tutorial

Revision history for this message

Michael Terry (mterry) wrote on 2015-11-19: Posted in a previous version of this proposal

Download full text (3.2 KiB)

OK, I've made some changes. One, I added some more space between tutorial text lines, per design request.

Second, also per design request, I've added unique helper text on the bottom edge tutorial for each supported app. This also means that we show the tutorial for each app rather than once for any of them. Since this meant that the tutorial might not formally "finish" for quite some time, I've optimized the rest of the tutorial to use Loaders. So that we're not loading three unused background images a week after the user unboxes their phone.

As for your comments:

> Hmm... I've just flashed a device and enabled the edges-intro
> with phablet-config. I could see the intro for left, top and
> bottom edges, however, still waiting for the right edge one to appear.

As discussed on IRC, we're guessing this was user error. Unless you've seen it again?

====

> As you renamed WindowKeyFilter, please update this comment too
>
> qml/Shell.qml: // dummy shortcut to force creation of GlobalShortcutRegistry before WindowKeyFilter

Done.

===

> - readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
> + dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0

> Given that it's not obvious what the dragProgress is used for,
> please add a comment in the stages code to indicate it. otherwise
> it's likely to be removed at some point because noone knows what it does.

Done.

===

> + ////
>
> Is there a purpose to this? :)

Ah, that's just a little visual separator I use between the public interface part of the object and the implementation parts. Qml doesn't use headers, and while we seem to use the placement of the QtObject component to separate the portions of code, sometimes an object doesn't warrant a QtObject, so it isn't a universal distinguisher. Plus, I like the extra visual space.

I can take it out if it will be as confusing to you as others. I know Cimi doesn't like that I do that.

===

> + sourceSize.height: 1080
> + sourceSize.width: 1916
>
> erm... can you explain the values? Looks wrong to me

Duh, I swapped height and width. Fixed.

===

> * test if CPU usage drops if screen locks during animation

Please do, but note that there isn't any animation anymore. So I expect no CPU difference.

===

> * test what happens if plugging external screen while in tutorial

Ah yes. Here's what I expect the code to do:

- Any visible tutorials that aren't marked for desktop use will fade out.
- The right edge tutorial will appear (or update itself) with desktop-specific text when you have enough apps open.
- If you finish the right edge tutorial while in desktop mode, the tutorial will be marked complete and you won't see any more coach marks. However, if you don't finish the right edge tutorial before undocking, you will continue to see all the tutorials you haven't seen yet, as normal.

OK, I've made some changes.  One, I added some more space between tutorial text lines, per design request.

Second, also per design request, I've added unique helper text on the bottom edge tutorial for each supported app.  This also means that we show the tutorial for each app rather than once for any of them.  Since this meant that the tutorial might not formally "finish" for quite some time, I've optimized the rest of the tutorial to use Loaders.  So that we're not loading three unused background images a week after the user unboxes their phone.

As for your comments:

> Hmm... I've just flashed a device and enabled the edges-intro
> with phablet-config. I could see the intro for left, top and 
> bottom edges, however, still waiting for the right edge one to appear.

As discussed on IRC, we're guessing this was user error.  Unless you've seen it again?

====

> As you renamed WindowKeyFilter, please update this comment too
> 
> qml/Shell.qml: // dummy shortcut to force creation of GlobalShortcutRegistry before WindowKeyFilter

Done.

===

> - readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
> + dragProgress: spreadRepeater.count > 0 ? spreadRepeater.itemAt(0).animatedProgress : 0

Done.

===

> + ////
> 
> Is there a purpose to this? :)

Ah, that's just a little visual separator I use between the public interface part of the object and the implementation parts.  Qml doesn't use headers, and while we seem to use the placement of the QtObject component to separate the portions of code, sometimes an object doesn't warrant a QtObject, so it isn't a universal distinguisher.  Plus, I like the extra visual space.

I can take it out if it will be as confusing to you as others.  I know Cimi doesn't like that I do that.

===

> + sourceSize.height: 1080
> + sourceSize.width: 1916
> 
> erm... can you explain the values? Looks wrong to me

Duh, I swapped height and width.  Fixed.

===

> * test if CPU usage drops if screen locks during animation

Please do, but note that there isn't any animation anymore.  So I expect no CPU difference.

===

> * test what happens if plugging external screen while in tutorial

Ah yes.  Here's what I expect the code to do:

- Any visible tutorials that aren't marked for desktop use will fade out.
- The right edge tutorial will appear (or update itself) with desktop-specific text when you have enough apps open.
- If you finish the right edge tutorial while in desktop mode, the tutorial will be marked complete and you won't see any more coach marks.  However, if you don't finish the right edge tutorial before undocking, you will continue to see all the tutorials you haven't seen yet, as normal.

How do you feel about that last behavior?  It might be tricky to do something much smarter unless either (A) we know the "native" usageScenario of the device or (B) we stop marking the "whole-tutorial-is-complete" flag and accept that if we add new pages or redesign the tutorial again in the future, we might end up showing tutorial content to users that have had their phones for a long time.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-19: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2015-11-20: Posted in a previous version of this proposal

Text conflict in tests/plugins/AccountsService/PropertiesServer.cpp
1 conflicts encountered.

review: Needs Fixing

Revision history for this message

Michael Terry (mterry) wrote on 2015-11-20: Posted in a previous version of this proposal

Fixed conflicts.

Revision history for this message

Albert Astals Cid (aacid) on 2015-11-20: Posted in a previous version of this proposal

review: Abstain (merges fine)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-20: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-23: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-23: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-24: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-27: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-30: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-12-01: Posted in a previous version of this proposal

+ i18n.tr("Hover your mouse on the right edge to view your open apps") :
+ i18n.tr("Short or long swipe from the right edge to view your open apps")

I know those have been given by design, but gotta point out some errors:
- In windowed mode, you need to push the mouse against the right edge and even overcome some resistance. Hovering is not enough.
- While at it, we might want to ask back on short swipe one too, but I guess that would be ok to oversimplify it in this case.

========

+ text: d.landscape ? i18n.tr("Swipe from the top right edge to open the notification bar")
+ : i18n.tr("Swipe from the top edge to open the notification bar")

this might needs a windowed mode special case too. We don't want to encourage clicking with a mouse so the indicators can also be revealed by clicking the icons. Although this is not wrong. If you have a touch screen too, you can also swipe then on a desktop.

========

+ text: i18n.tr("Swipe from the left edge to open the launcher")

same as for the right edge. With a mouse, it requires pushing towards the edge. Why not special cased here?

review: Needs Information

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-12-01: Posted in a previous version of this proposal

Another question:

I figure it will take ages until completed goes to true. Some people might never open the calculator app which would leave us with the tutorial being enabled forever. What are the implications of that?

review: Needs Information

Revision history for this message

Michael Terry (mterry) wrote on 2015-12-01: Posted in a previous version of this proposal

You mention the wording on the left edge drag needing to be changed for desktop mode -- but we don't show that tutorial on desktop. So I'm guessing we can leave it as is.

And you asked about the tutorial never "completing". This is a small issue. And it's why I revised TutorialContent to use loaders for each tutorial page. I don't think it's a problem, per se. But it does mean that we'll likely have the TutorialBottom page loaded most of the time. Until they load all the bottom-supported apps anyway...

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-12-01: Posted in a previous version of this proposal

On the right edge in windowed mode, it's not only the text, but the hoverMouseArea disappered and it's not possible to get past that step any more.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-14: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2016-01-13: Posted in a previous version of this proposal

Text conflict in qml/Launcher/Launcher.qml
1 conflicts encountered.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-13: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1987
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/35/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-18: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1988
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/124/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-22: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1989
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/168/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-22: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-01-22: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1989
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/168/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2016-02-02: Posted in a previous version of this proposal

Text conflict in qml/Stages/PhoneStage.qml
Text conflict in qml/Stages/TabletStage.qml
2 conflicts encountered.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-11: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-16: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-16: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-16: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-17: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-19: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-19: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-08: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2016-03-09: Posted in a previous version of this proposal

Tests need fixin ↑?

Revision history for this message

Michael Terry (mterry) wrote on 2016-03-09: Posted in a previous version of this proposal

Fixed the qmluitest, and removed the autopilot test. The tutorial is harder to test via one autopilot test now that the pages have been split up and separately triggered. Plus, we cover them well in qmluitests. And there's nothing autopilot-centric to test there.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-10:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/tutorial-redesign updated on 2016-03-11

2003. By Michael Terry on 2016-03-11: Merge silo 64
2004. By Michael Terry on 2016-03-11: Merge oobe

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11:

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

2004. By Michael Terry on 2016-03-11: Merge oobe
2003. By Michael Terry on 2016-03-11: Merge silo 64
2002. By Michael Terry on 2016-03-10: Merge in catch-osk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-02-12 00:12:30 +0000
 +++ CMakeLists.txt	2016-03-11 18:12:46 +0000
@@ -58,6 +58,7 @@
  find_package(Qt5Sql 5.4 REQUIRED)
  pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
++pkg_check_modules(GEONAMES REQUIRED geonames)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
  pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
@@ -131,7 +132,7 @@
      set(STDOUT_LOGGER "-o" "-,txt")
  endif()
--execute_process(COMMAND arch OUTPUT_VARIABLE ARCH)
++execute_process(COMMAND dpkg-architecture -qDEB_HOST_ARCH OUTPUT_VARIABLE ARCH)
  if (NOT ARCH MATCHES "arm*")
      set(ENABLE_TOUCH_EMULATION true)
      add_definitions(-DUNITY8_ENABLE_TOUCH_EMULATION)
 === modified file 'cmake/modules/QmlTest.cmake'
 --- cmake/modules/QmlTest.cmake	2015-05-21 20:24:47 +0000
 +++ cmake/modules/QmlTest.cmake	2016-03-11 18:12:46 +0000
@@ -183,7 +183,7 @@
      cmake_parse_arguments(QMLTEST "${QMLTEST_OPTIONS}" "${QMLTEST_SINGLE}" "${QMLTEST_MULTI}" ${ARGN})
      mangle_arguments()
--    bake_arguments("${QMLTEST_ARG_PREFIX}" args -qmljsdebugger=port:3768)
++    bake_arguments("${QMLTEST_ARG_PREFIX}" args -qmljsdebugger=port:3768,3800)
      set(qmltry_command
          $<TARGET_FILE:${TARGET}>
 === modified file 'data/com.canonical.Unity8.gschema.xml'
 --- data/com.canonical.Unity8.gschema.xml	2015-11-24 17:44:18 +0000
 +++ data/com.canonical.Unity8.gschema.xml	2016-03-11 18:12:46 +0000
@@ -27,6 +27,17 @@
        <summary>Maximum push needed to overcome edge barrier</summary>
        <description>How much you have to push (in grid units) the mouse against an edge barrier when sensibility is 1.</description>
      </key>
++    <key type="b" name="autohide-launcher">
++      <default>true</default>
++      <summary>Autohide the launcher</summary>
++      <description>This will only be applied in windowed mode. In staged mode, the launcher will always hide.</description>
++    </key>
++    <key type="u" name="launcher-width">
++      <default>8</default>
++      <range min="6" max="12"/>
++      <summary>Width of the launcher in grid units.</summary>
++      <description>Changes the width of the launcher in all usage modes.</description>
++    </key>
    </schema>
    <schema path="/com/canonical/unity8/greeter/" id="com.canonical.Unity8.Greeter" gettext-domain="unity8">
 === modified file 'data/unity8-dash.conf'
 --- data/unity8-dash.conf	2015-04-21 15:41:09 +0000
 +++ data/unity8-dash.conf	2016-03-11 18:12:46 +0000
@@ -14,6 +14,7 @@
  oom score 50
  respawn
++respawn limit unlimited
  env APP_ID=unity8-dash
 === modified file 'debian/changelog'
 --- debian/changelog	2016-03-08 20:59:35 +0000
 +++ debian/changelog	2016-03-11 18:12:46 +0000
@@ -1,3 +1,100 @@
++unity8 (8.13+15.04.20150914-0ubuntu1) UNRELEASED; urgency=medium
++
++  * bump version to fix OOBE build
++
++ -- Lukas Tinkl <ltinkl@canonical.com>  Mon, 14 Sep 2015 19:19:23 +0200
++
++unity8 (8.11+16.04.20160310.4-0ubuntu1) xenial; urgency=medium
++
++  [ Albert Astals Cid ]
++  * Add context for Re-dock as asked by translators (LP: #1534608)
++  * Add emblem to the preview header widget (LP: #1424720)
++  * Add haptics to ScopesListCategoryItem buttons
++  * Audio Cards: Make some of the image loading async (LP: #1533432)
++  * Do not create fallback code for the card tool fake card (LP:
++    #1545865)
++  * Fix resizing the dash bringing temp scopes size out of sync (LP:
++    #1543130)
++  * Minor fixes for unity-scope-tool
++  * Resolve title alignment on card creator time instead of on runtime
++  * Use fixedHeaderHeight only in the non cardtool cards
++  * Use the new undeprecated connectivityqt::Connectivity
++  * asynchronous is only false on the fake card in cardtool
++  * clazy fixes
++
++  [ Albert Astals Cid, CI Train Bot ]
++  * click scope: Add the else branch so we reset the card size in all
++    situations
++
++  [ Andrea Cimitan ]
++  * PreviewSharing widget now accepts both string and array of
++    widgetData["share-data"]["uri"] (LP: #1549056)
++  * Update AP tests for new single preview
++  * Use Text.Wrap for body notification text (LP: #1544909)
++
++  [ Andrea Cimitan, Lukáš Tinkl, Michael Zanetti, Nick Dedekind ]
++  * some fixes for the new palette (LP: #1554616)
++
++  [ CI Train Bot ]
++  * Resync trunk.
++  * Update translation template
++
++  [ CI Train Bot, Daniel d'Andrada ]
++  * Ensure the QML engine doesn't delete our mock MirSurfaces on its
++    own.
++
++  [ Daniel d'Andrada ]
++  * tst_Shell: Remove unused qml items
++
++  [ Josh Arenson ]
++  * Allow the shell to blacklist input devices and force the OSK shown.
++    (LP: #1542224)
++
++  [ Lukáš Tinkl ]
++  * Disallow resizing windows up, past the Panel (LP: #1544766)
++  * Elide the window title not to let it overflow into the indicators
++    area (LP: #1535767)
++  * Enable the PIN lockscreen to be used with a HW keyboard (LP:
++    #1550359)
++  * Fix tiny windows when switching stages
++  * Provide a range of ports to QML JS Debugger
++  * Watch for launcher item icon changes (LP: #1543290)
++
++  [ Michael Terry ]
++  * Proxy more mouse and touchpad properties to USC (LP: #1540398) (LP:
++    #1543344, #1540398)
++  * Refactor the AccountsService plugin and make it slightly faster.
++  * To let the user log in if a mouse is connected, hide the greeter
++    cover page on a mouse click (but NOT a touch click). (LP: #1540497)
++  * Watch AccountsService for changes to the user's real name.  This was
++    preventing us from noticing when the user set their name in the
++    welcome wizard.
++
++  [ Michael Zanetti ]
++  * Allow alt+tabbing in staged mode too (LP: #1540502)
++  * Allow invoking the staged mode spreads by mouse right edge pushes
++    too (LP: #1540392)
++  * Allow loading the device configuration from an external file
++  * Implement Launcher's keyboard navigation and updated pip design
++  * Make launcher scalable, allow it locking (LP: #1511015)
++  * Properly parent launcher items in all cases (LP: #1495732)
++  * Read inputMethod surface from the new property int QtMir (LP:
++    #1545286)
++  * Some visual updates and rotation lock for the virtual touchpad (LP:
++    #1549087)
++  * Visual updates for the windowed spread (LP: #1488148)
++  * stabilize swipeAwayGreeter()
++
++  [ Michał Sawicz ]
++  * Add udev rules to make sure we have access to uinput
++  * Make dash respawn indefinitely (LP: #1550056)
++  * Use dpkg-architecture, not arch, to disable touch emulation
++
++  [ Vesa Rautiainen ]
++  * Fixing the vertical position of desktop spread item icon.
++
++ -- Michał Sawicz <michal.sawicz@canonical.com>  Thu, 10 Mar 2016 22:44:16 +0000
++
  unity8 (8.11+16.04.20160308-0ubuntu1) xenial; urgency=medium
    [ Albert Astals Cid ]
 === modified file 'debian/control'
 --- debian/control	2016-03-04 21:03:43 +0000
 +++ debian/control	2016-03-11 18:12:46 +0000
@@ -8,13 +8,14 @@
                 doxyqml,
  # To allow cross-compiling to work, we also must append :native
  # to g++ so we don't try to run armhf g++
--# on an x86 CPU for eaxmple, when cross-compiling.
++# on an x86 CPU for example, when cross-compiling.
                 g++:native,
                 libandroid-properties-dev,
                 graphviz,
                 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
--               libconnectivity-qt1-dev,
++               libconnectivity-qt1-dev (>= 0.7.1),
                 libevdev-dev,
++               libgeonames-dev (>= 0.2),
                 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                 libgl1-mesa-dri,
                 libgles2-mesa-dev[armhf],
@@ -55,7 +56,7 @@
                 qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),
                 qtdeclarative5-ubuntu-content1,
                 qtdeclarative5-ubuntu-settings-components (>= 0.7),
--               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
++               qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
                 qtdeclarative5-ubuntu-web-plugin,
                 ttf-ubuntu-font-family,
  Standards-Version: 3.9.4
@@ -70,7 +71,7 @@
  Package: indicators-client
  Architecture: amd64 armhf i386
  Depends: qmenumodel-qml (>= 0.2.9),
--         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
++         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
           unity8 (= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends},
@@ -101,7 +102,6 @@
           qml-module-qt-labs-folderlistmodel,
           qml-module-qtquick-xmllistmodel,
           qml-module-qtsysteminfo,
--         qtdeclarative5-gsettings1.0,
           qtdeclarative5-qtmir-plugin (>= 0.4.5),
           qtdeclarative5-ubuntu-telephony0.1,
           qtdeclarative5-ubuntu-web-plugin,
@@ -128,7 +128,7 @@
  Depends: qml-module-qtquick-layouts,
           qtdeclarative5-ubuntu-settings-components (>= 0.7),
           qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
--         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1796) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1796),
++         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),
           qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
           ubuntu-thumbnailer-impl-0,
           unity-application-impl-13,
@@ -158,7 +158,7 @@
           python3-fixtures,
           python3-gi,
           qttestability-autopilot (>= 1.4),
--         ubuntu-ui-toolkit-autopilot (>= 1.3.1796),
++         ubuntu-ui-toolkit-autopilot (>= 1.3.1845),
           unity-scope-click,
           unity8 (= ${source:Version}),
           unity8-fake-env (= ${source:Version}),
@@ -192,6 +192,8 @@
           libhardware2,
           pay-service,
           unity-schemas (>= 7.3.1+14.10.20140915),
++         qtdeclarative5-gsettings1.0,
++         qml-module-qtmultimedia,
           ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-launcher-impl,
 === added file 'debian/unity8-common.udev'
 --- debian/unity8-common.udev	1970-01-01 00:00:00 +0000
 +++ debian/unity8-common.udev	2016-03-11 18:12:46 +0000
@@ -0,0 +1,2 @@
++# Make local foreground session able to inject input
++KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess"
 === modified file 'debian/unity8-doc.install'
 --- debian/unity8-doc.install	2014-01-30 22:32:37 +0000
 +++ debian/unity8-doc.install	2016-03-11 18:12:46 +0000
@@ -1,1 +1,2 @@
++doc/devices.conf usr/share/doc/unity8/
  usr/share/doc/unity8/*
 === added file 'doc/devices.conf'
 --- doc/devices.conf	1970-01-01 00:00:00 +0000
 +++ doc/devices.conf	2016-03-11 18:12:46 +0000
@@ -0,0 +1,30 @@
++# This file can hold multiple device configs. Devices are separated by sections.
++#
++# SupportedOrientations holds a list of all enabled orientations. A standard
++# phone will usually have Portrait,Landcape,InvertedLandscape in order to
++# disable upside down usage.
++#
++# PrimaryOrientation gives the orientation the device will start up with
++# when there is no orientations sensor input available (yet) or lock to
++# when an application specifies to be locked to PrimaryOrientation.
++#
++# The other Orientation settings can be used to re-map the orientations.
++# A device might be used with different orientations than how the screen
++# is physically mounted on the hardware.
++#
++# Category can be phone, tablet, or desktop. This option determines
++# whether the side stage is shown (tablet) or not (phone). Using
++# desktop will load the shell in windowed mode. Note that the user
++# can override/change this by connecting input hardware or change
++# user settings.
++#
++# Any options not listed will default to the values of the example below.
++
++[devicename]
++SupportedOrientations=Portrait,InvertedPortrait,Landscape,InvertedLandscape
++PrimaryOrientation=PrimaryOrienation
++PortraitOrientation=Portrait
++InvertedPortraitOrientation=InvertedPortrait
++LandscapeOrientation=Landscape
++InvertedLandscapeOrientation=InvertedLandscape
++Category=phone
 === modified file 'plugins/AccountsService/AccountsService.cpp'
 --- plugins/AccountsService/AccountsService.cpp	2016-01-21 21:04:00 +0000
 +++ plugins/AccountsService/AccountsService.cpp	2016-03-11 18:12:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013, 2015 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
   */
  #include "AccountsService.h"
@@ -24,17 +22,55 @@
  #include <QStringList>
  #include <QDebug>
++#define IFACE_ACCOUNTS_USER          QStringLiteral("org.freedesktop.Accounts.User")
++#define IFACE_LOCATION_HERE          QStringLiteral("com.ubuntu.location.providers.here.AccountsService")
++#define IFACE_UBUNTU_INPUT           QStringLiteral("com.ubuntu.AccountsService.Input")
++#define IFACE_UBUNTU_SECURITY        QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy")
++#define IFACE_UBUNTU_SECURITY_OLD    QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy")
++#define IFACE_UNITY                  QStringLiteral("com.canonical.unity.AccountsService")
++#define IFACE_UNITY_PRIVATE          QStringLiteral("com.canonical.unity.AccountsService.Private")
++
++#define PROP_BACKGROUND_FILE                   QStringLiteral("BackgroundFile")
++#define PROP_DEMO_EDGES                        QStringLiteral("demo-edges")
++#define PROP_DEMO_EDGES_COMPLETED              QStringLiteral("DemoEdgesCompleted")
++#define PROP_EMAIL                             QStringLiteral("Email")
++#define PROP_ENABLE_INDICATORS_WHILE_LOCKED    QStringLiteral("EnableIndicatorsWhileLocked")
++#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED      QStringLiteral("EnableLauncherWhileLocked")
++#define PROP_FAILED_LOGINS                     QStringLiteral("FailedLogins")
++#define PROP_LICENSE_ACCEPTED                  QStringLiteral("LicenseAccepted")
++#define PROP_LICENSE_BASE_PATH                 QStringLiteral("LicenseBasePath")
++#define PROP_MOUSE_CURSOR_SPEED                QStringLiteral("MouseCursorSpeed")
++#define PROP_MOUSE_DOUBLE_CLICK_SPEED          QStringLiteral("MouseDoubleClickSpeed")
++#define PROP_MOUSE_PRIMARY_BUTTON              QStringLiteral("MousePrimaryButton")
++#define PROP_MOUSE_SCROLL_SPEED                QStringLiteral("MouseScrollSpeed")
++#define PROP_PASSWORD_DISPLAY_HINT             QStringLiteral("PasswordDisplayHint")
++#define PROP_REAL_NAME                         QStringLiteral("RealName")
++#define PROP_STATS_WELCOME_SCREEN              QStringLiteral("StatsWelcomeScreen")
++#define PROP_TOUCHPAD_CURSOR_SPEED             QStringLiteral("TouchpadCursorSpeed")
++#define PROP_TOUCHPAD_DISABLE_WHILE_TYPING     QStringLiteral("TouchpadDisableWhileTyping")
++#define PROP_TOUCHPAD_DISABLE_WITH_MOUSE       QStringLiteral("TouchpadDisableWithMouse")
++#define PROP_TOUCHPAD_DOUBLE_CLICK_SPEED       QStringLiteral("TouchpadDoubleClickSpeed")
++#define PROP_TOUCHPAD_PRIMARY_BUTTON           QStringLiteral("TouchpadPrimaryButton")
++#define PROP_TOUCHPAD_SCROLL_SPEED             QStringLiteral("TouchpadScrollSpeed")
++#define PROP_TOUCHPAD_TAP_TO_CLICK             QStringLiteral("TouchpadTapToClick")
++#define PROP_TOUCHPAD_TWO_FINGER_SCROLL        QStringLiteral("TouchpadTwoFingerScroll")
++
++
++QVariant primaryButtonConverter(const QVariant &value)
++{
++    QString stringValue = value.toString();
++    if (stringValue == "left") {
++        return QVariant::fromValue(0);
++    } else if (stringValue == "right") {
++        return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same
++    } else {
++        return QVariant::fromValue(0); // default to left
++    }
++}
++
  AccountsService::AccountsService(QObject* parent, const QString &user)
--    : QObject(parent),
--    m_service(new AccountsServiceDBusAdaptor(this)),
--    m_demoEdges(false),
--    m_enableLauncherWhileLocked(false),
--    m_enableIndicatorsWhileLocked(false),
--    m_statsWelcomeScreen(false),
--    m_passwordDisplayHint(Keyboard),
--    m_failedLogins(0),
--    m_hereEnabled(false),
--    m_hereLicensePath() // null means not set yet
++    : QObject(parent)
++    , m_service(new AccountsServiceDBusAdaptor(this))
+ {
      m_unityInput = new QDBusInterface(QStringLiteral("com.canonical.Unity.Input"),
                                        QStringLiteral("/com/canonical/Unity/Input"),
@@ -44,6 +80,46 @@
      connect(m_service, &AccountsServiceDBusAdaptor::propertiesChanged, this, &AccountsService::onPropertiesChanged);
      connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged, this, &AccountsService::onMaybeChanged);
++    registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));
++    registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));
++    registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));
++    registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));
++    registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));
++    registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));
++    registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));
++    registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));
++    registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));
++    registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));
++    registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));
++    registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));
++
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
++                  m_unityInput, QStringLiteral("setMouseCursorSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_DOUBLE_CLICK_SPEED,
++                  m_unityInput, QStringLiteral("setMouseDoubleClickSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_PRIMARY_BUTTON,
++                  m_unityInput, QStringLiteral("setMousePrimaryButton"),
++                  primaryButtonConverter);
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_SCROLL_SPEED,
++                  m_unityInput, QStringLiteral("setMouseScrollSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_CURSOR_SPEED,
++                  m_unityInput, QStringLiteral("setTouchpadCursorSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_SCROLL_SPEED,
++                  m_unityInput, QStringLiteral("setTouchpadScrollSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DISABLE_WHILE_TYPING,
++                  m_unityInput, QStringLiteral("setTouchpadDisableWhileTyping"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DISABLE_WITH_MOUSE,
++                  m_unityInput, QStringLiteral("setTouchpadDisableWithMouse"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DOUBLE_CLICK_SPEED,
++                  m_unityInput, QStringLiteral("setTouchpadDoubleClickSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_PRIMARY_BUTTON,
++                  m_unityInput, QStringLiteral("setTouchpadPrimaryButton"),
++                  primaryButtonConverter);
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_TAP_TO_CLICK,
++                  m_unityInput, QStringLiteral("setTouchpadTapToClick"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_TWO_FINGER_SCROLL,
++                  m_unityInput, QStringLiteral("setTouchpadTwoFingerScroll"));
++
      setUser(!user.isEmpty() ? user : QString::fromUtf8(qgetenv("USER")));
+ }
@@ -57,410 +133,236 @@
      if (user.isEmpty() || m_user == user)
          return;
++    bool wasEmpty = m_user.isEmpty();
++
      m_user = user;
      Q_EMIT userChanged();
--    updateDemoEdges(false);
--    updateEnableLauncherWhileLocked(false);
--    updateEnableIndicatorsWhileLocked(false);
--    updateBackgroundFile(false);
--    updateMouseCursorSpeed();
--    updateTouchpadCursorSpeed();
--    updateStatsWelcomeScreen(false);
--    updatePasswordDisplayHint(false);
--    updateFailedLogins(false);
--    updateHereEnabled(false);
--    updateHereLicensePath(false);
++    // Do the first update synchronously, as a cheap way to block rendering
++    // until we have the right values on bootup.
++    refresh(!wasEmpty);
+ }
  bool AccountsService::demoEdges() const
+ {
--    return m_demoEdges;
++    auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES);
++    return value.toBool();
+ }
  void AccountsService::setDemoEdges(bool demoEdges)
+ {
--    if (m_demoEdges != demoEdges) {
--        m_demoEdges = demoEdges;
--        m_service->setUserPropertyAsync(m_user, QStringLiteral("com.canonical.unity.AccountsService"), QStringLiteral("demo-edges"), demoEdges);
--
--        Q_EMIT demoEdgesChanged();
++    setProperty(IFACE_UNITY, PROP_DEMO_EDGES, demoEdges);
++}
++
++QStringList AccountsService::demoEdgesCompleted() const
++{
++    auto value = getProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED);
++    return value.toStringList();
++}
++
++void AccountsService::markDemoEdgeCompleted(const QString &edge)
++{
++    auto currentList = demoEdgesCompleted();
++    if (!currentList.contains(edge)) {
++        setProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, currentList << edge);
+     }
+ }
  bool AccountsService::enableLauncherWhileLocked() const
+ {
--    return m_enableLauncherWhileLocked;
++    auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);
++    return value.toBool();
+ }
  bool AccountsService::enableIndicatorsWhileLocked() const
+ {
--    return m_enableIndicatorsWhileLocked;
++    auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED);
++    return value.toBool();
+ }
  QString AccountsService::backgroundFile() const
+ {
--    return m_backgroundFile;
++    auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE);
++    return value.toString();
+ }
  bool AccountsService::statsWelcomeScreen() const
+ {
--    return m_statsWelcomeScreen;
++    auto value = getProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN);
++    return value.toBool();
+ }
  AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const
+ {
--    return m_passwordDisplayHint;
++    auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT);
++    return (PasswordDisplayHint)value.toInt();
+ }
  bool AccountsService::hereEnabled() const
+ {
--    return m_hereEnabled;
++    auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED);
++    return value.toBool();
+ }
  void AccountsService::setHereEnabled(bool enabled)
+ {
--    if (m_hereEnabled != enabled) {
--        m_hereEnabled = enabled;
--        m_service->setUserPropertyAsync(m_user, QStringLiteral("com.ubuntu.location.providers.here.AccountsService"), QStringLiteral("LicenseAccepted"), enabled);
--
--        Q_EMIT hereEnabledChanged();
--    }
++    setProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, enabled);
+ }
  QString AccountsService::hereLicensePath() const
+ {
--    return m_hereLicensePath;
++    auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);
++    QString hereLicensePath = value.toString();
++    if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
++        hereLicensePath = QStringLiteral("");
++    return hereLicensePath;
+ }
  bool AccountsService::hereLicensePathValid() const
+ {
--    return !m_hereLicensePath.isNull();
--}
--
--void AccountsService::updateDemoEdges(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.canonical.unity.AccountsService"),
--                                                                    QStringLiteral("demo-edges"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QDBusVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'demo-edges' property - " << reply.error().message();
--            return;
--        }
--
--        auto demoEdges = reply.value().variant().toBool();
--        if (m_demoEdges != demoEdges) {
--            m_demoEdges = demoEdges;
--            Q_EMIT demoEdgesChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
--}
--
--void AccountsService::updateEnableLauncherWhileLocked(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
--                                                                    QStringLiteral("EnableLauncherWhileLocked"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'EnableLauncherWhileLocked' property - " << reply.error().message();
--            return;
--        }
--
--        const bool enableLauncherWhileLocked = reply.value().toBool();
--        if (m_enableLauncherWhileLocked != enableLauncherWhileLocked) {
--            m_enableLauncherWhileLocked = enableLauncherWhileLocked;
--            Q_EMIT enableLauncherWhileLockedChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
--}
--
--void AccountsService::updateEnableIndicatorsWhileLocked(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
--                                                                    QStringLiteral("EnableIndicatorsWhileLocked"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'EnableIndicatorsWhileLocked' property - " << reply.error().message();
--            return;
--        }
--
--        const bool enableIndicatorsWhileLocked = reply.value().toBool();
--        if (m_enableIndicatorsWhileLocked != enableIndicatorsWhileLocked) {
--            m_enableIndicatorsWhileLocked = enableIndicatorsWhileLocked;
--            Q_EMIT enableIndicatorsWhileLockedChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
--}
--
--void AccountsService::updateBackgroundFile(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("org.freedesktop.Accounts.User"),
--                                                                    QStringLiteral("BackgroundFile"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'BackgroundFile' property - " << reply.error().message();
--            return;
--        }
--
--        const QString backgroundFile = reply.value().toString();
--        if (m_backgroundFile != backgroundFile) {
--            m_backgroundFile = backgroundFile;
--            Q_EMIT backgroundFileChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
--}
--
--void AccountsService::updateMouseCursorSpeed()
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.ubuntu.AccountsService.Input"),
--                                                                    QStringLiteral("MouseCursorSpeed"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'MouseCursorSpeed' property - " << reply.error().message();
--            return;
--        }
--
--        // Merely proxy this along to USC.  We don't care about keeping a copy
--        // or exporting it internally.
--        m_unityInput->asyncCall(QStringLiteral("setMouseCursorSpeed"), reply.value());
--    });
--}
--
--void AccountsService::updateTouchpadCursorSpeed()
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.ubuntu.AccountsService.Input"),
--                                                                    QStringLiteral("TouchpadCursorSpeed"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'TouchpadCursorSpeed' property - " << reply.error().message();
--            return;
--        }
--
--        // Merely proxy this along to USC.  We don't care about keeping a copy
--        // or exporting it internally.
--        m_unityInput->asyncCall(QStringLiteral("setTouchpadCursorSpeed"), reply.value());
--    });
--}
--
--void AccountsService::updateStatsWelcomeScreen(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.ubuntu.touch.AccountsService.SecurityPrivacy"),
--                                                                    QStringLiteral("StatsWelcomeScreen"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'StatsWelcomeScreen' property - " << reply.error().message();
--            return;
--        }
--
--        const bool statsWelcomeScreen = reply.value().toBool();
--        if (m_statsWelcomeScreen != statsWelcomeScreen) {
--            m_statsWelcomeScreen = statsWelcomeScreen;
--            Q_EMIT statsWelcomeScreenChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
--}
--
--void AccountsService::updatePasswordDisplayHint(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.ubuntu.AccountsService.SecurityPrivacy"),
--                                                                    QStringLiteral("PasswordDisplayHint"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'PasswordDisplayHint' property - " << reply.error().message();
--            return;
--        }
--
--        const PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)reply.value().toInt();
--        if (m_passwordDisplayHint != passwordDisplayHint) {
--            m_passwordDisplayHint = passwordDisplayHint;
--            Q_EMIT passwordDisplayHintChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
--}
--
--void AccountsService::updateFailedLogins(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.canonical.unity.AccountsService.Private"),
--                                                                    QStringLiteral("FailedLogins"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'FailedLogins' property - " << reply.error().message();
--            return;
--        }
--
--        const uint failedLogins = reply.value().toUInt();
--        if (m_failedLogins != failedLogins) {
--            m_failedLogins = failedLogins;
--            Q_EMIT failedLoginsChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
--}
--
--void AccountsService::updateHereEnabled(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.ubuntu.location.providers.here.AccountsService"),
--                                                                    QStringLiteral("LicenseAccepted"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'LicenseAccepted' property - " << reply.error().message();
--            return;
--        }
--
--        const bool hereEnabled = reply.value().toBool();
--        if (m_hereEnabled != hereEnabled) {
--            m_hereEnabled = hereEnabled;
--            Q_EMIT hereEnabledChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
--}
--
--void AccountsService::updateHereLicensePath(bool async)
--{
--    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
--                                                                    QStringLiteral("com.ubuntu.location.providers.here.AccountsService"),
--                                                                    QStringLiteral("LicenseBasePath"));
--    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
--
--    connect(watcher, &QDBusPendingCallWatcher::finished,
--            this, [this](QDBusPendingCallWatcher* watcher) {
--
--        QDBusPendingReply<QVariant> reply = *watcher;
--        watcher->deleteLater();
--        if (reply.isError()) {
--            qWarning() << "Failed to get 'LicenseBasePath' property - " << reply.error().message();
--            return;
--        }
--
--        QString hereLicensePath = reply.value().toString();
--        if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
--            hereLicensePath = QLatin1String("");
--
--        if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
--            m_hereLicensePath = hereLicensePath;
--            Q_EMIT hereLicensePathChanged();
--        }
--    });
--    if (!async) {
--        watcher->waitForFinished();
--        delete watcher;
--    }
++    auto value = getProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH);
++    return !value.toString().isNull();
++}
++
++QString AccountsService::realName() const
++{
++    auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME);
++    return value.toString();
++}
++
++void AccountsService::setRealName(const QString &realName)
++{
++    setProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, realName);
++}
++
++QString AccountsService::email() const
++{
++    auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL);
++    return value.toString();
++}
++
++void AccountsService::setEmail(const QString &email)
++{
++    setProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, email);
+ }
  uint AccountsService::failedLogins() const
+ {
--    return m_failedLogins;
++    return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();
+ }
  void AccountsService::setFailedLogins(uint failedLogins)
+ {
--    if (m_failedLogins != failedLogins) {
--        m_failedLogins = failedLogins;
--        m_service->setUserPropertyAsync(m_user, QStringLiteral("com.canonical.unity.AccountsService.Private"), QStringLiteral("FailedLogins"), failedLogins);
--
--        Q_EMIT failedLoginsChanged();
--    }
++    setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, failedLogins);
++}
++
++// ====================================================
++// Everything below this line is generic helper methods
++// ====================================================
++
++void AccountsService::emitChangedForProperty(const QString &interface, const QString &property)
++{
++    QString signalName = m_properties[interface][property].signal;
++    QMetaObject::invokeMethod(this, signalName.toUtf8().data());
++}
++
++QVariant AccountsService::getProperty(const QString &interface, const QString &property) const
++{
++    return m_properties[interface][property].value;
++}
++
++void AccountsService::setProperty(const QString &interface, const QString &property, const QVariant &value)
++{
++    if (m_properties[interface][property].value != value) {
++        m_properties[interface][property].value = value;
++        m_service->setUserPropertyAsync(m_user, interface, property, value);
++        emitChangedForProperty(interface, property);
++    }
++}
++
++void AccountsService::updateCache(const QString &interface, const QString &property, const QVariant &value)
++{
++    PropertyInfo &info = m_properties[interface][property];
++
++    if (info.proxyInterface) {
++        QVariant finalValue;
++        if (info.proxyConverter) {
++            finalValue = info.proxyConverter(value);
++        } else {
++            finalValue = value;
++        }
++        info.proxyInterface->asyncCall(info.proxyMethod, finalValue);
++        return; // don't bother saving a copy
++    }
++
++    if (info.value != value) {
++        info.value = value;
++        emitChangedForProperty(interface, property);
++    }
++}
++
++void AccountsService::updateProperty(const QString &interface, const QString &property)
++{
++    QDBusPendingCall pendingReply = m_service->getUserPropertyAsync(m_user,
++                                                                    interface,
++                                                                    property);
++    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
++
++    connect(watcher, &QDBusPendingCallWatcher::finished,
++            this, [this, interface, property](QDBusPendingCallWatcher* watcher) {
++
++        QDBusPendingReply<QVariant> reply = *watcher;
++        watcher->deleteLater();
++        if (reply.isError()) {
++            qWarning() << "Failed to get '" << property << "' property:" << reply.error().message();
++            return;
++        }
++
++        updateCache(interface, property, reply.value());
++    });
++}
++
++void AccountsService::updateAllProperties(const QString &interface, bool async)
++{
++    QDBusPendingCall pendingReply = m_service->getAllPropertiesAsync(m_user,
++                                                                     interface);
++    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingReply, this);
++
++    connect(watcher, &QDBusPendingCallWatcher::finished,
++            this, [this, interface](QDBusPendingCallWatcher* watcher) {
++
++        QDBusPendingReply< QHash<QString, QVariant> > reply = *watcher;
++        watcher->deleteLater();
++        if (reply.isError()) {
++            qWarning() << "Failed to get all properties for" << interface << ":" << reply.error().message();
++            return;
++        }
++
++        auto valueHash = reply.value();
++        auto i = valueHash.constBegin();
++        while (i != valueHash.constEnd()) {
++            updateCache(interface, i.key(), i.value());
++            ++i;
++        }
++    });
++    if (!async) {
++        watcher->waitForFinished();
++    }
++}
++
++void AccountsService::registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter)
++{
++    registerProperty(interface, property, nullptr);
++
++    m_properties[interface][property].proxyInterface = iface;
++    m_properties[interface][property].proxyMethod = method;
++    m_properties[interface][property].proxyConverter = converter;
++}
++
++void AccountsService::registerProperty(const QString &interface, const QString &property, const QString &signal)
++{
++    m_properties[interface][property] = PropertyInfo();
++    m_properties[interface][property].signal = signal;
+ }
  void AccountsService::onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
@@ -469,42 +371,13 @@
          return;
+     }
--    if (interface == QLatin1String("com.canonical.unity.AccountsService")) {
--        if (changed.contains(QStringLiteral("demo-edges"))) {
--            updateDemoEdges();
--        }
--    } else if (interface == QLatin1String("com.canonical.unity.AccountsService.Private")) {
--        if (changed.contains(QStringLiteral("FailedLogins"))) {
--            updateFailedLogins();
--        }
--    } else if (interface == QLatin1String("com.ubuntu.AccountsService.Input")) {
--        if (changed.contains(QStringLiteral("MouseCursorSpeed"))) {
--            updateMouseCursorSpeed();
--        }
--        if (changed.contains(QStringLiteral("TouchpadCursorSpeed"))) {
--            updateTouchpadCursorSpeed();
--        }
--    } else if (interface == QLatin1String("com.ubuntu.touch.AccountsService.SecurityPrivacy")) {
--        if (changed.contains(QStringLiteral("StatsWelcomeScreen"))) {
--            updateStatsWelcomeScreen();
--        }
--    } else if (interface == QLatin1String("com.ubuntu.AccountsService.SecurityPrivacy")) {
--        if (changed.contains(QStringLiteral("PasswordDisplayHint"))) {
--            updatePasswordDisplayHint();
--        }
--        if (changed.contains(QStringLiteral("EnableLauncherWhileLocked"))) {
--            updateEnableLauncherWhileLocked();
--        }
--        if (changed.contains(QStringLiteral("EnableIndicatorsWhileLocked"))) {
--            updateEnableIndicatorsWhileLocked();
--        }
--    } else if (interface == QLatin1String("com.ubuntu.location.providers.here.AccountsService")) {
--        if (changed.contains(QStringLiteral("LicenseAccepted"))) {
--            updateHereEnabled();
--        }
--        if (changed.contains(QStringLiteral("LicenseBasePath"))) {
--            updateHereLicensePath();
--        }
++    auto propHash = m_properties.value(interface);
++    auto i = propHash.constBegin();
++    while (i != propHash.constEnd()) {
++        if (changed.contains(i.key())) {
++            updateProperty(interface, i.key());
++        }
++        ++i;
+     }
+ }
@@ -514,6 +387,20 @@
          return;
+     }
--    // Standard properties might have changed
--    updateBackgroundFile();
++    // Any of the standard properties might have changed!
++    auto propHash = m_properties.value(IFACE_ACCOUNTS_USER);
++    auto i = propHash.constBegin();
++    while (i != propHash.constEnd()) {
++        updateProperty(IFACE_ACCOUNTS_USER, i.key());
++        ++i;
++    }
++}
++
++void AccountsService::refresh(bool async)
++{
++    auto i = m_properties.constBegin();
++    while (i != m_properties.constEnd()) {
++        updateAllProperties(i.key(), async);
++        ++i;
++    }
+ }
 === modified file 'plugins/AccountsService/AccountsService.h'
 --- plugins/AccountsService/AccountsService.h	2016-01-21 21:04:00 +0000
 +++ plugins/AccountsService/AccountsService.h	2016-03-11 18:12:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013, 2015 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -12,15 +12,16 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors: Michael Terry <michael.terry@canonical.com>
   */
  #ifndef UNITY_ACCOUNTSSERVICE_H
  #define UNITY_ACCOUNTSSERVICE_H
++#include <QHash>
  #include <QObject>
  #include <QString>
++#include <QStringList>
++#include <QVariant>
  class AccountsServiceDBusAdaptor;
  class QDBusInterface;
@@ -37,6 +38,9 @@
                  READ demoEdges
                  WRITE setDemoEdges
                  NOTIFY demoEdgesChanged)
++    Q_PROPERTY (QStringList demoEdgesCompleted
++                READ demoEdgesCompleted
++                NOTIFY demoEdgesCompletedChanged)
      Q_PROPERTY (bool enableLauncherWhileLocked
                  READ enableLauncherWhileLocked
                  NOTIFY enableLauncherWhileLockedChanged)
@@ -66,6 +70,8 @@
      Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
                 READ hereLicensePathValid
                 NOTIFY hereLicensePathChanged)
++    Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)
++    Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)
  public:
      enum PasswordDisplayHint {
@@ -80,6 +86,8 @@
      void setUser(const QString &user);
      bool demoEdges() const;
      void setDemoEdges(bool demoEdges);
++    QStringList demoEdgesCompleted() const;
++    Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);
      bool enableLauncherWhileLocked() const;
      bool enableIndicatorsWhileLocked() const;
      QString backgroundFile() const;
@@ -91,10 +99,15 @@
      void setHereEnabled(bool enabled);
      QString hereLicensePath() const;
      bool hereLicensePathValid() const;
++    QString realName() const;
++    void setRealName(const QString &realName);
++    QString email() const;
++    void setEmail(const QString &email);
  Q_SIGNALS:
      void userChanged();
      void demoEdgesChanged();
++    void demoEdgesCompletedChanged();
      void enableLauncherWhileLockedChanged();
      void enableIndicatorsWhileLockedChanged();
      void backgroundFileChanged();
@@ -103,36 +116,41 @@
      void failedLoginsChanged();
      void hereEnabledChanged();
      void hereLicensePathChanged();
++    void realNameChanged();
++    void emailChanged();
  private Q_SLOTS:
      void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
      void onMaybeChanged(const QString &user);
  private:
--    void updateDemoEdges(bool async = true);
--    void updateEnableLauncherWhileLocked(bool async = true);
--    void updateEnableIndicatorsWhileLocked(bool async = true);
--    void updateBackgroundFile(bool async = true);
--    void updateMouseCursorSpeed();
--    void updateTouchpadCursorSpeed();
--    void updateStatsWelcomeScreen(bool async = true);
--    void updatePasswordDisplayHint(bool async = true);
--    void updateFailedLogins(bool async = true);
--    void updateHereEnabled(bool async = true);
--    void updateHereLicensePath(bool async = true);
--
++    typedef QVariant (*ProxyConverter)(const QVariant &);
++
++    void refresh(bool async);
++    void registerProperty(const QString &interface, const QString &property, const QString &signal);
++    void registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter = nullptr);
++
++    void updateAllProperties(const QString &interface, bool async);
++    void updateProperty(const QString &interface, const QString &property);
++    void updateCache(const QString &interface, const QString &property, const QVariant &value);
++
++    void setProperty(const QString &interface, const QString &property, const QVariant &value);
++    QVariant getProperty(const QString &interface, const QString &property) const;
++
++    void emitChangedForProperty(const QString &interface, const QString &property);
++
++    struct PropertyInfo {
++        QVariant value{};
++        QString signal{};
++        QDBusInterface *proxyInterface{};
++        QString proxyMethod{};
++        ProxyConverter proxyConverter{};
++    };
++    typedef QHash< QString, QHash<QString, PropertyInfo> > PropertyHash;
++    PropertyHash m_properties;
      AccountsServiceDBusAdaptor *m_service;
      QDBusInterface *m_unityInput;
      QString m_user;
--    bool m_demoEdges;
--    bool m_enableLauncherWhileLocked;
--    bool m_enableIndicatorsWhileLocked;
--    QString m_backgroundFile;
--    bool m_statsWelcomeScreen;
--    PasswordDisplayHint m_passwordDisplayHint;
--    uint m_failedLogins;
--    bool m_hereEnabled;
--    QString m_hereLicensePath;
  };
  #endif
 === modified file 'plugins/AccountsService/AccountsService.qmltypes'
 --- plugins/AccountsService/AccountsService.qmltypes	2015-02-13 09:01:16 +0000
 +++ plugins/AccountsService/AccountsService.qmltypes	2016-03-11 18:12:46 +0000
@@ -23,6 +23,7 @@
+         }
          Property { name: "user"; type: "string" }
          Property { name: "demoEdges"; type: "bool" }
++        Property { name: "demoEdgesCompleted"; type: "QStringList"; isReadonly: true }
          Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }
          Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }
          Property { name: "backgroundFile"; type: "string"; isReadonly: true }
@@ -32,5 +33,9 @@
          Property { name: "hereEnabled"; type: "bool" }
          Property { name: "hereLicensePath"; type: "string"; isReadonly: true }
          Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }
++        Method {
++            name: "markDemoEdgeCompleted"
++            Parameter { name: "edge"; type: "string" }
++        }
+     }
+ }
 === modified file 'plugins/AccountsService/AccountsServiceDBusAdaptor.cpp'
 --- plugins/AccountsService/AccountsServiceDBusAdaptor.cpp	2015-10-26 14:05:14 +0000
 +++ plugins/AccountsService/AccountsServiceDBusAdaptor.cpp	2016-03-11 18:12:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Author: Michael Terry <michael.terry@canonical.com>
   */
  #include "AccountsServiceDBusAdaptor.h"
@@ -37,6 +35,15 @@
                                             connection, this);
+ }
++QDBusPendingReply<QVariantMap> AccountsServiceDBusAdaptor::getAllPropertiesAsync(const QString &user, const QString &interface)
++{
++    QDBusInterface *iface = getUserInterface(user);
++    if (iface != nullptr && iface->isValid()) {
++        return iface->asyncCall(QStringLiteral("GetAll"), interface);
++    }
++    return QDBusPendingReply<QVariantMap>(QDBusMessage::createError(QDBusError::Other, QStringLiteral("Invalid Interface")));
++}
++
  QDBusPendingReply<QVariant> AccountsServiceDBusAdaptor::getUserPropertyAsync(const QString &user, const QString &interface, const QString &property)
+ {
      QDBusInterface *iface = getUserInterface(user);
@@ -80,7 +87,7 @@
      m_ignoreNextChanged = false;
+ }
--QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)
++QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path) const
+ {
      QMap<QString, QDBusInterface *>::const_iterator i;
      for (i = m_users.constBegin(); i != m_users.constEnd(); ++i) {
 === modified file 'plugins/AccountsService/AccountsServiceDBusAdaptor.h'
 --- plugins/AccountsService/AccountsServiceDBusAdaptor.h	2015-10-26 14:05:14 +0000
 +++ plugins/AccountsService/AccountsServiceDBusAdaptor.h	2016-03-11 18:12:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2013 Canonical, Ltd.
++ * Copyright (C) 2013-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,6 @@
+  *
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors: Michael Terry <michael.terry@canonical.com>
   */
  #ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
@@ -35,8 +33,9 @@
      explicit AccountsServiceDBusAdaptor(QObject *parent = 0);
      ~AccountsServiceDBusAdaptor() = default;
--    Q_INVOKABLE QDBusPendingReply<QVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);
--    Q_INVOKABLE QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);
++    QDBusPendingReply<QVariantMap> getAllPropertiesAsync(const QString &user, const QString &interface);
++    QDBusPendingReply<QVariant> getUserPropertyAsync(const QString &user, const QString &interface, const QString &property);
++    QDBusPendingCall setUserPropertyAsync(const QString &user, const QString &interface, const QString &property, const QVariant &value);
  Q_SIGNALS:
      void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -48,7 +47,7 @@
  private:
      QDBusInterface *getUserInterface(const QString &user);
--    QString getUserForPath(const QString &path);
++    QString getUserForPath(const QString &path) const;
      QDBusInterface *m_accountsManager;
      QMap<QString, QDBusInterface *> m_users;
 === modified file 'plugins/AccountsService/com.canonical.unity.AccountsService.xml'
 --- plugins/AccountsService/com.canonical.unity.AccountsService.xml	2015-02-04 15:12:36 +0000
 +++ plugins/AccountsService/com.canonical.unity.AccountsService.xml	2016-03-11 18:12:46 +0000
@@ -14,6 +14,11 @@
        <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
      </property>
++    <!-- List of tutorial pages that have been completed by the user -->
++    <property name="DemoEdgesCompleted" type="as" access="readwrite">
++      <annotation name="org.freedesktop.Accounts.DefaultValue" value="[]"/>
++    </property>
++
      <property name="LauncherItems" type="aa{sv}" access="readwrite">
        <annotation name="org.freedesktop.Accounts.DefaultValue" value="[{'defaults': <true>}]"/>
      </property>
 === modified file 'plugins/Dash/AudioProgressBar.qml'
 --- plugins/Dash/AudioProgressBar.qml	2015-12-03 14:44:08 +0000
 +++ plugins/Dash/AudioProgressBar.qml	2016-03-11 18:12:46 +0000
@@ -31,6 +31,7 @@
          anchors { left: parent.left; right: parent.right }
          height: units.dp(6)
          source: "graphics/music_progress_bg.png"
++        asynchronous: true
          sourceSize.width: width
          sourceSize.height: height
+     }
 === modified file 'plugins/Dash/CardCreator.js'
 --- plugins/Dash/CardCreator.js	2016-02-12 00:11:52 +0000
 +++ plugins/Dash/CardCreator.js	2016-03-11 18:12:46 +0000
@@ -18,12 +18,13 @@
  // %1 is the template["card-background"]["elements"][0]
  // %2 is the template["card-background"]["elements"][1]
--// %3 is the template["card-background"] string
++// %3 is whether the loader should be asynchronous or not
++// %4 is the template["card-background"] string
  var kBackgroundLoaderCode = 'Loader {\n\
                                  id: backgroundLoader; \n\
                                  objectName: "backgroundLoader"; \n\
                                  anchors.fill: parent; \n\
--                                asynchronous: root.asynchronous; \n\
++                                asynchronous: %3; \n\
                                  visible: status == Loader.Ready; \n\
                                  sourceComponent: UbuntuShape { \n\
                                      objectName: "background"; \n\
@@ -46,7 +47,7 @@
                                          objectName: "backgroundImage"; \n\
                                          source: { \n\
                                              if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\
--                                            else return %3; \n\
++                                            else return %4; \n\
                                          } \n\
                                      } \n\
                                      function getColor(index) { \n\
@@ -63,8 +64,9 @@
  // %3 is used as image height
  // %4 is used for artShapeSource.hideSource and inner Loader visible
  // %5 is used as aspect ratio fallback
--// %6 is injected as code to artImage
--// %7 is used as image fallback
++// %6 is whether the loader should be asynchronous or not
++// %7 is injected as code to artImage
++// %8 is used as image fallback
  var kArtShapeHolderCode = 'Item { \n\
                              id: artShapeHolder; \n\
                              height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\
@@ -73,9 +75,9 @@
                              Loader { \n\
                                  id: artShapeLoader; \n\
                                  objectName: "artShapeLoader"; \n\
--                                readonly property string cardArt: cardData && cardData["art"] || %7; \n\
++                                readonly property string cardArt: cardData && cardData["art"] || %8; \n\
                                  active: cardArt != ""; \n\
--                                asynchronous: root.asynchronous; \n\
++                                asynchronous: %6; \n\
                                  visible: status == Loader.Ready; \n\
                                  sourceComponent: Item { \n\
                                      id: artShape; \n\
@@ -132,10 +134,10 @@
                                          id: artImage; \n\
                                          objectName: "artImage"; \n\
                                          source: artShapeLoader.cardArt; \n\
--                                        asynchronous: root.asynchronous; \n\
++                                        asynchronous: %6; \n\
                                          width: %2; \n\
                                          height: %3; \n\
--                                        %6 \n\
++                                        %7 \n\
                                      } \n\
                                  } \n\
                              } \n\
@@ -144,6 +146,7 @@
  // %1 is anchors.fill
  // %2 is width
  // %3 is height
++// %4 is whether the icon should be asynchronous or not
  var kAudioButtonCode = 'AbstractButton { \n\
                              id: audioButton; \n\
                              anchors.fill: %1; \n\
@@ -169,6 +172,7 @@
                                  opacity: 0.9; \n\
                                  name: DashAudioPlayer.playing && AudioUrlComparer.compare(parent.source, DashAudioPlayer.currentSource) ? "media-playback-pause" : "media-playback-start"; \n\
                                  color: "white"; \n\
++                                asynchronous: %4; \n\
                              } \n\
                              onClicked: { \n\
                                  if (AudioUrlComparer.compare(source, DashAudioPlayer.currentSource)) { \n\
@@ -187,12 +191,14 @@
                              } \n\
                          }';
++// %1 is whether the loader should be asynchronous or not
++// %2 is the header height code
  var kOverlayLoaderCode = 'Loader { \n\
                              id: overlayLoader; \n\
--                            readonly property real overlayHeight: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
++                            readonly property real overlayHeight: %2 + units.gu(2); \n\
                              anchors.fill: artShapeHolder; \n\
                              active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
--                            asynchronous: root.asynchronous; \n\
++                            asynchronous: %1; \n\
                              visible: showHeader && status == Loader.Ready; \n\
                              sourceComponent: UbuntuShapeOverlay { \n\
                                  id: overlay; \n\
@@ -211,17 +217,19 @@
                          objectName: "outerRow"; \n\
                          property real margins: units.gu(1); \n\
                          spacing: margins; \n\
--                        height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
++                        %2\
                          anchors { %1 } \n\
                          anchors.right: parent.right; \n\
                          anchors.margins: margins; \n\
                          anchors.rightMargin: 0; \n\
                          data: [ \n\
--                                %2 \n\
++                                %3 \n\
                                  ] \n\
                      }\n';
      var args = Array.prototype.slice.call(arguments);
--    var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(args.join(',\n'));
++    var isCardTool = args.shift();
++    var heightCode = isCardTool ? "" : "height: root.fixedHeaderHeight; \n";
++    var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(heightCode).arg(args.join(',\n'));
      return code;
+ }
@@ -242,10 +250,11 @@
+ }
  // %1 is used as anchors of mascotShapeLoader
++// %2 is whether the loader should be asynchronous or not
  var kMascotShapeLoaderCode = 'Loader { \n\
                                  id: mascotShapeLoader; \n\
                                  objectName: "mascotShapeLoader"; \n\
--                                asynchronous: root.asynchronous; \n\
++                                asynchronous: %2; \n\
                                  active: mascotImage.status === Image.Ready; \n\
                                  visible: showHeader && active && status == Loader.Ready; \n\
                                  width: units.gu(6); \n\
@@ -275,6 +284,7 @@
  // %2 is used as color of titleLabel
  // %3 is used as extra condition for visible of titleLabel
  // %4 is used as title width
++// %5 is used as horizontal alignment
  var kTitleLabelCode = 'Label { \n\
                          id: titleLabel; \n\
                          objectName: "titleLabel"; \n\
@@ -289,7 +299,7 @@
                          width: %4; \n\
                          text: root.title; \n\
                          font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; \n\
--                        horizontalAlignment: root.titleAlignment; \n\
++                        horizontalAlignment: %5; \n\
                      }\n';
  // %1 is used as extra anchors of emblemIcon
@@ -398,7 +408,7 @@
      return colorString;
+ }
--function cardString(template, components) {
++function cardString(template, components, isCardTool) {
      var code;
      var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";
@@ -410,16 +420,16 @@
                  property string backgroundShapeStyle: "inset"; \n\
                  property real fontScale: 1.0; \n\
                  property var scopeStyle: null; \n\
--                property int titleAlignment: Text.AlignLeft; \n\
--                property int fixedHeaderHeight: -1; \n\
++                %2\
                  property size fixedArtShapeSize: Qt.size(-1, -1); \n\
                  readonly property string title: cardData && cardData["title"] || ""; \n\
--                property bool asynchronous: true; \n\
                  property bool showHeader: true; \n\
                  implicitWidth: childrenRect.width; \n\
                  enabled: %1; \n\
                  \n'.arg(templateInteractive);
++    code = code.arg(isCardTool ? "" : "property int fixedHeaderHeight: -1; \n");
++
      var hasArt = components["art"] && components["art"]["field"] || false;
      var hasSummary = components["summary"] || false;
      var isConciergeMode = components["art"] && components["art"]["conciergeMode"] || false;
@@ -435,6 +445,7 @@
      var hasHeaderRow = hasMascot && hasTitle;
      var hasAttributes = hasTitle && components["attributes"] && components["attributes"]["field"] || false;
      var isAudio = template["quick-preview-type"] === "audio";
++    var asynchronous = isCardTool ? "false" : "true";
      if (isAudio) {
          // For now we only support audio cards with [optional] art, title, subtitle
@@ -468,7 +479,7 @@
                  backgroundElements1 = '"%1"'.arg(element1);
+             }
+         }
--        code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(templateCardBackground);
++        code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(asynchronous).arg(templateCardBackground);
+     }
      if (hasArt) {
@@ -497,23 +508,31 @@
          if (isNaN(aspectRatio)) {
              aspectRatio = 1;
+         }
--        var fallback = components["art"] && components["art"]["fallback"] || "";
++        var fallback = !isCardTool && components["art"] && components["art"]["fallback"] || "";
          fallback = encodeURI(fallback);
          var fallbackStatusCode = "";
          var fallbackURICode = '""';
          if (fallback !== "") {
              // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode
--            // which in kArtShapeHolderCode is %7
--            fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %7;';
++            // which in kArtShapeHolderCode is %8
++            fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';
              fallbackURICode = 'decodeURI("%1")'.arg(fallback);
+         }
--        code += kArtShapeHolderCode.arg(artAnchors).arg(widthCode).arg(heightCode).arg(isConciergeMode ? "false" : "true").arg(aspectRatio).arg(fallbackStatusCode).arg(fallbackURICode);
++        code += kArtShapeHolderCode.arg(artAnchors)
++                                   .arg(widthCode)
++                                   .arg(heightCode)
++                                   .arg(isConciergeMode ? "false" : "true")
++                                   .arg(aspectRatio)
++                                   .arg(asynchronous)
++                                   .arg(fallbackStatusCode)
++                                   .arg(fallbackURICode);
      } else {
          code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
+     }
      if (headerAsOverlay) {
--        code += kOverlayLoaderCode;
++        var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";
++        code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);
+     }
      var headerVerticalAnchors;
@@ -595,11 +614,11 @@
+         }
          if (useMascotShape) {
--            mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
++            mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors).arg(asynchronous);
+         }
          var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
--        var fallback = components["mascot"] && components["mascot"]["fallback"] || "";
++        var fallback = !isCardTool && components["mascot"] && components["mascot"]["fallback"] || "";
          fallback = encodeURI(fallback);
          var fallbackStatusCode = "";
          var fallbackURICode = '""';
@@ -715,9 +734,24 @@
+             }
+         }
++        var titleAlignment = "Text.AlignHCenter";
++        if (template["card-layout"] === "horizontal"
++            || typeof components["title"] !== "object"
++            || components["title"]["align"] === "left") titleAlignment = "Text.AlignLeft";
++        var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
++        for (var key in keys) {
++            key = keys[key];
++            try {
++                if (typeof components[key] === "string"
++                    || typeof components[key]["field"] === "string") titleAlignment = "Text.AlignLeft";
++            } catch (e) {
++                continue;
++            }
++        }
++
          // code for different elements
          var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
--        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth);
++        var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra).arg(titleWidth).arg(titleAlignment);
          var subtitleCode;
          var attributesCode;
@@ -759,7 +793,7 @@
          if (mascotShapeCode != '') {
             rowCode.unshift(mascotShapeCode);
+         }
--        code += kHeaderRowCodeGenerator(headerVerticalAnchors + headerLeftAnchor, rowCode)
++        code += kHeaderRowCodeGenerator(isCardTool, headerVerticalAnchors + headerLeftAnchor, rowCode)
      } else {
          code += mascotShapeCode + mascotCode + titleSubtitleCode;
+     }
@@ -783,9 +817,10 @@
          } else {
              audioButtonAnchorsFill = 'undefined';
              audioButtonWidth = 'height';
--            audioButtonHeight = '(root.fixedHeaderHeight > 0 ? root.fixedHeaderHeight : headerHeight) + 2 * units.gu(1)';
++            audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
++                                           : 'root.fixedHeaderHeight + 2 * units.gu(1)';
+         }
--        code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight);
++        code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight).arg(asynchronous);
+     }
      if (hasSummary) {
@@ -854,13 +889,13 @@
      return code;
+ }
--function createCardComponent(parent, template, components, identifier) {
++function createCardComponent(parent, template, components, isCardTool, identifier) {
      var imports = 'import QtQuick 2.4; \n\
                     import Ubuntu.Components 1.3; \n\
                     import Ubuntu.Settings.Components 0.1; \n\
                     import Dash 0.1;\n\
                     import Utils 0.1;\n';
--    var card = cardString(template, components);
++    var card = cardString(template, components, isCardTool);
      var code = imports + 'Component {\n' + card + '}\n';
      try {
 === modified file 'plugins/Dash/CardCreatorCache.qml'
 --- plugins/Dash/CardCreatorCache.qml	2016-01-21 17:56:08 +0000
 +++ plugins/Dash/CardCreatorCache.qml	2016-03-11 18:12:46 +0000
@@ -23,16 +23,16 @@
      property var cache: new Object();
--    function getCardComponent(template, components) {
++    function getCardComponent(template, components, isCardTool) {
          if (template === undefined || components === undefined)
              return undefined;
          var tString = JSON.stringify(template);
          var cString = JSON.stringify(components);
--        var allString = tString + cString;
++        var allString = tString + cString + isCardTool;
          var component = cache[allString];
          if (component === undefined) {
--            component = CardCreator.createCardComponent(root, template, components, allString);
++            component = CardCreator.createCardComponent(root, template, components, isCardTool, allString);
              cache[allString] = component;
+         }
          return component;
 === modified file 'plugins/Dash/plugin.cpp'
 --- plugins/Dash/plugin.cpp	2015-09-18 07:44:50 +0000
 +++ plugins/Dash/plugin.cpp	2016-03-11 18:12:46 +0000
@@ -28,12 +28,12 @@
  static QUrl oauthCleanedUrl(QUrl u)
+ {
      QUrlQuery q(u);
--    q.removeQueryItem("oauth_nonce");
--    q.removeQueryItem("oauth_timestamp");
--    q.removeQueryItem("oauth_consumer_key");
--    q.removeQueryItem("oauth_signature_method");
--    q.removeQueryItem("oauth_version");
--    q.removeQueryItem("oauth_signature");
++    q.removeQueryItem(QStringLiteral("oauth_nonce"));
++    q.removeQueryItem(QStringLiteral("oauth_timestamp"));
++    q.removeQueryItem(QStringLiteral("oauth_consumer_key"));
++    q.removeQueryItem(QStringLiteral("oauth_signature_method"));
++    q.removeQueryItem(QStringLiteral("oauth_version"));
++    q.removeQueryItem(QStringLiteral("oauth_signature"));
      u.setQuery(q);
      return u;
+ }
 === modified file 'plugins/GlobalShortcut/globalshortcutregistry.cpp'
 --- plugins/GlobalShortcut/globalshortcutregistry.cpp	2015-11-20 15:01:39 +0000
 +++ plugins/GlobalShortcut/globalshortcutregistry.cpp	2016-03-11 18:12:46 +0000
@@ -35,13 +35,13 @@
  bool GlobalShortcutRegistry::hasShortcut(const QVariant &seq) const
+ {
--    return m_shortcuts.keys().contains(seq);
++    return m_shortcuts.contains(seq);
+ }
  void GlobalShortcutRegistry::addShortcut(const QVariant &seq, GlobalShortcut *sc)
+ {
      if (sc) {
--        if (!m_shortcuts.keys().contains(seq)) { // create a new entry
++        if (!m_shortcuts.contains(seq)) { // create a new entry
              m_shortcuts.insert(seq, {sc});
          } else { // append to an existing one
              auto shortcuts = m_shortcuts[seq];
@@ -75,8 +75,8 @@
      if (event->type() == QEvent::KeyPress) {
          QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
--        QKeySequence seq = QKeySequence(keyEvent->key() + keyEvent->modifiers());
--        if (m_shortcuts.keys().contains(seq)) {
++        int seq = keyEvent->key() + keyEvent->modifiers();
++        if (m_shortcuts.contains(seq)) {
              const auto shortcuts = m_shortcuts.value(seq);
              Q_FOREACH(const auto &shortcut, shortcuts) {
                  if (shortcut) {
 === modified file 'plugins/IntegratedLightDM/liblightdm/CMakeLists.txt'
 --- plugins/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-02-01 15:15:09 +0000
 +++ plugins/IntegratedLightDM/liblightdm/CMakeLists.txt	2016-03-11 18:12:46 +0000
@@ -5,13 +5,16 @@
      UsersModel.cpp
      GreeterPrivate.cpp
      UsersModelPrivate.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp
+     )
  add_library(integratedLightDM STATIC ${LibLightDM_SOURCES})
++add_library(integratedLightDMSession STATIC ${LibLightDM_SOURCES})
  add_library(MockLightDM-demo-shared SHARED ${LibLightDM_SOURCES})
  include_directories(
++    ${CMAKE_SOURCE_DIR}/plugins/AccountsService
      ${CMAKE_CURRENT_BINARY_DIR}
      ${GLIB_INCLUDE_DIRS}
      ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
@@ -22,17 +25,27 @@
      ${LIBUSERMETRICSOUTPUT_LDFLAGS}
      -lpam
+ )
++target_link_libraries(integratedLightDMSession
++    ${GLIB_LIBRARIES}
++    ${LIBUSERMETRICSOUTPUT_LDFLAGS}
++    -lpam
++)
  target_link_libraries(MockLightDM-demo-shared
      ${GLIB_LIBRARIES}
      ${LIBUSERMETRICSOUTPUT_LDFLAGS}
      -lpam
+ )
--qt5_use_modules(integratedLightDM Concurrent Gui)
--qt5_use_modules(MockLightDM-demo-shared Concurrent Gui)
++qt5_use_modules(integratedLightDM Concurrent DBus Gui)
++qt5_use_modules(integratedLightDMSession Concurrent DBus Gui)
++qt5_use_modules(MockLightDM-demo-shared Concurrent DBus Gui)
--set_target_properties(integratedLightDM PROPERTIES COMPILE_FLAGS -fPIC)
++set_target_properties(integratedLightDM PROPERTIES
++                      COMPILE_FLAGS "-DSM_BUSNAME=systemBus -fPIC")
++set_target_properties(integratedLightDMSession PROPERTIES
++                      COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")
  set_target_properties(MockLightDM-demo-shared PROPERTIES
++                      COMPILE_FLAGS "-DSM_BUSNAME=systemBus"
                        OUTPUT_NAME lightdm-qt5-2)
  install(TARGETS MockLightDM-demo-shared
 === modified file 'plugins/IntegratedLightDM/liblightdm/UsersModel.cpp'
 --- plugins/IntegratedLightDM/liblightdm/UsersModel.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/IntegratedLightDM/liblightdm/UsersModel.cpp	2016-03-11 18:12:46 +0000
@@ -54,24 +54,10 @@
      roles[ImagePathRole] = "imagePath";
      setRoleNames(roles);
--    // Now modify our mock user backgrounds
--    QDir bgdir = QDir(QStringLiteral("/usr/share/demo-assets/shell/backgrounds/"));
--    QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);
--
--    for (int i = 0, j = 0; i < d->entries.size(); i++) {
--        Entry &entry = d->entries[i];
--        if (entry.background.isNull() && !backgrounds.isEmpty()) {
--            entry.background = bgdir.filePath(backgrounds[j++]);
--            if (j >= backgrounds.length()) {
--                j = 0;
--            }
--        }
--    }
--}
--
--UsersModel::~UsersModel()
--{
--    delete d_ptr;
++    connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {
++        QModelIndex index = createIndex(i, 0);
++        Q_EMIT dataChanged(index, index);
++    });
+ }
  int UsersModel::rowCount(const QModelIndex &parent) const
 === modified file 'plugins/IntegratedLightDM/liblightdm/UsersModel.h'
 --- plugins/IntegratedLightDM/liblightdm/UsersModel.h	2015-04-30 09:31:51 +0000
 +++ plugins/IntegratedLightDM/liblightdm/UsersModel.h	2016-03-11 18:12:46 +0000
@@ -41,7 +41,7 @@
  public:
      explicit UsersModel(QObject *parent = 0);
--    virtual ~UsersModel();
++    virtual ~UsersModel() = default;
      enum UserModelRoles {NameRole = Qt::UserRole,
                           RealNameRole,
 === modified file 'plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
 --- plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-02-04 14:10:42 +0000
 +++ plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-03-11 18:12:46 +0000
@@ -18,7 +18,11 @@
  #include "UsersModelPrivate.h"
++#include "AccountsServiceDBusAdaptor.h"
++#include "UsersModel.h"
++
  #include <glib.h>
++#include <QDebug>
  #include <QDir>
  #include <QSettings>
  #include <QStringList>
@@ -27,7 +31,9 @@
+ {
  UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
--  : q_ptr(parent)
++  : QObject(parent),
++    q_ptr(parent),
++    m_service(new AccountsServiceDBusAdaptor(this))
+ {
      QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");
      QString currentUser = g_get_user_name();
@@ -43,15 +49,43 @@
              entries.append({user, name, 0, 0, false, false, 0, 0});
+         }
      } else {
--        // If we were using the actual liblightdm, we could just ask it
--        // for the user's real name.  But we aren't.  We *should* ask
--        // AccountsService for the real name, like liblightdm does internally,
--        // but this is close enough since AS and passwd are always in sync.
--        QString realName = QString::fromUtf8(g_get_real_name()); // gets name from passwd entry
--        if (realName == QStringLiteral("Unknown")) { // glib doesn't translate this string
--            realName.clear();
--        }
--        entries.append({currentUser, realName, 0, 0, false, false, 0, 0});
++        entries.append({currentUser, 0, 0, 0, false, false, 0, 0});
++
++        connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,
++                this, [this](const QString &user) {
++            if (user == entries[0].username) {
++                updateName(true);
++            }
++        });
++        updateName(false);
++    }
++}
++
++void UsersModelPrivate::updateName(bool async)
++{
++    auto pendingReply = m_service->getUserPropertyAsync(entries[0].username,
++                                                        QStringLiteral("org.freedesktop.Accounts.User"),
++                                                        QStringLiteral("RealName"));
++    auto *watcher = new QDBusPendingCallWatcher(pendingReply, this);
++
++    connect(watcher, &QDBusPendingCallWatcher::finished,
++            this, [this](QDBusPendingCallWatcher* watcher) {
++
++        QDBusPendingReply<QVariant> reply = *watcher;
++        watcher->deleteLater();
++        if (reply.isError()) {
++            qWarning() << "Failed to get 'RealName' property - " << reply.error().message();
++            return;
++        }
++
++        const QString realName = reply.value().toString();
++        if (entries[0].real_name != realName) {
++            entries[0].real_name = realName;
++            Q_EMIT dataChanged(0);
++        }
++    });
++    if (!async) {
++        watcher->waitForFinished();
+     }
+ }
 === modified file 'plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h'
 --- plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2015-01-20 11:50:19 +0000
 +++ plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h	2016-03-11 18:12:46 +0000
@@ -19,8 +19,11 @@
  #ifndef UNITY_MOCK_USERSMODEL_PRIVATE_H
  #define UNITY_MOCK_USERSMODEL_PRIVATE_H
--#include <QtCore/QList>
--#include <QtCore/QString>
++#include <QList>
++#include <QObject>
++#include <QString>
++
++class AccountsServiceDBusAdaptor;
  namespace QLightDM
+ {
@@ -39,19 +42,28 @@
      QString infographic;
  };
--class UsersModelPrivate
++class UsersModelPrivate : public QObject
+ {
++    Q_OBJECT
++
  public:
      explicit UsersModelPrivate(UsersModel *parent = 0);
      virtual ~UsersModelPrivate() = default;
      QList<Entry> entries;
++Q_SIGNALS:
++    void dataChanged(int);
++
  protected:
      UsersModel * const q_ptr;
  private:
      Q_DECLARE_PUBLIC(UsersModel)
++
++    void updateName(bool async);
++
++    AccountsServiceDBusAdaptor *m_service;
  };
+ }
 === modified file 'plugins/ScreenGrabber/screengrabber.cpp'
 --- plugins/ScreenGrabber/screengrabber.cpp	2015-11-18 18:38:36 +0000
 +++ plugins/ScreenGrabber/screengrabber.cpp	2016-03-11 18:12:46 +0000
@@ -46,12 +46,10 @@
      QDir screenshotsDir;
      if (qEnvironmentVariableIsSet("UNITY_TESTING")) {
--        qDebug() << "Using test environment";
          QTemporaryDir tDir;
          tDir.setAutoRemove(false);
          screenshotsDir = tDir.path();
      } else {
--        qDebug() << "Using real environment";
          screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+     }
      screenshotsDir.mkpath(QStringLiteral("Screenshots"));
 === modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
 --- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2015-12-16 18:28:21 +0000
 +++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2016-03-11 18:12:46 +0000
@@ -194,6 +194,26 @@
+     }
+ }
++bool DirectionalDragArea::monitorOnly() const
++{
++    return d->monitorOnly;
++}
++
++void DirectionalDragArea::setMonitorOnly(bool monitorOnly)
++{
++    if (d->monitorOnly != monitorOnly) {
++        d->monitorOnly = monitorOnly;
++
++        if (monitorOnly && d->status == DirectionalDragAreaPrivate::Undecided) {
++            TouchRegistry::instance()->removeCandidateOwnerForTouch(d->touchId, this);
++            // We still wanna know when it ends for keeping the composition time window up-to-date
++            TouchRegistry::instance()->addTouchWatcher(d->touchId, this);
++        }
++
++        Q_EMIT monitorOnlyChanged(monitorOnly);
++    }
++}
++
  void DirectionalDragArea::removeTimeConstraints()
+ {
      d->setMaxTime(60 * 60 * 1000);
@@ -260,7 +280,10 @@
              unownedTouchEvent_undecided(unownedTouchEvent);
              break;
          default: // Recognized:
--            // do nothing
++            if (monitorOnly) {
++                // Treat unowned event as if we owned it, but we are really just watching it
++                touchEvent_recognized(event);
++            }
              break;
+     }
@@ -311,7 +334,9 @@
+     }
      if (movedFarEnoughAlongGestureAxis()) {
--        TouchRegistry::instance()->requestTouchOwnership(touchId, q);
++        if (!monitorOnly) {
++            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
++        }
          setStatus(Recognized);
          setPublicPos(touchPoint->pos());
          setPublicScenePos(touchScenePos);
@@ -411,12 +436,21 @@
          if (recognitionIsDisabled()) {
              // Behave like a dumb TouchArea
              ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");
--            TouchRegistry::instance()->requestTouchOwnership(touchId, q);
              setStatus(Recognized);
--            event->accept();
++            if (monitorOnly) {
++                watchPressedTouchPoints(touchPoints);
++                event->ignore();
++            } else {
++                TouchRegistry::instance()->requestTouchOwnership(touchId, q);
++                event->accept();
++            }
          } else {
              // just monitor the touch points for now.
--            TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
++            if (monitorOnly) {
++                watchPressedTouchPoints(touchPoints);
++            } else {
++                TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);
++            }
              setStatus(Undecided);
              // Let the item below have it. We will monitor it and grab it later if a gesture
@@ -890,5 +924,6 @@
      , recognitionTimer(nullptr)
      , timeSource(new RealTimeSource)
      , activeTouches(timeSource)
++    , monitorOnly(false)
+ {
+ }
 === modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.h'
 --- plugins/Ubuntu/Gestures/DirectionalDragArea.h	2015-05-11 07:49:36 +0000
 +++ plugins/Ubuntu/Gestures/DirectionalDragArea.h	2016-03-11 18:12:46 +0000
@@ -77,6 +77,10 @@
              WRITE setImmediateRecognition
              NOTIFY immediateRecognitionChanged)
++    // Whether we are merely monitoring touch events (in which case, we don't
++    // claim ownership of the touch).
++    Q_PROPERTY(bool monitorOnly READ monitorOnly WRITE setMonitorOnly NOTIFY monitorOnlyChanged)
++
      Q_ENUMS(Direction)
  public:
      DirectionalDragArea(QQuickItem *parent = 0);
@@ -100,6 +104,9 @@
      bool immediateRecognition() const;
      void setImmediateRecognition(bool enabled);
++    bool monitorOnly() const;
++    void setMonitorOnly(bool monitorOnly);
++
      bool event(QEvent *e) override;
      /*
@@ -123,6 +130,7 @@
      void touchSceneXChanged(qreal value);
      void touchSceneYChanged(qreal value);
      void immediateRecognitionChanged(bool value);
++    void monitorOnlyChanged(bool value);
  protected:
      void touchEvent(QTouchEvent *event) override;
 === modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea_p.h'
 --- plugins/Ubuntu/Gestures/DirectionalDragArea_p.h	2015-11-20 15:01:39 +0000
 +++ plugins/Ubuntu/Gestures/DirectionalDragArea_p.h	2016-03-11 18:12:46 +0000
@@ -160,6 +160,8 @@
      ActiveTouchesInfo activeTouches;
++    bool monitorOnly;
++
  Q_SIGNALS:
      void statusChanged(Status value);
  };
 === modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
 --- plugins/Unity/Indicators/indicatorsmanager.cpp	2015-12-02 12:02:50 +0000
 +++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-03-11 18:12:46 +0000
@@ -116,7 +116,7 @@
      QSettings indicator_settings(file_info.absoluteFilePath(), QSettings::IniFormat, this);
      const QString name = indicator_settings.value(QStringLiteral("Indicator Service/Name")).toString();
--    if (m_platform.isPC() && name == "indicator-keyboard") {
++    if (m_platform.isPC() && name == QLatin1String("indicator-keyboard")) {
          return; // convergence: skip this indicator until it works in Mir
+     }
@@ -293,7 +293,7 @@
      // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
      if ((new_indicator->identifier() == QStringLiteral("indicator-session") && m_platform.isMultiSession())
              || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
--        new_indicator->setProfile("desktop");
++        new_indicator->setProfile(QStringLiteral("desktop"));
      } else {
          new_indicator->setProfile(m_profile);
+     }
 === modified file 'plugins/Unity/Indicators/rootstateparser.h'
 --- plugins/Unity/Indicators/rootstateparser.h	2014-11-11 15:28:13 +0000
 +++ plugins/Unity/Indicators/rootstateparser.h	2016-03-11 18:12:46 +0000
@@ -23,6 +23,7 @@
  class UNITYINDICATORS_EXPORT RootStateParser : public ActionStateParser
+ {
++Q_OBJECT
  public:
      RootStateParser(QObject* parent = nullptr);
      virtual QVariant toQVariant(GVariant* state) const override;
 === modified file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
 --- plugins/Unity/Launcher/desktopfilehandler.cpp	2015-09-30 12:43:53 +0000
 +++ plugins/Unity/Launcher/desktopfilehandler.cpp	2016-03-11 18:12:46 +0000
@@ -146,9 +146,9 @@
      QString iconString = settings.value(QStringLiteral("Icon")).toString();
      QString pathString = settings.value(QStringLiteral("Path")).toString();
--    if (QFileInfo(iconString).exists()) {
++    if (QFileInfo::exists(iconString)) {
          return QFileInfo(iconString).absoluteFilePath();
--    } else if (QFileInfo(pathString + '/' + iconString).exists()) {
++    } else if (QFileInfo::exists(pathString + '/' + iconString)) {
          return pathString + '/' + iconString;
+     }
      return "image://theme/" + iconString;
 === modified file 'plugins/Unity/Launcher/launcheritem.cpp'
 --- plugins/Unity/Launcher/launcheritem.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/Unity/Launcher/launcheritem.cpp	2016-03-11 18:12:46 +0000
@@ -37,6 +37,7 @@
      m_alerting(false),
      m_quickList(new QuickListModel(this))
+ {
++    Q_ASSERT(parent != nullptr);
      QuickListEntry nameAction;
      nameAction.setActionId(QStringLiteral("launch_item"));
      nameAction.setText(m_name);
 === modified file 'plugins/Unity/Launcher/launcheritem.h'
 --- plugins/Unity/Launcher/launcheritem.h	2015-07-23 14:13:57 +0000
 +++ plugins/Unity/Launcher/launcheritem.h	2016-03-11 18:12:46 +0000
@@ -32,7 +32,7 @@
+ {
      Q_OBJECT
  public:
--    LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);
++    LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent);
      QString appId() const override;
      QString name() const override;
 === modified file 'plugins/Unity/Launcher/launchermodel.cpp'
 --- plugins/Unity/Launcher/launchermodel.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/Unity/Launcher/launchermodel.cpp	2016-03-11 18:12:46 +0000
@@ -103,7 +103,7 @@
          LauncherItem *item = m_list.at(index);
          if (!item->focused()) {
              item->setAlerting(alerting);
--            Q_EMIT dataChanged(modelIndex, modelIndex, QVector<int>() << RoleAlerting);
++            Q_EMIT dataChanged(modelIndex, modelIndex, {RoleAlerting});
+         }
+     }
+ }
@@ -389,7 +389,8 @@
          if (countVisible && desktopFile.isValid()) {
              LauncherItem *item = new LauncherItem(appId,
                                                    desktopFile.displayName(),
--                                                  desktopFile.icon());
++                                                  desktopFile.icon(),
++                                                  this);
              item->setCountVisible(true);
              beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
              m_list.append(item);
@@ -414,10 +415,19 @@
          } else {
              int idx = m_list.indexOf(item);
              item->setName(desktopFile.displayName());
--            item->setIcon(desktopFile.icon());
              item->setPinned(item->pinned()); // update pinned text if needed
              item->setRunning(item->running());
--            Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleIcon, RoleRunning});
++            Q_EMIT dataChanged(index(idx), index(idx), {RoleName, RoleRunning});
++
++            const QString oldIcon = item->icon();
++            if (oldIcon == desktopFile.icon()) { // same icon file, perhaps different contents, simulate changing the icon name to force reload
++                item->setIcon(QString());
++                Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
++            }
++
++            // now set the icon for real
++            item->setIcon(desktopFile.icon());
++            Q_EMIT dataChanged(index(idx), index(idx), {RoleIcon});
+         }
+     }
@@ -489,7 +499,7 @@
      if (idx >= 0) {
          LauncherItem *item = m_list.at(idx);
          setAlerting(item->appId(), true);
--        Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleAlerting);
++        Q_EMIT dataChanged(index(idx), index(idx), {RoleAlerting});
+     }
+ }
 === modified file 'plugins/Unity/Launcher/launchermodel.h'
 --- plugins/Unity/Launcher/launchermodel.h	2015-07-29 12:32:57 +0000
 +++ plugins/Unity/Launcher/launchermodel.h	2016-03-11 18:12:46 +0000
@@ -38,7 +38,7 @@
     Q_OBJECT
  public:
--    LauncherModel(QObject *parent = 0);
++    LauncherModel(QObject *parent = nullptr);
      ~LauncherModel();
      int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 === modified file 'plugins/Utils/CMakeLists.txt'
 --- plugins/Utils/CMakeLists.txt	2016-02-08 09:37:48 +0000
 +++ plugins/Utils/CMakeLists.txt	2016-03-11 18:12:46 +0000
@@ -17,12 +17,13 @@
      unitysortfilterproxymodelqml.cpp
      Timer.cpp
      unitymenumodelpaths.cpp
--    windowkeysfilter.cpp
++    windowinputfilter.cpp
      windowscreenshotprovider.cpp
      easingcurve.cpp
      windowstatestorage.cpp
      timezoneFormatter.cpp
      inputeventgenerator.cpp
++    deviceconfigparser.cpp
      plugin.cpp
+     )
 === modified file 'plugins/Utils/Utils.qmltypes'
 --- plugins/Utils/Utils.qmltypes	2015-09-03 11:08:46 +0000
 +++ plugins/Utils/Utils.qmltypes	2016-03-11 18:12:46 +0000
@@ -147,10 +147,10 @@
+         }
+     }
      Component {
--        name: "WindowKeysFilter"
++        name: "WindowInputFilter"
          defaultProperty: "data"
          prototype: "QQuickItem"
--        exports: ["Utils/WindowKeysFilter 0.1"]
++        exports: ["Utils/WindowInputFilter 0.1"]
          exportMetaObjectRevisions: [0]
+     }
      Component {
 === added file 'plugins/Utils/deviceconfigparser.cpp'
 --- plugins/Utils/deviceconfigparser.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/deviceconfigparser.cpp	2016-03-11 18:12:46 +0000
@@ -0,0 +1,150 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "deviceconfigparser.h"
++
++#include <QSettings>
++#include <QFileInfo>
++#include <QDebug>
++#include <QStandardPaths>
++
++DeviceConfigParser::DeviceConfigParser(QObject *parent): QObject(parent)
++{
++    QString path;
++    Q_FOREACH (const QString &standardPath, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) {
++        if (QFileInfo(standardPath + "/devices.conf").exists()) {
++            path = standardPath + "/devices.conf";
++            break;
++        }
++    }
++
++    if (path.isEmpty()) {
++        path = "/etc/ubuntu/devices.conf";
++    }
++    qDebug() << "Using" << path << "as device configuration file";
++    m_config = new QSettings(path, QSettings::IniFormat, this);
++}
++
++QString DeviceConfigParser::name() const
++{
++    return m_name;
++}
++
++void DeviceConfigParser::setName(const QString &name)
++{
++    if (m_name == name) {
++        return;
++    }
++    m_name = name;
++    Q_EMIT changed();
++}
++
++Qt::ScreenOrientation DeviceConfigParser::primaryOrientation() const
++{
++    return stringToOrientation(readOrientationFromConfig("PrimaryOrientation"), Qt::PrimaryOrientation);
++}
++
++Qt::ScreenOrientations DeviceConfigParser::supportedOrientations() const
++{
++    QStringList values = readOrientationsFromConfig("SupportedOrientations");
++    if (values.isEmpty()) {
++        return Qt::PortraitOrientation
++                | Qt::InvertedPortraitOrientation
++                | Qt::LandscapeOrientation
++                | Qt::InvertedLandscapeOrientation;
++    }
++
++    Qt::ScreenOrientations ret = Qt::PrimaryOrientation;
++    Q_FOREACH(const QString &orientationString, values) {
++        ret |= stringToOrientation(orientationString, Qt::PrimaryOrientation);
++    }
++    return ret;
++}
++
++Qt::ScreenOrientation DeviceConfigParser::landscapeOrientation() const
++{
++    return stringToOrientation(readOrientationFromConfig("LandscapeOrientation"), Qt::LandscapeOrientation);
++}
++
++Qt::ScreenOrientation DeviceConfigParser::invertedLandscapeOrientation() const
++{
++    return stringToOrientation(readOrientationFromConfig("InvertedLandscapeOrientation"), Qt::InvertedLandscapeOrientation);
++}
++
++Qt::ScreenOrientation DeviceConfigParser::portraitOrientation() const
++{
++    return stringToOrientation(readOrientationFromConfig("PortraitOrientation"), Qt::PortraitOrientation);
++}
++
++Qt::ScreenOrientation DeviceConfigParser::invertedPortraitOrientation() const
++{
++    return stringToOrientation(readOrientationFromConfig("InvertedPortraitOrientation"), Qt::InvertedPortraitOrientation);
++}
++
++QString DeviceConfigParser::category() const
++{
++    QStringList supportedValues = {"phone", "tablet", "desktop"};
++    m_config->beginGroup(m_name);
++    QString value = m_config->value("Category", "phone").toString();
++    if (!supportedValues.contains(value)) {
++        qWarning().nospace().noquote() << "Unknown option \"" << value << "\" in " << m_config->fileName()
++                    << ". Supported options are: " << supportedValues.join(", ") << ".";
++        return "phone";
++    }
++    m_config->endGroup();
++    return value;
++}
++
++QStringList DeviceConfigParser::readOrientationsFromConfig(const QString &key) const
++{
++    m_config->beginGroup(m_name);
++
++    QStringList ret;
++    if (m_config->contains(key)) {
++        ret = m_config->value(key).toStringList();
++    }
++
++    m_config->endGroup();
++    return ret;
++}
++
++QString DeviceConfigParser::readOrientationFromConfig(const QString &key) const
++{
++    QStringList ret = readOrientationsFromConfig(key);
++    return ret.count() > 0 ? ret.first() : QString();
++}
++
++Qt::ScreenOrientation DeviceConfigParser::stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const
++{
++    if (orientationString == "Landscape") {
++        return Qt::LandscapeOrientation;
++    }
++    if (orientationString == "InvertedLandscape") {
++        return Qt::InvertedLandscapeOrientation;
++    }
++    if (orientationString == "Portrait") {
++        return Qt::PortraitOrientation;
++    }
++    if (orientationString == "InvertedPortrait") {
++        return Qt::InvertedPortraitOrientation;
++    }
++    if (!orientationString.isEmpty()) {
++        // Some option we don't know. Give some hint on what went wrong.
++        qWarning().nospace().noquote() << "Unknown option \"" << orientationString << "\" in " << m_config->fileName()
++                    << ". Supported options are: Landscape, InvertedLandscape, Portrait and InvertedPortrait.";
++    }
++    return defaultValue;
++}
 === added file 'plugins/Utils/deviceconfigparser.h'
 --- plugins/Utils/deviceconfigparser.h	1970-01-01 00:00:00 +0000
 +++ plugins/Utils/deviceconfigparser.h	2016-03-11 18:12:46 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef DEVICECONFIGPARSER_H
++#define DEVICECONFIGPARSER_H
++
++#include <QObject>
++#include <QSettings>
++
++class DeviceConfigParser: public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QString name READ name WRITE setName NOTIFY changed)
++
++    Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY changed)
++    Q_PROPERTY(Qt::ScreenOrientations supportedOrientations READ supportedOrientations NOTIFY changed)
++    Q_PROPERTY(Qt::ScreenOrientation landscapeOrientation READ landscapeOrientation NOTIFY changed)
++    Q_PROPERTY(Qt::ScreenOrientation invertedLandscapeOrientation READ invertedLandscapeOrientation NOTIFY changed)
++    Q_PROPERTY(Qt::ScreenOrientation portraitOrientation READ portraitOrientation NOTIFY changed)
++    Q_PROPERTY(Qt::ScreenOrientation invertedPortraitOrientation READ invertedPortraitOrientation NOTIFY changed)
++    Q_PROPERTY(QString category READ category NOTIFY changed)
++
++public:
++    DeviceConfigParser(QObject *parent = nullptr);
++
++    QString name() const;
++    void setName(const QString &name);
++
++    Qt::ScreenOrientation primaryOrientation() const;
++    Qt::ScreenOrientations supportedOrientations() const;
++    Qt::ScreenOrientation landscapeOrientation() const;
++    Qt::ScreenOrientation invertedLandscapeOrientation() const;
++    Qt::ScreenOrientation portraitOrientation() const;
++    Qt::ScreenOrientation invertedPortraitOrientation() const;
++    QString category() const;
++
++Q_SIGNALS:
++    void changed();
++
++private:
++    QString m_name;
++    QSettings *m_config;
++
++    QStringList readOrientationsFromConfig(const QString &key) const;
++    QString readOrientationFromConfig(const QString &key) const;
++    Qt::ScreenOrientation stringToOrientation(const QString &orientationString, Qt::ScreenOrientation defaultValue) const;
++};
++
++#endif
 === modified file 'plugins/Utils/plugin.cpp'
 --- plugins/Utils/plugin.cpp	2016-01-29 11:52:14 +0000
 +++ plugins/Utils/plugin.cpp	2016-03-11 18:12:46 +0000
@@ -30,13 +30,14 @@
  #include "qlimitproxymodelqml.h"
  #include "unitysortfilterproxymodelqml.h"
  #include "unitymenumodelpaths.h"
--#include "windowkeysfilter.h"
++#include "windowinputfilter.h"
  #include "windowscreenshotprovider.h"
  #include "windowstatestorage.h"
  #include "constants.h"
  #include "timezoneFormatter.h"
  #include "applicationsfiltermodel.h"
  #include "inputeventgenerator.h"
++#include "deviceconfigparser.h"
  static QObject *createWindowStateStorage(QQmlEngine *engine, QJSEngine *scriptEngine)
+ {
@@ -60,7 +61,7 @@
      qmlRegisterType<QLimitProxyModelQML>(uri, 0, 1, "LimitProxyModel");
      qmlRegisterType<UnitySortFilterProxyModelQML>(uri, 0, 1, "UnitySortFilterProxyModel");
      qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");
--    qmlRegisterType<WindowKeysFilter>(uri, 0, 1, "WindowKeysFilter");
++    qmlRegisterType<WindowInputFilter>(uri, 0, 1, "WindowInputFilter");
      qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");
      qmlRegisterSingletonType<WindowStateStorage>(uri, 0, 1, "WindowStateStorage", createWindowStateStorage);
      qmlRegisterType<InputWatcher>(uri, 0, 1, "InputWatcher");
@@ -70,6 +71,7 @@
      qmlRegisterType<ActiveFocusLogger>(uri, 0, 1, "ActiveFocusLogger");
      qmlRegisterType<ApplicationsFilterModel>(uri, 0, 1, "ApplicationsFilterModel");
      qmlRegisterType<InputEventGenerator>(uri, 0, 1, "InputEventGenerator");
++    qmlRegisterType<DeviceConfigParser>(uri, 0, 1, "DeviceConfigParser");
+ }
  void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 === modified file 'plugins/Utils/timezoneFormatter.cpp'
 --- plugins/Utils/timezoneFormatter.cpp	2015-11-20 15:01:39 +0000
 +++ plugins/Utils/timezoneFormatter.cpp	2016-03-11 18:12:46 +0000
@@ -33,3 +33,13 @@
+     }
      return QString();
+ }
++
++QString TimezoneFormatter::currentTimeInTimezoneWithAbbrev(const QVariant &tzId) const
++{
++    QTimeZone tz(tzId.toByteArray());
++    if (tz.isValid()) {
++        const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
++        return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm"))).arg(tz.abbreviation(now));
++    }
++    return QString();
++}
 === modified file 'plugins/Utils/timezoneFormatter.h'
 --- plugins/Utils/timezoneFormatter.h	2015-09-17 13:42:15 +0000
 +++ plugins/Utils/timezoneFormatter.h	2016-03-11 18:12:46 +0000
@@ -27,6 +27,7 @@
      ~TimezoneFormatter() = default;
      Q_INVOKABLE QString currentTimeInTimezone(const QVariant &tzId) const;
++    Q_INVOKABLE QString currentTimeInTimezoneWithAbbrev(const QVariant &tzId) const;
  };
  #endif
 === renamed file 'plugins/Utils/windowkeysfilter.cpp' => 'plugins/Utils/windowinputfilter.cpp'
 --- plugins/Utils/windowkeysfilter.cpp	2015-10-22 17:37:26 +0000
 +++ plugins/Utils/windowinputfilter.cpp	2016-03-11 18:12:46 +0000
@@ -16,36 +16,34 @@
   * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
   */
--#include "windowkeysfilter.h"
++#include "windowinputfilter.h"
  #include <QQuickWindow>
--WindowKeysFilter::WindowKeysFilter(QQuickItem *parent)
++WindowInputFilter::WindowInputFilter(QQuickItem *parent)
      : QQuickItem(parent),
--      m_currentEventTimestamp(0)
++      m_lastInputTimestamp(0)
+ {
      connect(this, &QQuickItem::windowChanged,
--            this, &WindowKeysFilter::setupFilterOnWindow);
++            this, &WindowInputFilter::setupFilterOnWindow);
+ }
--bool WindowKeysFilter::eventFilter(QObject *watched, QEvent *event)
++bool WindowInputFilter::eventFilter(QObject *watched, QEvent *event)
+ {
      Q_ASSERT(!m_filteredWindow.isNull());
      Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));
      Q_UNUSED(watched);
++    QInputEvent *inputEvent = dynamic_cast<QInputEvent*>(event);
++    if (inputEvent) {
++        m_lastInputTimestamp = inputEvent->timestamp();
++        Q_EMIT lastInputTimestampChanged();
++    }
++
      if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) {
          // Let QML see this event and decide if it does not want it
          event->accept();
--
--        m_currentEventTimestamp = static_cast<QInputEvent*>(event)->timestamp();
--        Q_EMIT currentEventTimestampChanged();
--
          QCoreApplication::sendEvent(this, event);
--
--        m_currentEventTimestamp = 0;
--        Q_EMIT currentEventTimestampChanged();
--
          return event->isAccepted();
      } else {
          // Not interested
@@ -53,7 +51,7 @@
+     }
+ }
--void WindowKeysFilter::setupFilterOnWindow(QQuickWindow *window)
++void WindowInputFilter::setupFilterOnWindow(QQuickWindow *window)
+ {
      if (!m_filteredWindow.isNull()) {
          m_filteredWindow->removeEventFilter(this);
@@ -66,7 +64,7 @@
+     }
+ }
--ulong WindowKeysFilter::currentEventTimestamp() const
++ulong WindowInputFilter::lastInputTimestamp() const
+ {
--    return m_currentEventTimestamp;
++    return m_lastInputTimestamp;
+ }
 === renamed file 'plugins/Utils/windowkeysfilter.h' => 'plugins/Utils/windowinputfilter.h'
 --- plugins/Utils/windowkeysfilter.h	2015-10-22 17:37:26 +0000
 +++ plugins/Utils/windowinputfilter.h	2016-03-11 18:12:46 +0000
@@ -16,8 +16,8 @@
   * Author: Daniel d'Andrada <daniel.dandrada@canonical.com>
   */
--#ifndef UNITY_WINDOWKEYSFILTER_H
--#define UNITY_WINDOWKEYSFILTER_H
++#ifndef UNITY_WINDOWINPUTFILTER_H
++#define UNITY_WINDOWINPUTFILTER_H
  #include <QQuickItem>
  #include <QPointer>
@@ -29,30 +29,30 @@
     accepted ones will be filtered out. Events are accepted by default, so make sure you reject
     the keys you're not interested in.
--   If more than one WindowKeysFilter exist in the same QML scene (and thus in the same QQuickWindow)
++   If more than one WindowInputFilter exist in the same QML scene (and thus in the same QQuickWindow)
     they will be called in the order of creation, which can be tricky to assess. So the best practice
--   is to have at most one WindowKeysFilter per QML scene.
++   is to have at most one WindowInputFilter per QML scene.
   */
--class WindowKeysFilter : public QQuickItem
++class WindowInputFilter : public QQuickItem
+ {
      Q_OBJECT
--    Q_PROPERTY(ulong currentEventTimestamp READ currentEventTimestamp NOTIFY currentEventTimestampChanged)
++    Q_PROPERTY(ulong lastInputTimestamp READ lastInputTimestamp NOTIFY lastInputTimestampChanged)
  public:
--    WindowKeysFilter(QQuickItem *parent = 0);
++    WindowInputFilter(QQuickItem *parent = 0);
      bool eventFilter(QObject *watched, QEvent *event) override;
--    ulong currentEventTimestamp() const;
++    ulong lastInputTimestamp() const;
  Q_SIGNALS:
--    void currentEventTimestampChanged();
++    void lastInputTimestampChanged();
  private Q_SLOTS:
      void setupFilterOnWindow(QQuickWindow *window);
  private:
      QPointer<QQuickWindow> m_filteredWindow;
--    ulong m_currentEventTimestamp;
++    ulong m_lastInputTimestamp;
  };
--#endif // UNITY_WINDOWKEYSFILTER_H
++#endif // UNITY_WINDOWINPUTFILTER_H
 === modified file 'plugins/Wizard/CMakeLists.txt'
 --- plugins/Wizard/CMakeLists.txt	2014-11-14 17:47:00 +0000
 +++ plugins/Wizard/CMakeLists.txt	2016-03-11 18:12:46 +0000
@@ -1,10 +1,16 @@
++include_directories(${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS})
++
  add_library(Wizard-qml MODULE
      plugin.cpp
      PageList.cpp
      System.cpp
++    LocalePlugin.cpp
++    timezonemodel.cpp
++    Status.cpp
+ )
--qt5_use_modules(Wizard-qml DBus Qml)
++qt5_use_modules(Wizard-qml DBus Qml Concurrent)
++target_link_libraries(Wizard-qml ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
  add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
  set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
 === added file 'plugins/Wizard/LocalePlugin.cpp'
 --- plugins/Wizard/LocalePlugin.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Wizard/LocalePlugin.cpp	2016-03-11 18:12:46 +0000
@@ -0,0 +1,291 @@
++/*
++ * Copyright (C) 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QLocale>
++#include <QStringList>
++
++#include <libintl.h>
++
++#include "LocalePlugin.h"
++
++class LocalePrivate {
++public:
++    LocalePrivate() {
++        m_mccCodes = QHash<int, QString>
++                ({{202,"gr"},
++                  {204,"nl"},
++                  {206,"be"},
++                  {208,"fr"},
++                  {212,"mc"},
++                  {213,"ad"},
++                  {214,"es"},
++                  {216,"hu"},
++                  {218,"ba"},
++                  {219,"hr"},
++                  {220,"rs"},
++                  {222,"it"},
++                  {226,"ro"},
++                  {228,"ch"},
++                  {230,"cz"},
++                  {231,"sk"},
++                  {232,"at"},
++                  {234,"gb"},
++                  {235,"gb"},
++                  {238,"dk"},
++                  {240,"se"},
++                  {242,"no"},
++                  {244,"fi"},
++                  {246,"lt"},
++                  {247,"lv"},
++                  {248,"ee"},
++                  {250,"ru"},
++                  {255,"ua"},
++                  {257,"by"},
++                  {259,"md"},
++                  {260,"pl"},
++                  {262,"de"},
++                  {266,"gi"},
++                  {268,"pt"},
++                  {270,"lu"},
++                  {272,"ie"},
++                  {274,"is"},
++                  {276,"al"},
++                  {278,"mt"},
++                  {280,"cy"},
++                  {282,"ge"},
++                  {283,"am"},
++                  {284,"bg"},
++                  {286,"tr"},
++                  {288,"fo"},
++                  {289,"ge"},
++                  {290,"gl"},
++                  {292,"sm"},
++                  {293,"si"},
++                  {294,"mk"},
++                  {295,"li"},
++                  {297,"me"},
++                  {302,"ca"},
++                  {308,"pm"},
++                  {310,"gu"},
++                  {310,"us"},
++                  {311,"gu"},
++                  {311,"us"},
++                  {312,"us"},
++                  {316,"us"},
++                  {330,"pr"},
++                  {334,"mx"},
++                  {338,"jm"},
++                  {340,"fg"},
++                  {340,"gp"},
++                  {340,"mq"},
++                  {342,"bb"},
++                  {344,"ag"},
++                  {346,"ky"},
++                  {348,"vg"},
++                  {350,"bm"},
++                  {352,"gd"},
++                  {354,"ms"},
++                  {356,"kn"},
++                  {358,"lc"},
++                  {360,"vc"},
++                  {362,"an"},
++                  {362,"cw"},
++                  {363,"aw"},
++                  {364,"bs"},
++                  {365,"ai"},
++                  {366,"dm"},
++                  {368,"cu"},
++                  {370,"do"},
++                  {372,"ht"},
++                  {374,"tt"},
++                  {376,"tc"},
++                  {376,"vi"},
++                  {400,"az"},
++                  {401,"kz"},
++                  {402,"bt"},
++                  {404,"in"},
++                  {405,"in"},
++                  {410,"pk"},
++                  {412,"af"},
++                  {413,"lk"},
++                  {414,"mm"},
++                  {415,"lb"},
++                  {416,"jo"},
++                  {417,"sy"},
++                  {418,"iq"},
++                  {419,"kw"},
++                  {420,"sa"},
++                  {421,"ye"},
++                  {422,"om"},
++                  {424,"ae"},
++                  {425,"il"},
++                  {425,"ps"},
++                  {426,"bh"},
++                  {427,"qa"},
++                  {428,"mn"},
++                  {429,"np"},
++                  {430,"ae"},
++                  {431,"ae"},
++                  {432,"ir"},
++                  {434,"uz"},
++                  {436,"tk"},
++                  {437,"kg"},
++                  {438,"tm"},
++                  {440,"jp"},
++                  {441,"jp"},
++                  {450,"kr"},
++                  {452,"vn"},
++                  {454,"hk"},
++                  {455,"mo"},
++                  {456,"kh"},
++                  {457,"la"},
++                  {460,"cn"},
++                  {466,"tw"},
++                  {467,"kp"},
++                  {470,"bd"},
++                  {472,"mv"},
++                  {502,"my"},
++                  {505,"au"},
++                  {510,"id"},
++                  {514,"tp"},
++                  {515,"ph"},
++                  {520,"th"},
++                  {525,"sg"},
++                  {528,"bn"},
++                  {530,"nz"},
++                  {537,"pg"},
++                  {539,"to"},
++                  {540,"sb"},
++                  {541,"vu"},
++                  {542,"fj"},
++                  {544,"as"},
++                  {545,"ki"},
++                  {546,"nc"},
++                  {547,"pf"},
++                  {548,"ck"},
++                  {549,"ws"},
++                  {550,"fm"},
++                  {552,"pw"},
++                  {553,"tv"},
++                  {555,"nu"},
++                  {602,"eg"},
++                  {603,"dz"},
++                  {604,"ma"},
++                  {605,"tn"},
++                  {606,"ly"},
++                  {607,"gm"},
++                  {608,"sn"},
++                  {609,"mr"},
++                  {610,"ml"},
++                  {611,"gn"},
++                  {612,"ci"},
++                  {613,"bf"},
++                  {614,"ne"},
++                  {615,"tg"},
++                  {616,"bj"},
++                  {617,"mu"},
++                  {618,"lr"},
++                  {619,"sl"},
++                  {620,"gh"},
++                  {621,"ng"},
++                  {622,"td"},
++                  {623,"cf"},
++                  {624,"cm"},
++                  {625,"cv"},
++                  {626,"st"},
++                  {627,"gq"},
++                  {628,"ga"},
++                  {629,"cg"},
++                  {630,"cd"},
++                  {631,"ao"},
++                  {632,"gw"},
++                  {633,"sc"},
++                  {634,"sd"},
++                  {635,"rw"},
++                  {636,"et"},
++                  {637,"so"},
++                  {638,"dj"},
++                  {639,"ke"},
++                  {640,"tz"},
++                  {641,"ug"},
++                  {642,"bi"},
++                  {643,"mz"},
++                  {645,"zm"},
++                  {646,"mg"},
++                  {647,"re"},
++                  {648,"zw"},
++                  {649,"na"},
++                  {650,"mw"},
++                  {651,"ls"},
++                  {652,"bw"},
++                  {653,"sz"},
++                  {654,"km"},
++                  {655,"za"},
++                  {657,"er"},
++                  {659,"ss"},
++                  {702,"bz"},
++                  {704,"gt"},
++                  {706,"sv"},
++                  {708,"hn"},
++                  {710,"ni"},
++                  {712,"cr"},
++                  {714,"pa"},
++                  {716,"pe"},
++                  {722,"ar"},
++                  {724,"br"},
++                  {730,"cl"},
++                  {732,"co"},
++                  {734,"ve"},
++                  {736,"bo"},
++                  {738,"gy"},
++                  {740,"ec"},
++                  {744,"py"},
++                  {746,"sr"},
++                  {748,"uy"},
++                  {750,"fk"}}
++                 );
++    }
++
++    QString mccToCountryCode(int mcc) const {
++        return m_mccCodes.value(mcc, "us").toUpper();
++    }
++
++private:
++    // MCC = Mobile Country Code, see https://en.wikipedia.org/wiki/Mobile_country_code
++    QHash<int,QString> m_mccCodes;
++};
++
++Q_GLOBAL_STATIC(LocalePrivate, d)
++
++LocaleAttached::LocaleAttached(QObject* parent)
++    : QObject(parent)
++{
++}
++
++QString LocaleAttached::mccToCountryCode(int mcc) const
++{
++    return d->mccToCountryCode(mcc);
++}
++
++LocalePlugin::LocalePlugin(QObject* parent)
++    : QObject(parent)
++{
++}
++
++LocaleAttached* LocalePlugin::qmlAttachedProperties(QObject* parent)
++{
++    return new LocaleAttached(parent);
++}
 === added file 'plugins/Wizard/LocalePlugin.h'
 --- plugins/Wizard/LocalePlugin.h	1970-01-01 00:00:00 +0000
 +++ plugins/Wizard/LocalePlugin.h	2016-03-11 18:12:46 +0000
@@ -0,0 +1,58 @@
++/*
++ * Copyright (C) 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef LOCALE_PLUGIN_H
++#define LOCALE_PLUGIN_H
++
++#include <QObject>
++#include <QString>
++#include <QJsonObject>
++#include <QtQml>
++
++class LocaleAttached: public QObject
++{
++    Q_OBJECT
++protected:
++    explicit LocaleAttached(QObject *parent = 0);
++
++public:
++    Q_INVOKABLE QString mccToCountryCode(int mcc) const;
++
++    friend class LocalePlugin;
++};
++
++/**
++ * A simplified wrapper around QLocale.
++ *
++ * The wrapper is implemented as an attached property, which makes it possible
++ * to use it as if its methods were static:
++ *
++ * @code
++ * var langs = LocalePlugin.languages();
++ * @endcode
++ */
++class LocalePlugin: public QObject
++{
++    Q_OBJECT
++public:
++    explicit LocalePlugin(QObject *parent = 0);
++
++    static LocaleAttached* qmlAttachedProperties(QObject *parent);
++};
++
++QML_DECLARE_TYPEINFO(LocalePlugin, QML_HAS_ATTACHED_PROPERTIES)
++
++#endif // LOCALE_PLUGIN_H
 === modified file 'plugins/Wizard/PageList.cpp'
 --- plugins/Wizard/PageList.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/Wizard/PageList.cpp	2016-03-11 18:12:46 +0000
@@ -40,20 +40,20 @@
        m_index(-1),
        m_pages()
+ {
--    QString qmlSuffix = QStringLiteral(".qml");
--    QString disabledSuffix = QStringLiteral(".disabled");
++    const QString qmlSuffix = QStringLiteral(".qml");
++    const QString disabledSuffix = QStringLiteral(".disabled");
      QSet<QString> disabledPages;
      QStringList dataDirs;
      if (!isRunningInstalled() && getenv("WIZARD_TESTING") == nullptr) {
--        dataDirs = QStringList() << qmlDirectory();
++        dataDirs << qmlDirectory();
      } else {
          dataDirs = shellDataDirs();
+     }
      Q_FOREACH(const QString &dataDir, dataDirs) {
          QDir dir(dataDir + "/Wizard/Pages");
--        QStringList entries = dir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Files | QDir::Readable);
++        const QStringList entries = dir.entryList(QStringList(QStringLiteral("[0-9]*")), QDir::Files | QDir::Readable);
          Q_FOREACH(const QString &entry, entries) {
              if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))
                  m_pages.insert(entry, dir.absoluteFilePath(entry));
 === added file 'plugins/Wizard/Status.cpp'
 --- plugins/Wizard/Status.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Wizard/Status.cpp	2016-03-11 18:12:46 +0000
@@ -0,0 +1,143 @@
++/*
++ * Copyright (C) 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QDebug>
++#include <QDBusConnection>
++
++#include "Status.h"
++
++Status::Status()
++{
++    initNM();
++    initUPower();
++}
++
++void Status::initNM()
++{
++    m_nmIface = new QDBusInterface("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager",
++                                   QDBusConnection::systemBus(), this);
++
++    QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager", "PropertiesChanged",
++                                         this, SLOT(onNMPropertiesChanged(QVariantMap)));
++}
++
++void Status::onNMPropertiesChanged(const QVariantMap &changedProps)
++{
++    if (changedProps.contains("State") || changedProps.contains("Connectivity")) {
++        Q_EMIT onlineChanged();
++        Q_EMIT networkIconChanged();
++    }
++
++    if (changedProps.contains("PrimaryConnection") || changedProps.contains("SpecificObject") || changedProps.contains("Strength")) {
++        Q_EMIT networkIconChanged();
++    }
++}
++
++bool Status::online() const
++{
++    if (!m_nmIface->isValid())
++        return false;
++
++    return m_nmIface->property("State").toUInt() == 70;
++}
++
++QString Status::networkIcon()
++{
++    QString iconName = QStringLiteral("nm-no-connection");
++
++    if (!online()) {
++        return iconName;
++    }
++
++    const QString primaryConn = m_nmIface->property("PrimaryConnection").value<QDBusObjectPath>().path();
++    const QString primaryConnType = m_nmIface->property("PrimaryConnectionType").toString();
++
++    if (primaryConn.isEmpty()) {
++        qWarning() << "Empty primary connection";
++        return iconName;
++    }
++
++    if (primaryConnType == "802-11-wireless") {
++        QDBusInterface activeConn("org.freedesktop.NetworkManager", primaryConn, "org.freedesktop.NetworkManager.Connection.Active", QDBusConnection::systemBus());
++
++        if (activeConn.isValid()) {
++            const QString apPath = activeConn.property("SpecificObject").value<QDBusObjectPath>().path();
++
++            if (apPath.isEmpty()) {
++                qWarning() << "No AP path";
++                return iconName;
++            }
++
++            QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", primaryConn, "org.freedesktop.NetworkManager.Connection.Active", "PropertiesChanged",
++                                                 this, SLOT(onNMPropertiesChanged(QVariantMap)));
++
++            QDBusInterface ap("org.freedesktop.NetworkManager", apPath, "org.freedesktop.NetworkManager.AccessPoint", QDBusConnection::systemBus());
++
++            if (!ap.isValid()) {
++                qWarning() << "Invalid AP";
++                return iconName;
++            }
++
++            QDBusConnection::systemBus().connect("org.freedesktop.NetworkManager", apPath, "org.freedesktop.NetworkManager.AccessPoint", "PropertiesChanged",
++                                                 this, SLOT(onNMPropertiesChanged(QVariantMap)));
++
++            const uint strength = ap.property("Strength").toUInt();
++            const uint flags = ap.property("Flags").toUInt();
++
++            if (strength == 0) {
++                iconName = "nm-signal-00";
++            } else if (strength <= 25) {
++                iconName = "nm-signal-25";
++            } else if (strength <= 50) {
++                iconName = "nm-signal-50";
++            } else if (strength <= 75) {
++                iconName = "nm-signal-75";
++            } else if (strength <= 100) {
++                iconName = "nm-signal-100";
++            }
++
++            if (flags >= 1) {
++                iconName += "-secure";
++            }
++        }
++    }
++
++    return iconName;
++}
++
++void Status::initUPower()
++{
++    m_upowerIface = new QDBusInterface("org.freedesktop.UPower", "/org/freedesktop/UPower/devices/DisplayDevice", "org.freedesktop.UPower.Device",
++                                       QDBusConnection::systemBus(), this);
++    QDBusConnection::systemBus().connect("org.freedesktop.UPower", "/org/freedesktop/UPower/devices/DisplayDevice", "org.freedesktop.DBus.Properties",
++                                         "PropertiesChanged", this, SLOT(onUPowerPropertiesChanged(QString,QVariantMap,QStringList)));
++}
++
++void Status::onUPowerPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps)
++{
++    Q_UNUSED(iface)
++    Q_UNUSED(invalidatedProps)
++
++    if (changedProps.contains("IconName")) {
++        Q_EMIT batteryIconChanged();
++    }
++}
++
++QString Status::batteryIcon() const
++{
++    const QString iconName = m_upowerIface->property("IconName").toString();
++    return iconName;
++}
 === added file 'plugins/Wizard/Status.h'
 --- plugins/Wizard/Status.h	1970-01-01 00:00:00 +0000
 +++ plugins/Wizard/Status.h	2016-03-11 18:12:46 +0000
@@ -0,0 +1,60 @@
++/*
++ * Copyright (C) 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef WIZARD_STATUS_H
++#define WIZARD_STATUS_H
++
++#include <QObject>
++#include <QString>
++#include <QDBusInterface>
++
++class Status: public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
++    Q_PROPERTY(QString networkIcon READ networkIcon NOTIFY networkIconChanged)
++    Q_PROPERTY(QString batteryIcon READ batteryIcon NOTIFY batteryIconChanged)
++public:
++    Status();
++    ~Status() = default;
++
++    bool online() const;
++    QString networkIcon();
++
++    QString batteryIcon() const;
++
++Q_SIGNALS:
++    void networkIconChanged();
++    void onlineChanged();
++    void batteryIconChanged();
++
++private Q_SLOTS:
++    void onNMPropertiesChanged(const QVariantMap &changedProps);
++    void onUPowerPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps);
++
++private:
++    Q_DISABLE_COPY(Status)
++
++    // network status
++    void initNM();
++    QDBusInterface * m_nmIface = nullptr;
++
++    // battery status
++    void initUPower();
++    QDBusInterface * m_upowerIface = nullptr;
++};
++
++#endif
 === modified file 'plugins/Wizard/System.cpp'
 --- plugins/Wizard/System.cpp	2015-09-23 15:14:01 +0000
 +++ plugins/Wizard/System.cpp	2016-03-11 18:12:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical Ltd.
++ * Copyright (C) 2014-2015 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 3, as published
@@ -25,10 +25,10 @@
  #include <QLocale>
  #include <QMap>
  #include <QProcess>
++#include <QDebug>
  System::System()
--    : QObject(),
--      m_fsWatcher()
++    : QObject()
+ {
      // Register the argument needed for UpdateActivationEnvironment below
      qDBusRegisterMetaType<QMap<QString,QString>>();
@@ -88,7 +88,7 @@
      QDBusConnection::sessionBus().asyncCall(msg);
+ }
--void System::updateSessionLanguage(const QString &locale)
++void System::updateSessionLocale(const QString &locale)
+ {
      const QString language = locale.split(QStringLiteral("."))[0];
@@ -106,5 +106,6 @@
                                       initctl stop smart-scopes-proxy; \
                                       initctl emit --no-wait indicator-services-start; \
                                       initctl restart --no-wait maliit-server; \
++                                     initctl restart --no-wait indicator-messages; \
                                       initctl restart --no-wait unity8-dash\""));
+ }
 === modified file 'plugins/Wizard/System.h'
 --- plugins/Wizard/System.h	2015-05-21 16:05:57 +0000
 +++ plugins/Wizard/System.h	2016-03-11 18:12:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2014 Canonical Ltd.
++ * Copyright (C) 2014-2015 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 3, as published
@@ -28,12 +28,13 @@
  public:
      System();
++    ~System() = default;
      bool wizardEnabled() const;
      void setWizardEnabled(bool enabled);
  public Q_SLOTS:
--    void updateSessionLanguage(const QString &locale);
++    void updateSessionLocale(const QString &locale);
  Q_SIGNALS:
      void wizardEnabledChanged();
 === modified file 'plugins/Wizard/plugin.cpp'
 --- plugins/Wizard/plugin.cpp	2014-11-21 19:28:16 +0000
 +++ plugins/Wizard/plugin.cpp	2016-03-11 18:12:46 +0000
@@ -17,19 +17,18 @@
  #include "plugin.h"
  #include "PageList.h"
  #include "System.h"
++#include "timezonemodel.h"
++#include "LocalePlugin.h"
++#include "Status.h"
  #include <QtQml/qqml.h>
--static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
--{
--    Q_UNUSED(engine)
--    Q_UNUSED(scriptEngine)
--    return new System();
--}
--
  void WizardPlugin::registerTypes(const char *uri)
+ {
      Q_ASSERT(uri == QLatin1String("Wizard"));
      qmlRegisterType<PageList>(uri, 0, 1, "PageList");
--    qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
++    qmlRegisterSingletonType<System>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new System; });
++    qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });
++    qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");
++    qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");
+ }
 === modified file 'plugins/Wizard/plugin.h'
 --- plugins/Wizard/plugin.h	2015-04-30 09:31:51 +0000
 +++ plugins/Wizard/plugin.h	2016-03-11 18:12:46 +0000
@@ -17,13 +17,12 @@
  #ifndef WIZARD_PLUGIN_H
  #define WIZARD_PLUGIN_H
--#include <QtQml/QQmlEngine>
  #include <QtQml/QQmlExtensionPlugin>
  class WizardPlugin : public QQmlExtensionPlugin
+ {
      Q_OBJECT
--    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++    Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
  public:
      void registerTypes(const char *uri) override;
 === added file 'plugins/Wizard/timezonemodel.cpp'
 --- plugins/Wizard/timezonemodel.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/Wizard/timezonemodel.cpp	2016-03-11 18:12:46 +0000
@@ -0,0 +1,239 @@
++/*
++ * Copyright (C) 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QDebug>
++
++#include <glib.h>
++#include <glib-object.h>
++
++#include "LocalePlugin.h"
++#include "timezonemodel.h"
++
++TimeZoneLocationModel::TimeZoneLocationModel(QObject *parent):
++    QAbstractListModel(parent),
++    m_listUpdating(false),
++    m_cancellable(nullptr)
++{
++    m_roleNames[Qt::DisplayRole] = "displayName";
++    m_roleNames[TimeZoneRole] = "timeZone";
++    m_roleNames[CityRole] = "city";
++    m_roleNames[CountryRole] = "country";
++    m_roleNames[OffsetRole] = "offset";
++    m_roleNames[LatitudeRole] = "latitude";
++    m_roleNames[LongitudeRole] = "longitude";
++}
++
++int TimeZoneLocationModel::rowCount(const QModelIndex &parent) const
++{
++    if (parent.isValid()) {
++        return 0;
++    } else if (m_filter.isEmpty()) {
++        return m_countryLocations.count();
++    } else {
++        return m_locations.count();
++    }
++}
++
++QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
++{
++    GeonamesCity *city;
++    if (m_filter.isEmpty()) {
++        city = m_countryLocations.value(index.row());
++    } else {
++        city = m_locations.value(index.row());
++    }
++    if (!city)
++        return QVariant();
++
++    switch (role) {
++    case Qt::DisplayRole:
++        return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
++                                           .arg(geonames_city_get_state(city))
++                                           .arg(geonames_city_get_country(city));
++    case SimpleRole:
++        return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
++                                       .arg(geonames_city_get_country(city));
++    case TimeZoneRole:
++        return geonames_city_get_timezone(city);
++    case CountryRole:
++        return geonames_city_get_country(city);
++    case CityRole:
++        return geonames_city_get_name(city);
++    case OffsetRole: {
++        QTimeZone tmp(geonames_city_get_timezone(city));
++        return static_cast<double>(tmp.standardTimeOffset(QDateTime::currentDateTime())) / 3600;
++    }
++    case LatitudeRole:
++        return geonames_city_get_latitude(city);
++    case LongitudeRole:
++        return geonames_city_get_longitude(city);
++    default:
++        qWarning() << Q_FUNC_INFO << "Unknown role";
++        return QVariant();
++    }
++}
++
++QHash<int, QByteArray> TimeZoneLocationModel::roleNames() const
++{
++    return m_roleNames;
++}
++
++void TimeZoneLocationModel::setModel(const QList<GeonamesCity *> &locations)
++{
++    beginResetModel();
++
++    Q_FOREACH(GeonamesCity *city, m_locations) {
++        geonames_city_free(city);
++    }
++
++    m_locations = locations;
++    endResetModel();
++}
++
++void TimeZoneLocationModel::filterFinished(GObject      *source_object,
++                                           GAsyncResult *res,
++                                           gpointer      user_data)
++{
++    Q_UNUSED(source_object);
++
++    g_autofree gint *cities = nullptr;
++    guint cities_len = 0;
++    g_autoptr(GError) error = nullptr;
++
++    cities = geonames_query_cities_finish(res, &cities_len, &error);
++    if (error) {
++        if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
++            TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
++            g_clear_object(&model->m_cancellable);
++            model->setListUpdating(false);
++            qWarning() << "Could not filter timezones:" << error->message;
++        }
++        return;
++    }
++
++    QList<GeonamesCity *> locations;
++
++    for (guint i = 0; i < cities_len; ++i) {
++        GeonamesCity *city = geonames_get_city(cities[i]);
++        if (city) {
++            locations.append(city);
++        }
++    }
++
++    TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
++
++    g_clear_object(&model->m_cancellable);
++
++    model->setModel(locations);
++    model->setListUpdating(false);
++}
++
++bool TimeZoneLocationModel::listUpdating() const
++{
++    return m_listUpdating;
++}
++
++void TimeZoneLocationModel::setListUpdating(bool listUpdating)
++{
++    if (m_listUpdating != listUpdating) {
++        m_listUpdating = listUpdating;
++        Q_EMIT listUpdatingChanged();
++    }
++}
++
++QString TimeZoneLocationModel::filter() const
++{
++    return m_filter;
++}
++
++void TimeZoneLocationModel::setFilter(const QString &filter)
++{
++    if (filter != m_filter) {
++        m_filter = filter;
++        Q_EMIT filterChanged();
++    }
++
++    setListUpdating(true);
++
++    if (m_cancellable) {
++        g_cancellable_cancel(m_cancellable);
++        g_clear_object(&m_cancellable);
++    }
++
++    setModel(QList<GeonamesCity *>());
++
++    if (filter.isEmpty()) {
++        setListUpdating(false);
++        return;
++    }
++
++    m_cancellable = g_cancellable_new();
++    geonames_query_cities(filter.toUtf8().data(),
++                          GEONAMES_QUERY_DEFAULT,
++                          m_cancellable,
++                          filterFinished,
++                          this);
++}
++
++QString TimeZoneLocationModel::country() const
++{
++    return m_country;
++}
++
++static bool citycmp(GeonamesCity *a, GeonamesCity *b)
++{
++    return geonames_city_get_population(b) < geonames_city_get_population(a);
++}
++
++void TimeZoneLocationModel::setCountry(const QString &country)
++{
++    if (m_country == country)
++        return;
++
++    m_country = country;
++
++    Q_FOREACH(GeonamesCity *city, m_countryLocations) {
++        geonames_city_free(city);
++    }
++
++    gint num_cities = geonames_get_n_cities();
++    for (gint i = 0; i < num_cities; i++) {
++        GeonamesCity *city = geonames_get_city(i);
++        if (city && m_country == geonames_city_get_country_code(city)) {
++            m_countryLocations.append(city);
++        }
++    }
++
++    std::sort(m_countryLocations.begin(), m_countryLocations.end(), citycmp);
++
++    Q_EMIT countryChanged(country);
++}
++
++TimeZoneLocationModel::~TimeZoneLocationModel()
++{
++    if (m_cancellable) {
++        g_cancellable_cancel(m_cancellable);
++        g_clear_object(&m_cancellable);
++    }
++
++    Q_FOREACH(GeonamesCity *city, m_countryLocations) {
++        geonames_city_free(city);
++    }
++
++    Q_FOREACH(GeonamesCity *city, m_locations) {
++        geonames_city_free(city);
++    }
++}
 === added file 'plugins/Wizard/timezonemodel.h'
 --- plugins/Wizard/timezonemodel.h	1970-01-01 00:00:00 +0000
 +++ plugins/Wizard/timezonemodel.h	2016-03-11 18:12:46 +0000
@@ -0,0 +1,80 @@
++/*
++ * Copyright (C) 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef TIMEZONEMODEL_H
++#define TIMEZONEMODEL_H
++
++#include <geonames.h>
++#include <glib.h>
++#include <QAbstractListModel>
++
++class TimeZoneLocationModel: public QAbstractListModel
++{
++    Q_OBJECT
++    Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
++    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
++    Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
++    Q_ENUMS(Roles)
++
++public:
++    explicit TimeZoneLocationModel(QObject *parent = nullptr);
++    ~TimeZoneLocationModel();
++
++    enum Roles {
++        TimeZoneRole = Qt::UserRole + 1,
++        CityRole,
++        CountryRole,
++        SimpleRole,
++        OffsetRole,
++        LatitudeRole,
++        LongitudeRole
++    };
++
++    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
++    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
++    QHash<int, QByteArray> roleNames() const override;
++
++    bool listUpdating() const;
++
++    QString filter() const;
++    void setFilter(const QString &filter);
++
++    QString country() const;
++    void setCountry(const QString &country);
++
++Q_SIGNALS:
++    void listUpdatingChanged();
++    void filterChanged();
++    void countryChanged(const QString &country);
++
++private:
++    void setModel(const QList<GeonamesCity *> &locations);
++    void setListUpdating(bool listUpdating);
++    static void filterFinished(GObject      *source_object,
++                               GAsyncResult *res,
++                               gpointer      user_data);
++
++
++    bool m_listUpdating;
++    QString m_filter;
++    QString m_country;
++    GCancellable *m_cancellable;
++    QHash<int, QByteArray> m_roleNames;
++    QList<GeonamesCity *> m_locations;
++    QList<GeonamesCity *> m_countryLocations;
++};
++
++#endif
 === modified file 'po/unity8.pot'
 --- po/unity8.pot	2016-03-08 21:04:17 +0000
 +++ po/unity8.pot	2016-03-11 18:12:46 +0000
@@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: unity8\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2016-03-08 21:04+0000\n"
++"POT-Creation-Date: 2016-03-10 22:48+0000\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,16 +22,16 @@
  msgid "Password: "
  msgstr ""
--#: plugins/Unity/Launcher/launcheritem.cpp:47
--#: plugins/Unity/Launcher/launcheritem.cpp:106
++#: plugins/Unity/Launcher/launcheritem.cpp:48
++#: plugins/Unity/Launcher/launcheritem.cpp:107
  msgid "Pin shortcut"
  msgstr ""
--#: plugins/Unity/Launcher/launcheritem.cpp:52
++#: plugins/Unity/Launcher/launcheritem.cpp:53
  msgid "Quit"
  msgstr ""
--#: plugins/Unity/Launcher/launcheritem.cpp:106
++#: plugins/Unity/Launcher/launcheritem.cpp:107
  msgid "Unpin shortcut"
  msgstr ""
@@ -135,15 +135,15 @@
  msgid "Restart"
  msgstr ""
--#: qml/Components/Lockscreen.qml:245
++#: qml/Components/Lockscreen.qml:231
  msgid "Return to Call"
  msgstr ""
--#: qml/Components/Lockscreen.qml:245
++#: qml/Components/Lockscreen.qml:231
  msgid "Emergency Call"
  msgstr ""
--#: qml/Components/Lockscreen.qml:277
++#: qml/Components/Lockscreen.qml:263
  msgid "OK"
  msgstr ""
@@ -152,6 +152,8 @@
  msgstr ""
  #: qml/Components/ModeSwitchWarningDialog.qml:57
++msgctxt ""
++"Re-dock means connect the device again to an external screen/mouse/keyboard"
  msgid "Re-dock, save your work and close these apps to continue."
  msgstr ""
@@ -194,15 +196,15 @@
  msgid "Add to Favorites"
  msgstr ""
--#: qml/Dash/GenericScopeView.qml:565 qml/Dash/GenericScopeView.qml:723
++#: qml/Dash/GenericScopeView.qml:567 qml/Dash/GenericScopeView.qml:725
  msgid "See less"
  msgstr ""
--#: qml/Dash/GenericScopeView.qml:565
++#: qml/Dash/GenericScopeView.qml:567
  msgid "See all"
  msgstr ""
--#: qml/Dash/GenericScopeView.qml:627
++#: qml/Dash/GenericScopeView.qml:629
  msgctxt "Label: Hint for dash search line edit"
  msgid "Search"
  msgstr ""
@@ -228,7 +230,7 @@
  msgid "Add a review"
  msgstr ""
--#: qml/Dash/Previews/PreviewSharing.qml:50
++#: qml/Dash/Previews/PreviewSharing.qml:66
  msgid "Preview Share Item"
  msgstr ""
@@ -256,13 +258,13 @@
  msgid "Also installed"
  msgstr ""
--#: qml/DisabledScreenNotice.qml:87
++#: qml/DisabledScreenNotice.qml:104
  msgid ""
  "Your device is now connected to an external display. Use this screen as a "
--"touch pad to interact with the mouse."
++"touch pad to interact with the pointer."
  msgstr ""
--#: qml/Greeter/CoverPage.qml:107
++#: qml/Greeter/CoverPage.qml:118
  msgid "Unlock"
  msgstr ""
@@ -341,62 +343,62 @@
  msgid "Conference"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:753
++#: qml/Panel/Indicators/MenuItemFactory.qml:752
  msgid "Nothing is playing"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:882
++#: qml/Panel/Indicators/MenuItemFactory.qml:881
  #, qt-format
  msgid "%1 hour"
  msgid_plural "%1 hours"
  msgstr[0] ""
  msgstr[1] ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:886
++#: qml/Panel/Indicators/MenuItemFactory.qml:885
  #, qt-format
  msgid "%1 minute"
  msgid_plural "%1 minutes"
  msgstr[0] ""
  msgstr[1] ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:891
++#: qml/Panel/Indicators/MenuItemFactory.qml:890
  #, qt-format
  msgid "%1 second"
  msgid_plural "%1 seconds"
  msgstr[0] ""
  msgstr[1] ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:894
++#: qml/Panel/Indicators/MenuItemFactory.qml:893
  msgid "0 seconds"
  msgstr ""
  #. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
--#: qml/Panel/Indicators/MenuItemFactory.qml:896
++#: qml/Panel/Indicators/MenuItemFactory.qml:895
  #, qt-format
  msgid "%1 remaining"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:902
++#: qml/Panel/Indicators/MenuItemFactory.qml:901
  msgid "In queue…"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:906
++#: qml/Panel/Indicators/MenuItemFactory.qml:905
  msgid "Downloading"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:908
++#: qml/Panel/Indicators/MenuItemFactory.qml:907
  msgid "Paused, tap to resume"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:910
++#: qml/Panel/Indicators/MenuItemFactory.qml:909
  msgid "Canceled"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:912
++#: qml/Panel/Indicators/MenuItemFactory.qml:911
  msgid "Finished"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:914
++#: qml/Panel/Indicators/MenuItemFactory.qml:913
  msgid "Failed, tap to retry"
  msgstr ""
 === modified file 'qml/Components/EdgeBarrier.qml'
 --- qml/Components/EdgeBarrier.qml	2015-11-24 17:44:18 +0000
 +++ qml/Components/EdgeBarrier.qml	2016-03-11 18:12:46 +0000
@@ -105,7 +105,7 @@
          },
          Transition {
              from: "resisting"; to: "passed"
--            UbuntuNumberAnimation { target: materialContainer; property: "opacity" }
++            UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration; target: materialContainer; property: "opacity" }
+         }
+     ]
+ }
 === modified file 'qml/Components/Lockscreen.qml'
 --- qml/Components/Lockscreen.qml	2015-07-15 15:07:19 +0000
 +++ qml/Components/Lockscreen.qml	2016-03-11 18:12:46 +0000
@@ -121,107 +121,93 @@
          opacity: root.darkenBackground
+     }
--    MouseArea {
--        anchors.fill: root
--        onClicked: {
--            if (pinPadLoader.item)
--                pinPadLoader.item.forceActiveFocus()
--        }
--    }
--
--    FocusScope {
--        id: loaderScope
++    Loader {
++        id: pinPadLoader
++        objectName: "pinPadLoader"
          anchors.fill: parent
--
--        Loader {
--            id: pinPadLoader
--            objectName: "pinPadLoader"
--            anchors.fill: parent
--            property bool resetting: false
--            property bool waiting: false
--            property bool showWrongText: false
--
--            source: {
--                if (resetting || !root.required) {
--                    return ""
--                } else if (root.delayMinutes > 0) {
--                    return "DelayedLockscreen.qml"
--                } else if (root.alphaNumeric) {
--                    return "PassphraseLockscreen.qml"
--                } else {
--                    return "PinLockscreen.qml"
--                }
--            }
--            onSourceChanged: {
--                waiting = false
--                showWrongText = false
--                if (loaderScope.activeFocus && pinPadLoader.item)
--                    pinPadLoader.item.forceActiveFocus()
--            }
--
--            Connections {
--                target: pinPadLoader.item
--
--                onEntered: {
--                    pinPadLoader.waiting = true
--                    root.entered(passphrase);
--                }
--
--                onCancel: {
--                    root.cancel()
--                }
--            }
--
--            Binding {
--                target: pinPadLoader.item
--                property: "minPinLength"
--                value: root.minPinLength
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "maxPinLength"
--                value: root.maxPinLength
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "infoText"
--                value: root.infoText
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "retryText"
--                value: root.retryText
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "errorText"
--                value: pinPadLoader.showWrongText ? root.errorText : ""
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "entryEnabled"
--                value: !pinPadLoader.waiting
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "alphaNumeric"
--                value: root.alphaNumeric
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "delayMinutes"
--                value: root.delayMinutes
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "showCancelButton"
--                value: root.showCancelButton
--            }
--            Binding {
--                target: pinPadLoader.item
--                property: "foregroundColor"
--                value: root.foregroundColor
--            }
++        property bool resetting: false
++        property bool waiting: false
++        property bool showWrongText: false
++        focus: true
++
++        source: {
++            if (resetting || !root.required) {
++                return ""
++            } else if (root.delayMinutes > 0) {
++                return "DelayedLockscreen.qml"
++            } else if (root.alphaNumeric) {
++                return "PassphraseLockscreen.qml"
++            } else {
++                return "PinLockscreen.qml"
++            }
++        }
++        onSourceChanged: {
++            waiting = false
++            showWrongText = false
++        }
++
++        Connections {
++            target: pinPadLoader.item
++
++            onEntered: {
++                pinPadLoader.waiting = true
++                root.entered(passphrase);
++            }
++
++            onCancel: {
++                root.cancel()
++            }
++        }
++
++        Binding {
++            target: pinPadLoader.item
++            property: "minPinLength"
++            value: root.minPinLength
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "maxPinLength"
++            value: root.maxPinLength
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "infoText"
++            value: root.infoText
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "retryText"
++            value: root.retryText
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "errorText"
++            value: pinPadLoader.showWrongText ? root.errorText : ""
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "entryEnabled"
++            value: !pinPadLoader.waiting
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "alphaNumeric"
++            value: root.alphaNumeric
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "delayMinutes"
++            value: root.delayMinutes
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "showCancelButton"
++            value: root.showCancelButton
++        }
++        Binding {
++            target: pinPadLoader.item
++            property: "foregroundColor"
++            value: root.foregroundColor
+         }
+     }
 === modified file 'qml/Components/ModeSwitchWarningDialog.qml'
 --- qml/Components/ModeSwitchWarningDialog.qml	2015-11-25 13:57:34 +0000
 +++ qml/Components/ModeSwitchWarningDialog.qml	2016-03-11 18:12:46 +0000
@@ -54,7 +54,7 @@
+     }
      Label {
--        text: i18n.tr("Re-dock, save your work and close these apps to continue.")
++        text: i18n.ctr("Re-dock means connect the device again to an external screen/mouse/keyboard", "Re-dock, save your work and close these apps to continue.")
          wrapMode: Text.WordWrap
          color: "#888888"
+     }
 === modified file 'qml/Components/PassphraseLockscreen.qml'
 --- qml/Components/PassphraseLockscreen.qml	2015-07-15 15:07:19 +0000
 +++ qml/Components/PassphraseLockscreen.qml	2016-03-11 18:12:46 +0000
@@ -18,10 +18,11 @@
  import Ubuntu.Components 1.3
  import "../Components"
--Item {
++FocusScope {
      id: root
      y: units.gu(4)
      height: shakeContainer.height
++    focus: true
      property string infoText
      property string errorText
@@ -42,8 +43,6 @@
+         }
+     }
--    onActiveFocusChanged: if (activeFocus) pinentryField.forceActiveFocus()
--
      Column {
          id: shakeContainer
          anchors.horizontalCenter: parent.horizontalCenter
@@ -59,14 +58,16 @@
              text: root.infoText
+         }
--        Item {
++        FocusScope {
              id: entryContainer
              anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
              height: units.gu(4)
++            focus: true
              TextInput {
                  id: pinentryField
                  objectName: "pinentryField"
++                focus: true
                  property bool incorrectOverride: false
 === modified file 'qml/Components/PhysicalKeysMapper.qml'
 --- qml/Components/PhysicalKeysMapper.qml	2016-01-13 18:43:34 +0000
 +++ qml/Components/PhysicalKeysMapper.qml	2016-03-11 18:12:46 +0000
@@ -42,12 +42,15 @@
      signal screenshotTriggered;
      readonly property bool altTabPressed: d.altTabPressed
++    readonly property bool superPressed: d.superPressed
++    readonly property bool superTabPressed: d.superTabPressed
      property int powerKeyLongPressTime: 2000
      // For testing. If running windowed (e.g. tryShell), Alt+Tab is taken by the
      // running desktop, set this to true to use Ctrl+Tab instead.
      property bool controlInsteadOfAlt: false
++    property bool controlInsteadOfSuper: false
      QtObject {
          id: d
@@ -59,6 +62,9 @@
          property bool altPressed: false
          property bool altTabPressed: false
++        property bool superPressed: false
++        property bool superTabPressed: false
++
          property var powerButtonPressStart: 0
          // We need to eat ALT presses until we know what they're for (Alt+Tab or going to the app?)
@@ -119,11 +125,23 @@
                  event.accepted = true;
                  d.altPressInjected = false;
+             }
++
++        // Adding MetaModifier here because that's what keyboards do. Pressing Super_L actually gives
++        // Super_L + MetaModifier. This helps to make sure we only invoke superPressed if no other
++        // Modifier is pressed too.
++        } else if (((event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R) && event.modifiers === Qt.MetaModifier)
++                    || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)
++                    ) {
++            d.superPressed = true;
          } else if (event.key == Qt.Key_Tab) {
              if (d.altPressed && !d.altTabPressed) {
                  d.altTabPressed = true;
                  event.accepted = true;
+             }
++            if (d.superPressed && !d.superTabPressed) {
++                d.superTabPressed = true;
++                event.accepted = true;
++            }
+         }
+     }
@@ -154,6 +172,12 @@
              if (d.altTabPressed) {
                  event.accepted = true;
+             }
++        } else if (event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)) {
++            d.superPressed = false;
++            if (d.superTabPressed) {
++                d.superTabPressed = false;
++                event.accepted = true;
++            }
+         }
+     }
+ }
 === modified file 'qml/Components/PinLockscreen.qml'
 --- qml/Components/PinLockscreen.qml	2015-07-15 15:07:19 +0000
 +++ qml/Components/PinLockscreen.qml	2016-03-11 18:12:46 +0000
@@ -19,8 +19,9 @@
  import Ubuntu.Components.ListItems 1.3
  import "../Components"
--Item {
++FocusScope {
      id: root
++    focus: true
      property string infoText
      property string retryText
@@ -45,6 +46,24 @@
+         }
+     }
++    Keys.onPressed: {
++        if (pinentryField.text.length == root.maxPinLength)
++            return;
++
++        if (event.key === Qt.Key_Backspace) {
++            pinentryField.backspace();
++        } else if (event.key === Qt.Key_Delete || event.key === Qt.Key_Escape) {
++            closeButton.clicked()
++        } else if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
++            confirmButton.clicked()
++        } else {
++            var digit = parseInt(event.text);
++            if (!isNaN(digit) && typeof digit == "number") {
++                pinentryField.appendNumber(digit);
++            }
++        }
++    }
++
      Column {
          anchors {
              left: parent.left;
@@ -204,6 +223,7 @@
                  width: numbersGrid.buttonWidth
+             }
              PinPadButton {
++                id: closeButton
                  iconName: "close"
                  height: units.gu(5) // visual spec has this row a little closer in
                  width: numbersGrid.buttonWidth
@@ -216,6 +236,7 @@
                  width: numbersGrid.buttonWidth
+             }
              PinPadButton {
++                id: confirmButton
                  iconName: "tick"
                  objectName: "confirmButton"
                  height: units.gu(5)
 === modified file 'qml/Components/ShellDialog.qml'
 --- qml/Components/ShellDialog.qml	2015-11-06 10:06:58 +0000
 +++ qml/Components/ShellDialog.qml	2016-03-11 18:12:46 +0000
@@ -37,7 +37,15 @@
      focus: true
++    // FIXME: this is a hack because Dialog subtheming seems broken atm
++    // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
++    ThemeSettings {
++        id: themeHack
++        name: "Ubuntu.Components.Themes.Ambiance"
++    }
++
      Component.onCompleted: {
++        __foreground.theme = themeHack
          show();
+     }
+ }
 === modified file 'qml/Dash/CardCarousel.qml'
 --- qml/Dash/CardCarousel.qml	2016-01-28 14:11:14 +0000
 +++ qml/Dash/CardCarousel.qml	2016-03-11 18:12:46 +0000
@@ -66,7 +66,6 @@
                  item.cardData = Qt.binding(function() { return model; });
                  item.fontScale = Qt.binding(function() { return carousel.fontScale; });
                  item.showHeader = Qt.binding(function() { return loader.explicitlyScaled; });
--                item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
                  item.artShapeStyle = "shadow";
                  item.scopeStyle = cardCarousel.scopeStyle;
+             }
 === modified file 'qml/Dash/CardGrid.qml'
 --- qml/Dash/CardGrid.qml	2016-02-02 08:47:07 +0000
 +++ qml/Dash/CardGrid.qml	2016-03-11 18:12:46 +0000
@@ -70,7 +70,6 @@
                      item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
                      item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
                      item.cardData = Qt.binding(function() { return model; });
--                    item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
                      item.scopeStyle = root.scopeStyle;
                      item.artShapeStyle = root.artShapeStyle;
                      item.backgroundShapeStyle = root.backgroundShapeStyle;
 === modified file 'qml/Dash/CardHorizontalList.qml'
 --- qml/Dash/CardHorizontalList.qml	2016-01-28 14:11:14 +0000
 +++ qml/Dash/CardHorizontalList.qml	2016-03-11 18:12:46 +0000
@@ -53,7 +53,6 @@
                  item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
                  item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
                  item.cardData = Qt.binding(function() { return model; });
--                item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
                  item.scopeStyle = root.scopeStyle;
+             }
              Connections {
 === modified file 'qml/Dash/CardTool.qml'
 --- qml/Dash/CardTool.qml	2016-01-28 14:11:14 +0000
 +++ qml/Dash/CardTool.qml	2016-03-11 18:12:46 +0000
@@ -66,7 +66,7 @@
          return layout;
+     }
--    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components);
++    property var cardComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, false);
      // FIXME: Saviq
      // Only way for the card below to actually be laid out completely.
@@ -139,29 +139,6 @@
      readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0
      property size artShapeSize: cardLoader.item ? cardLoader.item.artShapeSize : 0
--    /*!
--     \brief Desired alignment of title
--     */
--    readonly property int titleAlignment: {
--        if (template["card-layout"] === "horizontal"
--            || typeof components["title"] !== "object"
--            || components["title"]["align"] === "left") return Text.AlignLeft;
--
--        var keys = ["mascot", "emblem", "subtitle", "attributes", "summary"];
--
--        for (var key in keys) {
--            key = keys[key];
--            try {
--                if (typeof components[key] === "string"
--                    || typeof components[key]["field"] === "string") return Text.AlignLeft;
--            } catch (e) {
--                continue;
--            }
--        }
--
--        return Text.AlignHCenter;
--    }
--
      QtObject {
          id: carouselTool
@@ -216,10 +193,9 @@
              "summary": "—\n—\n—\n—\n—",
              "attributes": attributesModel.model
+         }
--        sourceComponent: cardTool.cardComponent
++        sourceComponent: CardCreatorCache.getCardComponent(cardTool.template, cardTool.components, true);
          onLoaded: {
              item.objectName = "cardToolCard";
--            item.asynchronous = false;
              item.width = Qt.binding(function() { return cardTool.cardWidth !== -1 ? cardTool.cardWidth : item.implicitWidth; });
              item.height = Qt.binding(function() { return cardTool.cardHeight !== -1 ? cardTool.cardHeight : item.implicitHeight; });
+         }
 === modified file 'qml/Dash/CardVerticalJournal.qml'
 --- qml/Dash/CardVerticalJournal.qml	2016-01-28 14:11:14 +0000
 +++ qml/Dash/CardVerticalJournal.qml	2016-03-11 18:12:46 +0000
@@ -72,7 +72,6 @@
                  item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
                  item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });
                  item.cardData = Qt.binding(function() { return model; });
--                item.titleAlignment = Qt.binding(function() { return cardTool.titleAlignment; });
                  item.scopeStyle = root.scopeStyle;
+             }
              Connections {
 === modified file 'qml/Dash/Dash.qml'
 --- qml/Dash/Dash.qml	2015-11-19 16:55:31 +0000
 +++ qml/Dash/Dash.qml	2016-03-11 18:12:46 +0000
@@ -37,6 +37,7 @@
+     }
      property bool windowActive: window.active
++    property bool showOverlayScope: false
      DashCommunicatorService {
          objectName: "dashCommunicatorService"
@@ -80,7 +81,7 @@
              return
+         }
--        closeOverlayScope();
++        dash.showOverlayScope = false;
          dashContent.closePreview();
@@ -93,12 +94,6 @@
          dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
+     }
--    function closeOverlayScope() {
--        if (dashContent.x != 0) {
--            dashContent.x = 0;
--        }
--    }
--
      Scopes {
          id: scopes
+     }
@@ -133,12 +128,13 @@
          height: dash.height
          scopes: scopes
          visible: x != -width
++        x: dash.showOverlayScope ? -width : 0
          onGotoScope: {
              dash.setCurrentScope(scopeId, true, false);
+         }
          onOpenScope: {
              scopeItem.scope = scope;
--            x = -width;
++            dash.showOverlayScope = true;
+         }
          Behavior on x {
              UbuntuNumberAnimation {
@@ -207,7 +203,7 @@
                  bottomEdgeController.enableAnimation = true;
                  bottomEdgeController.progress = 0;
                  scopeItem.scope = scope;
--                dashContent.x = -dashContent.width;
++                dash.showOverlayScope = true;
+             }
              onGotoScope: {
                  bottomEdgeController.enableAnimation = true;
@@ -226,7 +222,7 @@
          id: scopeItem
          objectName: "dashTempScopeItem"
--        x: dashContent.x + width
++        x: dash.showOverlayScope ? 0 : width
          y: dashContent.y
          width: parent.width
          height: parent.height
@@ -234,7 +230,7 @@
          hasBackAction: true
          isCurrent: visible
          onBackClicked: {
--            closeOverlayScope();
++            dash.showOverlayScope = false;
              closePreview();
+         }
@@ -250,6 +246,10 @@
                  scopes.closeScope(oldScope);
+             }
+         }
++
++        Behavior on x {
++            UbuntuNumberAnimation { }
++        }
+     }
      Rectangle {
 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2016-02-19 11:50:12 +0000
 +++ qml/Dash/GenericScopeView.qml	2016-03-11 18:12:46 +0000
@@ -370,6 +370,8 @@
                              } else {
                                  cardTool.cardWidth = units.gu(10);
+                             }
++                        } else {
++                            cardTool.cardWidth = units.gu(12);
+                         }
                          item.minimumHorizontalSpacing = item.defaultMinimumHorizontalSpacing;
+                     }
 === modified file 'qml/Dash/Previews/PreviewHeader.qml'
 --- qml/Dash/Previews/PreviewHeader.qml	2016-01-08 14:19:08 +0000
 +++ qml/Dash/Previews/PreviewHeader.qml	2016-03-11 18:12:46 +0000
@@ -25,6 +25,7 @@
   *  The mascot fall back image comes in widgetData["fallback"]
   *  The subtitle comes in widgetData["subtitle"]
   *  The attributes comes in widgetData["attributes"]
++ *  The emblem comes in widgetData["emblem"]
   */
  PreviewWidget {
@@ -40,6 +41,7 @@
          readonly property string title: root.widgetData["title"] || ""
          readonly property string subtitle: root.widgetData["subtitle"] || ""
          readonly property var attributes: root.widgetData["attributes"] || null
++        readonly property url emblem: root.widgetData["emblem"] || ""
          readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
          // Rewire the source since we may have unwired it on onStatusChanged
@@ -98,16 +100,42 @@
                  spacing: units.dp(2)
                  anchors.verticalCenter: parent.verticalCenter
--                Label {
--                    id: titleLabel
--                    objectName: "titleLabel"
++                Item {
                      anchors { left: parent.left; right: parent.right }
--                    elide: Text.ElideRight
--                    font.weight: Font.Normal
--                    fontSize: "large"
--                    wrapMode: Text.Wrap
--                    color: headerRoot.fontColor
--                    text: headerRoot.title
++                    height: titleLabel.height
++
++                    Label {
++                        id: titleLabel
++                        objectName: "titleLabel"
++                        anchors {
++                            left: parent.left;
++                            right: iconLoader.right
++                            rightMargin: iconLoader.width > 0 ? units.gu(0.5) : 0
++                        }
++                        elide: Text.ElideRight
++                        font.weight: Font.Normal
++                        fontSize: "large"
++                        wrapMode: Text.Wrap
++                        color: headerRoot.fontColor
++                        text: headerRoot.title
++                    }
++
++                    Loader {
++                        id: iconLoader
++                        active: headerRoot.emblem != ""
++                        anchors {
++                            bottom: titleLabel.baseline
++                            right: parent.right
++                        }
++                        sourceComponent: Icon {
++                            objectName: "emblemIcon"
++                            source: headerRoot.emblem
++                            color: headerRoot.fontColor
++                            height: source != "" ? titleLabel.font.pixelSize : 0
++                            // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
++                            width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
++                        }
++                    }
+                 }
                  Loader {
 === modified file 'qml/Dash/Previews/PreviewOverlay.qml'
 --- qml/Dash/Previews/PreviewOverlay.qml	2015-07-15 15:07:19 +0000
 +++ qml/Dash/Previews/PreviewOverlay.qml	2016-03-11 18:12:46 +0000
@@ -158,7 +158,7 @@
                  anchors.centerIn: parent
                  width: units.gu(2.5)
                  height: width
--                color: theme.palette.normal.foregroundText
++                color: "white"
                  name: "close"
+             }
+         }
 === modified file 'qml/Dash/Previews/PreviewSharing.qml'
 --- qml/Dash/Previews/PreviewSharing.qml	2015-12-17 15:42:39 +0000
 +++ qml/Dash/Previews/PreviewSharing.qml	2016-03-11 18:12:46 +0000
@@ -44,6 +44,22 @@
+         }
+     }
++    function createExportedItems(url) {
++        var items = new Array();
++        if (typeof url === "string") {
++            var exportItem = exportItemComponent.createObject();
++            exportItem.url = url;
++            items.push(exportItem);
++        } else {
++            for (var i = 0; i < url.length; i++) {
++                var exportItem = exportItemComponent.createObject();
++                exportItem.url = url[i];
++                items.push(exportItem);
++            }
++        }
++        return items;
++    }
++
      Component {
          id: exportItemComponent
          ContentItem {
@@ -76,13 +92,7 @@
              onPeerSelected: {
                  var transfer = peer.request();
                  if (transfer.state === ContentTransfer.InProgress) {
--                    var items = new Array();
--                    for (var i = 0; i < url.length; i++) {
--                        var exportItem = exportItemComponent.createObject();
--                        exportItem.url = url[i];
--                        items.push(exportItem);
--                    }
--                    transfer.items = items;
++                    transfer.items = createExportedItems(url);
                      transfer.state = ContentTransfer.Charged;
+                 }
                  peerPicker.visible = false;
 === modified file 'qml/Dash/ScopesListCategoryItem.qml'
 --- qml/Dash/ScopesListCategoryItem.qml	2015-11-04 14:57:13 +0000
 +++ qml/Dash/ScopesListCategoryItem.qml	2016-03-11 18:12:46 +0000
@@ -18,7 +18,7 @@
  import QtQuick.Layouts 1.1
  import Ubuntu.Components 1.3
--MouseArea {
++AbstractButton {
      id: root
      signal requestFavorite(string scopeId, bool favorite)
@@ -84,15 +84,19 @@
                  visible: text != ""
+             }
+         }
--        MouseArea {
++        AbstractButton {
              id: starArea
              objectName: "starArea"
              height: parent.height
              width: height
              anchors.right: parent.right
              onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite);
--            onPressed: if (editMode) root.handlePressed(starArea);
--            onReleased: if (editMode) root.handleReleased(starArea);
++            onPressedChanged: {
++                if (editMode) {
++                    if (pressed) root.handlePressed(starArea.__mouseArea);
++                    else root.handleReleased(starArea.__mouseArea);
++                }
++            }
              visible: editMode || showStar
              Icon {
                  id: star
 === modified file 'qml/DeviceConfiguration.qml'
 --- qml/DeviceConfiguration.qml	2015-12-01 13:56:54 +0000
 +++ qml/DeviceConfiguration.qml	2016-03-11 18:12:46 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2015-2016 Canonical, Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
   */
  import QtQuick 2.4
++import Utils 0.1
  QtObject {
      id: root
@@ -34,57 +35,83 @@
      readonly property alias category: priv.category
++    readonly property var deviceConfigParser: DeviceConfigParser {
++        name: root.name
++    }
++
      readonly property var priv: StateGroup {
          id: priv
--        property int primaryOrientation: root.useNativeOrientation
--
--        property int supportedOrientations: Qt.PortraitOrientation
--                                          | Qt.InvertedPortraitOrientation
--                                          | Qt.LandscapeOrientation
--                                          | Qt.InvertedLandscapeOrientation
--
--        property int landscapeOrientation: Qt.LandscapeOrientation
--        property int invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
--        property int portraitOrientation: Qt.PortraitOrientation
--        property int invertedPortraitOrientation: Qt.InvertedPortraitOrientation
--
--        // Supported values so far:
--        // "phone", "tablet" or "desktop"
--        property string category: "phone"
++        property int primaryOrientation: deviceConfigParser.primaryOrientation == Qt.PrimaryOrientation ?
++                                             root.useNativeOrientation : deviceConfigParser.primaryOrientation
++
++        property int supportedOrientations: deviceConfigParser.supportedOrientations
++
++        property int landscapeOrientation: deviceConfigParser.landscapeOrientation
++        property int invertedLandscapeOrientation: deviceConfigParser.invertedLandscapeOrientation
++        property int portraitOrientation: deviceConfigParser.portraitOrientation
++        property int invertedPortraitOrientation: deviceConfigParser.invertedPortraitOrientation
++        property string category: deviceConfigParser.category
          states: [
              State {
                  name: "mako"
                  PropertyChanges {
                      target: priv
++                    primaryOrientation: root.useNativeOrientation
                      supportedOrientations: Qt.PortraitOrientation
                                           | Qt.LandscapeOrientation
                                           | Qt.InvertedLandscapeOrientation
++                    landscapeOrientation: Qt.LandscapeOrientation
++                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
++                    portraitOrientation: Qt.PortraitOrientation
++                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
++                    category: "phone"
+                 }
              },
              State {
                  name: "krillin"
                  PropertyChanges {
                      target: priv
++                    primaryOrientation: root.useNativeOrientation
                      supportedOrientations: Qt.PortraitOrientation
                                           | Qt.LandscapeOrientation
                                           | Qt.InvertedLandscapeOrientation
++                    landscapeOrientation: Qt.LandscapeOrientation
++                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
++                    portraitOrientation: Qt.PortraitOrientation
++                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
++                    category: "phone"
+                 }
              },
              State {
                  name: "arale"
                  PropertyChanges {
                      target: priv
++                    primaryOrientation: root.useNativeOrientation
                      supportedOrientations: Qt.PortraitOrientation
                                           | Qt.LandscapeOrientation
                                           | Qt.InvertedLandscapeOrientation
++                    landscapeOrientation: Qt.LandscapeOrientation
++                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
++                    portraitOrientation: Qt.PortraitOrientation
++                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
++                    category: "phone"
+                 }
              },
              State {
                  name: "manta"
                  PropertyChanges {
                      target: priv
++                    primaryOrientation: root.useNativeOrientation
++                    supportedOrientations: Qt.PortraitOrientation
++                                         | Qt.InvertedPortraitOrientation
++                                         | Qt.LandscapeOrientation
++                                         | Qt.InvertedLandscapeOrientation
++                    landscapeOrientation: Qt.LandscapeOrientation
++                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
++                    portraitOrientation: Qt.PortraitOrientation
++                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
                      category: "tablet"
+                 }
              },
@@ -92,9 +119,15 @@
                  name: "flo"
                  PropertyChanges {
                      target: priv
++                    primaryOrientation: Qt.InvertedLandscapeOrientation
++                    supportedOrientations: Qt.PortraitOrientation
++                                         | Qt.InvertedPortraitOrientation
++                                         | Qt.LandscapeOrientation
++                                         | Qt.InvertedLandscapeOrientation
                      landscapeOrientation: Qt.InvertedLandscapeOrientation
                      invertedLandscapeOrientation: Qt.LandscapeOrientation
--                    primaryOrientation: Qt.InvertedLandscapeOrientation
++                    portraitOrientation: Qt.PortraitOrientation
++                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
                      category: "tablet"
+                 }
              },
@@ -102,8 +135,13 @@
                  name: "desktop"
                  PropertyChanges {
                      target: priv
++                    primaryOrientation: root.useNativeOrientation
++                    supportedOrientations: root.useNativeOrientation
++                    landscapeOrientation: Qt.LandscapeOrientation
++                    invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation
++                    portraitOrientation: Qt.PortraitOrientation
++                    invertedPortraitOrientation: Qt.InvertedPortraitOrientation
                      category: "desktop"
--                    supportedOrientations: root.useNativeOrientation
+                 }
+             }
+         ]
 === modified file 'qml/DisabledScreenNotice.qml'
 --- qml/DisabledScreenNotice.qml	2016-01-26 15:29:54 +0000
 +++ qml/DisabledScreenNotice.qml	2016-03-11 18:12:46 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.4
  import QtQuick.Layouts 1.1
  import Ubuntu.Components 1.3
++import Unity.Session 0.1
  import QtQuick.Window 2.2
  import "Components"
@@ -25,19 +26,36 @@
      property bool infoNoteDisplayed: true
--    WallpaperResolver {
--        width: root.width
--        id: wallpaperResolver
++    // For testing
++    property var screen: Screen
++    property var orientationLock: OrientationLock
++
++    DeviceConfiguration {
++        id: deviceConfiguration
++        name: applicationArguments.deviceName
+     }
      Item {
          id: contentContainer
++        objectName: "contentContainer"
          anchors.centerIn: parent
          height: rotation == 90 || rotation == 270 ? parent.width : parent.height
          width: rotation == 90 || rotation == 270 ? parent.height : parent.width
++        property int savedOrientation: deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation
++                                       ? (root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation)
++                                       : deviceConfiguration.primaryOrientation
++
          rotation: {
--            switch (Screen.orientation) {
++            var usedOrientation = root.screen.orientation;
++
++            if (root.orientationLock.enabled) {
++                usedOrientation = savedOrientation;
++            }
++
++            savedOrientation = usedOrientation;
++
++            switch (usedOrientation) {
              case Qt.PortraitOrientation:
                  return 0;
              case Qt.LandscapeOrientation:
@@ -47,6 +65,8 @@
              case Qt.InvertedLandscapeOrientation:
                  return 90;
+             }
++
++            return 0;
+         }
          transformOrigin: Item.Center
@@ -60,9 +80,9 @@
+             }
+         }
--        Image {
++        Rectangle {
              anchors.fill: parent
--            source: wallpaperResolver.background
++            color: "#3b3b3b"
+         }
          Item {
@@ -74,22 +94,26 @@
                  UbuntuNumberAnimation { }
+             }
--            Rectangle {
--                anchors.fill: parent
--                color: "black"
--                opacity: 0.4
--            }
--
--            Label {
--                id: text
++            Column {
                  anchors.centerIn: parent
                  width: parent.width - units.gu(8)
--                text: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the mouse.")
--                color: "white"
--                horizontalAlignment: Text.AlignHCenter
--                verticalAlignment: Text.AlignVCenter
--                fontSize: "x-large"
--                wrapMode: Text.Wrap
++                spacing: units.gu(4)
++
++                Label {
++                    id: text
++                    text: i18n.tr("Your device is now connected to an external display. Use this screen as a touch pad to interact with the pointer.")
++                    color: "white"
++                    width: parent.width
++                    fontSize: "large"
++                    wrapMode: Text.Wrap
++                }