lp:~macslow/unity8/swipe-to-act-fix-1358343

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 1412

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2014-10-31

Albert Astals Cid (community): Approve on 2014-10-31

Josh Arenson: Approve on 2014-10-29

Diff: 2297 lines (+1471/-666)

15 files modified

qml/Notifications/Notification.qml (+22/-3)
qml/Notifications/SwipeToAct.qml (+309/-0)
tests/autopilot/unity8/shell/tests/test_notifications.py (+0/-51)
tests/mocks/Unity/Notifications/CMakeLists.txt (+15/-1)
tests/mocks/Unity/Notifications/MockActionModel.cpp (+72/-0)
tests/mocks/Unity/Notifications/MockActionModel.h (+51/-0)
tests/mocks/Unity/Notifications/MockNotificationTypes.cpp (+26/-0)
tests/mocks/Unity/Notifications/MockNotificationTypes.h (+36/-0)
tests/mocks/Unity/Notifications/notification.js (+0/-23)
tests/mocks/Unity/Notifications/plugin.cpp (+31/-0)
tests/mocks/Unity/Notifications/plugin.h (+35/-0)
tests/mocks/Unity/Notifications/qmldir (+2/-1)
tests/qmltests/CMakeLists.txt (+1/-0)
tests/qmltests/Notifications/tst_Notifications.qml (+595/-587)
tests/qmltests/Notifications/tst_SwipeToAct.qml (+276/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1358343: [TOPBLOCKER] too easy to answer a call by accident

High

Fix Released

Link a bug report

Related blueprints

1317. By Mirco Müller on 2014-10-31

Adapted the SwipeToAct qml-test too after the merge with trunk.

1316. By Mirco Müller on 2014-10-31

Merged with trunk... resolved conflicts.

1315. By Mirco Müller on 2014-10-29

Adjust Flickable

1314. By Mirco Müller on 2014-10-29

Re-add the Flickables import.

1313. By Mirco Müller on 2014-10-29

Doh

1312. By Mirco Müller on 2014-10-29

Further tweak the Loader for the SwipeToAct-widget.

1311. By Mirco Müller on 2014-10-29

Use Loader for the swipeToAct widget to save some resources, if it is not used.

1310. By Mirco Müller on 2014-10-29

Removed superfluous import.

1309. By Mirco Müller on 2014-10-24

Minor tweaks.

1308. By Mirco Müller on 2014-10-24

Fix all the bad whitespace issues QtCreator created.