Merge lp:~dandrader/unity8/fix_lp1236773 into lp:unity8

[Daniel d'Andrada]

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:407
http://jenkins.qa.ubuntu.com/job/unity8-ci/1310/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2600
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2167
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/333/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1310/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/951
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2602
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2602/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2162

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1310/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:407
http://jenkins.qa.ubuntu.com/job/unity8-ci/1313/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4778
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2607/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1313
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/653
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/653/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2609
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2156
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2169/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1313/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/602/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/2749
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4780
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2613/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2173
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/606
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/960
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/655
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/655/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2615
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2615/artifact/work/output/*zip*/output.zip
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2175/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

mako died during testing. It was set offline to be worked.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/605/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-cleanup-mbs/2753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2625
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-autolanding/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/609
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/609/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/969
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/664
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/664/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2627
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2627/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2187

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Shell.qml'
--- Shell.qml	2013-10-08 00:01:04 +0000
+++ Shell.qml	2013-10-08 11:37:24 +0000
@@ -160,10 +160,6 @@
         }
     }
 
-    OSKController {
-        anchors.fill: parent // as needs to know the geometry of the shell
-    }
-
     VolumeControl {
         id: volumeControl
     }
@@ -731,6 +727,10 @@
         value: "unity8"
     }
 
+    OSKController {
+        anchors.fill: parent // as needs to know the geometry of the shell
+    }
+
     //FIXME: This should be handled in the input stack, keyboard shouldnt propagate
     MouseArea {
         anchors.bottom: parent.bottom