Merge lp:~dandrader/unity8/fix_lp1236773 into lp:unity8
Proposed by
Daniel d'Andrada
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Michał Sawicz | ||||
Approved revision: | 407 | ||||
Merged at revision: | 409 | ||||
Proposed branch: | lp:~dandrader/unity8/fix_lp1236773 | ||||
Merge into: | lp:unity8 | ||||
Diff against target: |
25 lines (+4/-4) 1 file modified
Shell.qml (+4/-4) |
||||
To merge this branch: | bzr merge lp:~dandrader/unity8/fix_lp1236773 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Michał Sawicz | Approve | ||
Review via email: mp+189821@code.launchpad.net |
Commit message
Move OSKController to the front as it will now also block input meant to the OSK
That's in the unity-mir implementation. The SurfaceFlinger one is still an empty noop.
Currently, when the OSK is up, both shell and OSK get user input, thus we need the
OSKController to shield our shell components from them.
To post a comment you must log in.
FAILED: Continuous integration, rev:407 jenkins. qa.ubuntu. com/job/ unity8- ci/1310/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- saucy/4771 jenkins. qa.ubuntu. com/job/ generic- mediumtests- touch/2600 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- saucy/2167 jenkins. qa.ubuntu. com/job/ unity8- saucy-amd64- ci/333/ console jenkins. qa.ubuntu. com/job/ unity8- saucy-armhf- ci/1310/ console jenkins. qa.ubuntu. com/job/ unity8- saucy-i386- ci/1309 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-saucy/ 951 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-amd64/ 646 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-amd64/ 646/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-armhf/ 2602 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-armhf/ 2602/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- maguro/ 2149 jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- mako/2162
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/unity8- ci/1310/ rebuild
http://