Merge lp://qastaging/~ci-train-bot/unity8/unity8-ubuntu-xenial-landing-064 into lp://qastaging/unity8
Proposed by
Michał Sawicz
Status: | Merged | ||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 2274 | ||||||||||||||||||||||||||||||||||||
Proposed branch: | lp://qastaging/~ci-train-bot/unity8/unity8-ubuntu-xenial-landing-064 | ||||||||||||||||||||||||||||||||||||
Merge into: | lp://qastaging/unity8 | ||||||||||||||||||||||||||||||||||||
Diff against target: |
10220 lines (+4844/-1194) 151 files modified
CMakeLists.txt (+1/-1) cmake/modules/QmlTest.cmake (+1/-1) data/com.canonical.Unity8.gschema.xml (+11/-0) data/unity8-dash.conf (+1/-0) debian/changelog (+91/-0) debian/control (+7/-6) debian/unity8-common.udev (+2/-0) debian/unity8-doc.install (+1/-0) doc/devices.conf (+30/-0) plugins/AccountsService/AccountsService.cpp (+244/-397) plugins/AccountsService/AccountsService.h (+26/-21) plugins/AccountsService/AccountsServiceDBusAdaptor.cpp (+11/-4) plugins/AccountsService/AccountsServiceDBusAdaptor.h (+5/-6) 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/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 (+1/-0) plugins/Utils/deviceconfigparser.cpp (+150/-0) plugins/Utils/deviceconfigparser.h (+62/-0) plugins/Utils/plugin.cpp (+2/-0) po/unity8.pot (+29/-27) qml/Components/EdgeBarrier.qml (+1/-1) qml/Components/InputMethod.qml (+1/-9) 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/Infographics.qml (+2/-1) qml/Greeter/NarrowView.qml (+14/-1) qml/Launcher/Launcher.qml (+144/-11) 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/-1) qml/Panel/Panel.qml (+5/-1) qml/ScopeTool.qml (+0/-8) qml/Shell.qml (+51/-1) qml/Stages/AbstractStage.qml (+3/-1) qml/Stages/DesktopSpread.qml (+64/-17) qml/Stages/DesktopSpreadDelegate.qml (+15/-1) qml/Stages/DesktopStage.qml (+34/-34) qml/Stages/PhoneStage.qml (+77/-3) qml/Stages/SpreadDelegate.qml (+20/-0) qml/Stages/TabletStage.qml (+83/-3) qml/Stages/WindowResizeArea.qml (+8/-5) 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/tests/test_helpers.py (+0/-2) 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/Unity/Application/MirSurface.cpp (+6/-2) tests/mocks/Unity/Application/MirSurface.h (+2/-1) tests/mocks/Unity/Application/SurfaceManager.cpp (+8/-9) tests/mocks/Unity/Application/SurfaceManager.h (+3/-3) tests/mocks/Unity/Application/VirtualKeyboard.cpp (+3/-2) tests/mocks/Unity/Application/VirtualKeyboard.h (+1/-1) tests/mocks/Unity/Application/plugin.cpp (+2/-1) tests/mocks/Unity/Launcher/MockLauncherModel.cpp (+2/-0) tests/mocks/Utils/CMakeLists.txt (+1/-0) tests/mocks/Utils/plugin.cpp (+2/-0) tests/plugins/AccountsService/CMakeLists.txt (+5/-0) tests/plugins/AccountsService/PropertiesServer.cpp (+16/-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 (+63/-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/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_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/tst_DeviceConfiguration.qml (+49/-0) tests/qmltests/tst_DisabledScreenNotice.qml (+76/-2) tests/qmltests/tst_OrientedShell.qml (+1/-1) tests/qmltests/tst_Shell.qml (+243/-61) |
||||||||||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/~ci-train-bot/unity8/unity8-ubuntu-xenial-landing-064 | ||||||||||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity Team | Pending | ||
Review via email:
|
To post a comment you must log in.