Merge lp://staging/~macslow/unity8/swipe-dismiss-snap-decisions into lp://staging/unity8
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Michał Sawicz | ||||||||
Approved revision: | 1285 | ||||||||
Merged at revision: | 1599 | ||||||||
Proposed branch: | lp://staging/~macslow/unity8/swipe-dismiss-snap-decisions | ||||||||
Merge into: | lp://staging/unity8 | ||||||||
Diff against target: |
1554 lines (+836/-252) 15 files modified
qml/Notifications/Notification.qml (+36/-6) qml/Notifications/Notifications.qml (+2/-6) tests/mocks/Unity/Notifications/CMakeLists.txt (+2/-1) tests/mocks/Unity/Notifications/MockActionModel.cpp (+6/-4) tests/mocks/Unity/Notifications/MockActionModel.h (+4/-2) tests/mocks/Unity/Notifications/MockNotification.cpp (+156/-4) tests/mocks/Unity/Notifications/MockNotification.h (+63/-5) tests/mocks/Unity/Notifications/MockNotificationModel.cpp (+172/-0) tests/mocks/Unity/Notifications/MockNotificationModel.h (+72/-0) tests/mocks/Unity/Notifications/plugin.cpp (+5/-3) tests/mocks/Unity/Notifications/plugin.h (+1/-2) tests/qmltests/Notifications/Notification.qml (+31/-0) tests/qmltests/Notifications/tst_Notifications.qml (+271/-213) tests/qmltests/Notifications/tst_OptionToggle.qml (+11/-6) tests/qmltests/Notifications/tst_SwipeToAct.qml (+4/-0) |
||||||||
To merge this branch: | bzr merge lp://staging/~macslow/unity8/swipe-dismiss-snap-decisions | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michał Sawicz | tests | Approve | |
PS Jenkins bot (community) | continuous-integration | Approve | |
Albert Astals Cid (community) | Approve | ||
Michael Zanetti (community) | Abstain | ||
Antti Kaijanmäki (community) | Needs Information | ||
Review via email: mp+233347@code.staging.launchpad.net |
Commit message
Allow swipe-to-dismiss for contracted snap-decision notifications, interactive notifications and ephemeral notifications.
Description of the change
Allow swipe-to-dismiss for contracted snap-decision notifications, interactive notifications and ephemeral notifications.
For the reviewers convenience, here's a video of the branch in action: https:/
* Are there any related MPs required for this MP to build/function as expected? Please list.
No.
* 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?
Not applicable.
* If you changed the UI, has there been a design review?
Yes.
FAILED: Continuous integration, rev:1089 /code.launchpad .net/~macslow/ unity8/ swipe-dismiss- snap-decisions/ +merge/ 233347/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ unity8- ci/4230/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/4444 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- utopic/ 1231 jenkins. qa.ubuntu. com/job/ unity8- utopic- amd64-ci/ 1324 jenkins. qa.ubuntu. com/job/ unity8- utopic- i386-ci/ 1324 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/4219 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/5696 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/5696/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 12647
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/4230/ rebuild
http://