Merge lp:~nikwen/ubuntu-terminal-app/swipe-gesture-consistency into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alan Pope πΊπ§π± π¦ | ||||
Approved revision: | 89 | ||||
Merged at revision: | 89 | ||||
Proposed branch: | lp:~nikwen/ubuntu-terminal-app/swipe-gesture-consistency | ||||
Merge into: | lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot | ||||
Diff against target: |
125 lines (+28/-7) 3 files modified
po/com.ubuntu.terminal.pot (+2/-2) src/app/qml/TerminalInputArea.qml (+22/-1) src/app/qml/TerminalPage.qml (+4/-4) |
||||
To merge this branch: | bzr merge lp:~nikwen/ubuntu-terminal-app/swipe-gesture-consistency | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Pope πΊπ§π± π¦ (community) | Approve | ||
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Review via email: mp+261913@code.launchpad.net |
Commit message
Fix swipe gesture inconsistencies by changing the behaviour to using two fingers for scrolling and one finger for key up/down events (see the bug description of LP: #1464566).
Fix issues arising from switching between single and multi touch handlers by detecting whether gestures are going to be single or multi touch before handling them.
Description of the change
Fix swipe gesture inconsistencies by changing the behaviour to using two fingers for scrolling and one finger for key up/down events (see the bug description of LP: #1464566).
Fix issues arising from switching between single and multi touch handlers by detecting whether gestures are going to be single or multi touch before handling them.
PASSED: Continuous integration, rev:89 91.189. 93.70:8080/ job/ubuntu- terminal- app-ci/ 155/ 91.189. 93.70:8080/ job/generic- mediumtests- utopic/ 2931 91.189. 93.70:8080/ job/generic- mediumtests- utopic/ 2931/artifact/ work/output/ *zip*/output. zip 91.189. 93.70:8080/ job/ubuntu- terminal- app-utopic- amd64-ci/ 76 91.189. 93.70:8080/ job/ubuntu- terminal- app-vivid- amd64-ci/ 39
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- terminal- app-ci/ 155/rebuild
http://