Merge lp://qastaging/~andreas-pokorny/mir/fix-1531517 into lp://qastaging/mir
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alexandros Frantzis | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 3243 | ||||
Proposed branch: | lp://qastaging/~andreas-pokorny/mir/fix-1531517 | ||||
Merge into: | lp://qastaging/mir | ||||
Diff against target: |
362 lines (+241/-44) 2 files modified
src/server/input/android/input_sender.cpp (+69/-28) tests/unit-tests/input/android/test_android_input_sender.cpp (+172/-16) |
||||
To merge this branch: | bzr merge lp://qastaging/~andreas-pokorny/mir/fix-1531517 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Mir CI Bot | continuous-integration | Approve | |
Brandon Schaefer (community) | Approve | ||
Kevin DuBois (community) | Approve | ||
Alexandros Frantzis (community) | Approve | ||
Review via email:
|
Commit message
Never encode more than one action per event
Android InputTransport has only one action parameter per event. Within that the contact that caused the action is also encoded. So until we replace or extend the input transport protocol, we have to split up MirEvents, to not lose touch up/down changes.
Description of the change
This change splits a MirEvent into several input transport messages when more than one contact was changed.
Alternatively to this approach we could 'just' change the InputTransport protocol... But I would wait with that when bschaefer gets around to add the cookie.. Additionally Daniel D'Andrada indicated that qt might not like seeing multiple state changes, at least there was some uncertainty.
FAILED: Continuous integration, rev:3241 jenkins. qa.ubuntu. com/job/ mir-ci/ 6001/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/5514/ console jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/4421 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/5470/ console jenkins. qa.ubuntu. com/job/ mir-xenial- amd64-ci/ 325 jenkins. qa.ubuntu. com/job/ mir-xenial- amd64-ci/ 325/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-xenial- i386-ci/ 325 jenkins. qa.ubuntu. com/job/ mir-xenial- i386-ci/ 325/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 5467/console
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/6001/ rebuild
http://