Merge lp://staging/~ci-train-bot/unity8/unity8-ubuntu-yakkety-landing-059 into lp://staging/unity8
Proposed by
Michał Sawicz
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 2440 | ||||||||||||||||
Proposed branch: | lp://staging/~ci-train-bot/unity8/unity8-ubuntu-yakkety-landing-059 | ||||||||||||||||
Merge into: | lp://staging/unity8 | ||||||||||||||||
Diff against target: |
14480 lines (+2342/-7398) 240 files modified
CMakeLists.txt (+13/-2) debian/changelog (+65/-0) debian/control (+5/-3) debian/unity8-private.install (+0/-1) libs/CMakeLists.txt (+0/-1) libs/UbuntuGestures/CMakeLists.txt (+0/-41) libs/UbuntuGestures/CandidateInactivityTimer.cpp (+0/-46) libs/UbuntuGestures/CandidateInactivityTimer.h (+0/-51) libs/UbuntuGestures/DebugHelpers.cpp (+0/-95) libs/UbuntuGestures/DebugHelpers.h (+0/-31) libs/UbuntuGestures/Pool.h (+0/-124) libs/UbuntuGestures/TimeSource.cpp (+0/-49) libs/UbuntuGestures/TimeSource.h (+0/-64) libs/UbuntuGestures/Timer.cpp (+0/-152) libs/UbuntuGestures/Timer.h (+0/-122) libs/UbuntuGestures/TouchOwnershipEvent.cpp (+0/-35) libs/UbuntuGestures/TouchOwnershipEvent.h (+0/-50) libs/UbuntuGestures/TouchRegistry.cpp (+0/-553) libs/UbuntuGestures/TouchRegistry.h (+0/-201) libs/UbuntuGestures/UbuntuGesturesGlobal.h (+0/-23) libs/UbuntuGestures/UnownedTouchEvent.cpp (+0/-39) libs/UbuntuGestures/UnownedTouchEvent.h (+0/-45) plugins/Cursor/CMakeLists.txt (+2/-1) plugins/Cursor/Cursor.qml (+21/-5) plugins/Cursor/Cursor.qmltypes (+0/-78) plugins/Cursor/CursorImageInfo.cpp (+106/-0) plugins/Cursor/CursorImageInfo.h (+76/-0) plugins/Cursor/CursorImageProvider.cpp (+52/-23) plugins/Cursor/CursorImageProvider.h (+12/-4) plugins/Cursor/MousePointer.cpp (+29/-24) plugins/Cursor/MousePointer.h (+5/-6) plugins/Cursor/plugin.cpp (+4/-2) plugins/Cursor/qmldir (+1/-1) plugins/Dash/AudioProgressBar.qml (+1/-1) plugins/Dash/CardCreator.js (+64/-48) plugins/Dash/CardCreatorCache.qml (+2/-2) plugins/Dash/ScopeStyle.qml (+1/-1) plugins/Dash/listviewwithpageheader.cpp (+14/-17) plugins/Ubuntu/Gestures/AxisVelocityCalculator.h (+1/-1) plugins/Ubuntu/Gestures/CMakeLists.txt (+5/-5) plugins/Ubuntu/Gestures/Damper.cpp (+0/-24) plugins/Ubuntu/Gestures/Damper.h (+0/-89) plugins/Ubuntu/Gestures/Direction.h (+1/-0) plugins/Ubuntu/Gestures/DirectionalDragArea.cpp (+0/-932) plugins/Ubuntu/Gestures/DirectionalDragArea.h (+0/-143) plugins/Ubuntu/Gestures/DirectionalDragArea_p.h (+0/-169) plugins/Ubuntu/Gestures/Gestures.qmltypes (+0/-132) plugins/Ubuntu/Gestures/MouseEventGenerator.cpp (+48/-134) plugins/Ubuntu/Gestures/MouseEventGenerator.h (+23/-61) plugins/Ubuntu/Gestures/PressedOutsideNotifier.h (+1/-1) plugins/Ubuntu/Gestures/TouchGate.cpp (+2/-2) plugins/Ubuntu/Gestures/TouchGestureArea.cpp (+9/-6) plugins/Ubuntu/Gestures/TouchGestureArea.h (+2/-3) plugins/Ubuntu/Gestures/plugin.cpp (+3/-5) plugins/Unity/InputInfo/plugin.h (+1/-1) plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h (+3/-3) plugins/Unity/Session/dbusunitysessionservice.cpp (+7/-0) plugins/Utils/WindowInputMonitor.cpp (+8/-8) plugins/Utils/WindowInputMonitor.h (+8/-2) plugins/Utils/windowstatestorage.h (+13/-3) po/unity8.pot (+22/-22) qml/Components/Dialogs.qml (+2/-2) qml/Components/DragHandle.qml (+44/-26) qml/Components/FloatingFlickable.qml (+59/-0) qml/Components/Header.qml (+0/-28) qml/Components/ModeSwitchWarningDialog.qml (+1/-1) qml/Components/PanelState/PanelState.qml (+3/-3) qml/Components/Rating.qml (+1/-0) qml/Components/RatingStyle.qml (+3/-0) qml/Components/WindowControlButtons.qml (+18/-7) qml/Dash/CardCarousel.qml (+0/-1) qml/Dash/CardGrid.qml (+0/-2) qml/Dash/CardTool.qml (+6/-2) qml/Dash/Dash.qml (+3/-3) qml/Dash/DashApplication.qml (+0/-3) qml/Dash/DashCategoryBase.qml (+3/-11) qml/Dash/DashPageHeader.qml (+32/-37) qml/Dash/Filters/FilterOptionSelector.qml (+4/-0) qml/Dash/Filters/FilterWidgetFactory.qml (+8/-0) qml/Dash/GenericScopeView.qml (+14/-4) qml/Dash/PageHeaderExtraPanel.qml (+35/-11) qml/Dash/Previews/PreviewActions.qml (+1/-1) qml/Dash/Previews/PreviewPayments.qml (+1/-1) qml/Dash/Previews/PreviewRatingInput.qml (+42/-43) qml/Dash/ScopesList.qml (+1/-13) qml/Launcher/Launcher.qml (+16/-24) qml/Launcher/LauncherDelegate.qml (+2/-2) qml/Notifications/Notification.qml (+20/-5) qml/Notifications/NotificationMenuItemFactory.qml (+3/-0) qml/Notifications/Notifications.qml (+18/-9) qml/Panel/Indicators/MessageMenuItemFactory.qml (+1/-5) qml/Panel/IndicatorsMenu.qml (+17/-13) qml/Panel/Panel.qml (+15/-5) qml/Shell.qml (+4/-3) qml/Stages/DecoratedWindow.qml (+11/-7) qml/Stages/DesktopSpread.qml (+1/-1) qml/Stages/DesktopSpreadDelegate.qml (+1/-1) qml/Stages/DesktopStage.qml (+57/-45) qml/Stages/PhoneStage.qml (+4/-4) qml/Stages/SideStage.qml (+1/-2) qml/Stages/Splash.qml (+6/-17) qml/Stages/SpreadDelegate.qml (+1/-1) qml/Stages/TabletStage.qml (+4/-4) qml/Stages/WindowDecoration.qml (+12/-8) qml/Stages/WindowResizeArea.qml (+25/-5) qml/Tutorial/TutorialBottom.qml (+3/-3) qml/Wizard/Pages/50-timezone.qml (+5/-2) src/CMakeLists.txt (+1/-4) src/Dash/CMakeLists.txt (+1/-0) src/Dash/main.cpp (+6/-0) src/UnixSignalHandler.cpp (+1/-1) src/main.cpp (+6/-0) tests/CMakeLists.txt (+0/-1) tests/autopilot/unity8/dash.py (+2/-3) tests/libs/CMakeLists.txt (+0/-1) tests/libs/UbuntuGestures/CMakeLists.txt (+0/-16) tests/libs/UbuntuGestures/tst_TouchRegistry.cpp (+0/-974) tests/mocks/Cursor/qmldir (+1/-1) tests/mocks/GSettings.1.0/fake_gsettings.cpp (+1/-0) tests/mocks/GSettings.1.0/fake_gsettings.h (+2/-2) tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.h (+0/-1) tests/mocks/QtMultimedia/audio.cpp (+3/-3) tests/mocks/QtMultimedia/audio.h (+12/-6) tests/mocks/Ubuntu/Payments/MockPayments.cpp (+1/-0) tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt (+1/-1) tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml (+16/-4) tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir (+1/-1) tests/mocks/Unity/Application/ApplicationInfo.h (+1/-1) tests/mocks/Unity/Application/MirSurface.h (+2/-2) tests/mocks/Unity/Application/MirSurfaceItem.cpp (+1/-0) tests/mocks/Unity/InputInfo/plugin.h (+1/-1) tests/mocks/Unity/Screens/plugin.h (+1/-1) tests/mocks/Unity/fake_scope.cpp (+6/-3) tests/mocks/Unity/fake_scope.h (+1/-1) tests/mocks/Unity/fake_scopes.cpp (+11/-0) tests/mocks/Utils/plugin.h (+1/-1) tests/mocks/Utils/windowstatestorage.h (+14/-3) tests/mocks/libusermetrics/UserMetrics.cpp (+1/-1) tests/plugins/CMakeLists.txt (+2/-1) tests/plugins/Cursor/CMakeLists.txt (+8/-0) tests/plugins/Cursor/TextEntry.qml (+34/-0) tests/plugins/Cursor/tst_Cursor.qml (+144/-0) tests/plugins/Dash/cardcreator/1.res (+8/-26) tests/plugins/Dash/cardcreator/1.res.cardcreator (+8/-26) tests/plugins/Dash/cardcreator/1.tst (+1/-0) tests/plugins/Dash/cardcreator/10.res (+0/-9) tests/plugins/Dash/cardcreator/10.res.cardcreator (+0/-9) tests/plugins/Dash/cardcreator/10.tst (+1/-0) tests/plugins/Dash/cardcreator/11.res (+11/-29) tests/plugins/Dash/cardcreator/11.res.cardcreator (+10/-28) tests/plugins/Dash/cardcreator/11.tst (+1/-0) tests/plugins/Dash/cardcreator/12.res (+8/-26) tests/plugins/Dash/cardcreator/12.res.cardcreator (+10/-28) tests/plugins/Dash/cardcreator/12.tst (+1/-0) tests/plugins/Dash/cardcreator/2.res (+0/-9) tests/plugins/Dash/cardcreator/2.res.cardcreator (+0/-9) tests/plugins/Dash/cardcreator/2.tst (+1/-0) tests/plugins/Dash/cardcreator/3.res (+5/-33) tests/plugins/Dash/cardcreator/3.res.cardcreator (+5/-33) tests/plugins/Dash/cardcreator/3.tst (+1/-0) tests/plugins/Dash/cardcreator/4.res (+1/-2) tests/plugins/Dash/cardcreator/4.res.cardcreator (+1/-2) tests/plugins/Dash/cardcreator/4.tst (+1/-0) tests/plugins/Dash/cardcreator/5.res (+2/-35) tests/plugins/Dash/cardcreator/5.res.cardcreator (+2/-35) tests/plugins/Dash/cardcreator/5.tst (+1/-0) tests/plugins/Dash/cardcreator/6.res (+1/-2) tests/plugins/Dash/cardcreator/6.res.cardcreator (+1/-2) tests/plugins/Dash/cardcreator/6.tst (+1/-0) tests/plugins/Dash/cardcreator/7.res (+0/-9) tests/plugins/Dash/cardcreator/7.res.cardcreator (+0/-9) tests/plugins/Dash/cardcreator/7.tst (+1/-0) tests/plugins/Dash/cardcreator/8.res (+1/-2) tests/plugins/Dash/cardcreator/8.res.cardcreator (+1/-2) tests/plugins/Dash/cardcreator/8.tst (+1/-0) tests/plugins/Dash/cardcreator/9.res (+1/-2) tests/plugins/Dash/cardcreator/9.res.cardcreator (+1/-2) tests/plugins/Dash/cardcreator/9.tst (+1/-0) tests/plugins/Dash/cardcreatortest.cpp (+9/-6) tests/plugins/Dash/cardcreatortest.qml (+4/-4) tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp (+2/-2) tests/plugins/Dash/listviewwithpageheadersectiontest.cpp (+2/-2) tests/plugins/Dash/listviewwithpageheadertest.cpp (+5/-0) tests/plugins/Dash/listviewwithpageheadertestsection.qml (+3/-2) tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml (+2/-1) tests/plugins/Dash/tst_ListViewWithPageHeaderQML.qml (+4/-2) tests/plugins/Dash/tst_ScopeStyle.qml (+1/-1) tests/plugins/Ubuntu/Gestures/CMakeLists.txt (+4/-4) tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml (+0/-72) tests/plugins/Ubuntu/Gestures/GestureTest.cpp (+2/-2) tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml (+0/-76) tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml (+0/-76) tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml (+0/-76) tests/plugins/Ubuntu/Gestures/tst_Damper.cpp (+0/-40) tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp (+0/-1250) tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml (+0/-76) tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp (+26/-19) tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml (+1/-0) tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp (+1/-1) tests/plugins/Unity/Indicators/MenuContentActivatorTest.cpp (+1/-0) tests/plugins/Unity/Session/sessionbackendtest.cpp (+0/-15) tests/plugins/Utils/WindowInputMonitorTest.cpp (+51/-10) tests/qmltests/Components/CMakeLists.txt (+6/-3) tests/qmltests/Components/tst_DragHandle.cpp (+28/-24) tests/qmltests/Components/tst_DragHandle.qml (+27/-9) tests/qmltests/Components/tst_DragHandle/BottomEdgeShowable.qml (+108/-0) tests/qmltests/Components/tst_DragHandle/RightEdgeShowable.qml (+108/-0) tests/qmltests/Components/tst_DragHandle/TopEdgeShowable.qml (+7/-7) tests/qmltests/Components/tst_EdgeDragEvaluator.cpp (+1/-1) tests/qmltests/Dash/Previews/tst_Preview.qml (+0/-1) tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml (+5/-1) tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml (+18/-6) tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml (+1/-1) tests/qmltests/Dash/tst_Card.qml (+22/-10) tests/qmltests/Dash/tst_CardTool.qml (+1/-1) tests/qmltests/Dash/tst_Dash.qml (+76/-62) tests/qmltests/Dash/tst_DashContent.qml (+65/-6) tests/qmltests/Dash/tst_DashPageHeader.qml (+0/-24) tests/qmltests/Dash/tst_DashShell.qml (+1/-1) tests/qmltests/Dash/tst_GenericScopeView.qml (+2/-2) tests/qmltests/Dash/tst_PreviewView.qml (+3/-3) tests/qmltests/Greeter/tst_Greeter.qml (+1/-1) tests/qmltests/Greeter/tst_NarrowView.qml (+1/-1) tests/qmltests/Greeter/tst_WideView.qml (+1/-1) tests/qmltests/Launcher/tst_Launcher.qml (+13/-1) tests/qmltests/Notifications/tst_Notifications.qml (+89/-0) tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml (+1/-0) tests/qmltests/Stages/tst_DesktopStage.qml (+31/-1) tests/qmltests/Stages/tst_WindowResizeArea.qml (+16/-5) tests/qmltests/Tutorial/tst_Tutorial.qml (+2/-2) tests/qmltests/Wizard/tst_Wizard.qml (+4/-3) tests/qmltests/tst_OrientedShell.qml (+1/-1) tests/qmltests/tst_Shell.qml (+32/-5) tests/qmltests/tst_ShellWithPin.qml (+1/-1) tests/uqmlscene/main.cpp (+0/-1) tests/utils/modules/Unity/Test/CMakeLists.txt (+4/-2) tests/utils/modules/Unity/Test/UnityTestCase.qml (+34/-15) tests/utils/modules/Unity/Test/testutil.cpp (+2/-2) tools/CMakeLists.txt (+1/-1) tools/scopetool.cpp (+1/-1) |
||||||||||||||||
To merge this branch: | bzr merge lp://staging/~ci-train-bot/unity8/unity8-ubuntu-yakkety-landing-059 | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity Team | Pending | ||
Review via email:
|
To post a comment you must log in.