Merge lp://staging/~macslow/unity-notifications/combo-button-support into lp://staging/unity-notifications
| Status: | Merged |
|---|---|
| Approved by: | Michał Sawicz |
| Approved revision: | 210 |
| Merged at revision: | 211 |
| Proposed branch: | lp://staging/~macslow/unity-notifications/combo-button-support |
| Merge into: | lp://staging/unity-notifications |
| Diff against target: |
172 lines (+53/-21) (has conflicts) 4 files modified
debian/changelog (+11/-0) examples/sd-example-incoming-call-canceled.py (+17/-10) examples/sd-example-incoming-call.py (+24/-10) src/NotificationServer.cpp (+1/-1) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~macslow/unity-notifications/combo-button-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Updated calling snap-decision examples to show off new combo-button support in notifications frontend (unity8). Updated the incoming-call example to use 7 actions to be inline with design-
Description of the change
Updated calling snap-decision examples to show off new combo-button support in notifications frontend (unity8). Updated the incoming-call example to use 7 actions to be inline with design-
- Are there any related MPs required for this MP to build/function as expected?
No
- Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, but only on desktop not yet on the device/phone since cross-compiling currently doesn't work for me (Malta-sprint)
- 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?
Yes
- If you changed the UI, has there been a design review?
not applicable
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
PASSED: Continuous integration, rev:209
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://