Merge lp:~bfiller/ubuntu-keyboard/fix-1277186 into lp:ubuntu-keyboard

[Bill Filler]

fix lp:1277186 to allow keyboard to be swiped down as before

fix lp:1277186 to allow keyboard to be swiped down as before

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/163
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/162

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/334/rebuild

review: Approve (continuous-integration)

[lp:~bfiller/ubuntu-keyboard/fix-1277186]

138. By Bill Filler on 2014-02-28

fix more issues with swiping down in qt5.2

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/335/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/164
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/163

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/335/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Are there any related MPs required for this MP to build/function as expected? Please list.
NO

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
YES

[lp:~bfiller/ubuntu-keyboard/fix-1277186]

139. By Bill Filler on 2014-02-28

cleaner way to set visible flag

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/336/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/165
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/165/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/164

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/336/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected

review: Approve

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2014-01-21 22:51:18 +0000
+++ qml/Keyboard.qml	2014-02-28 18:25:27 +0000
@@ -104,7 +104,9 @@
                 drag.axis: Drag.YAxis;
                 drag.minimumY: 0
                 drag.maximumY: parent.height
-                drag.filterChildren: true
+                //fix for lp:1277186
+                //only filter children when wordRibbon visible
+                drag.filterChildren: wordRibbon.visible
 
                 onReleased: {
                     if (keyboardSurface.y > jumpBackThreshold) {