Merge lp:~rpadovani/ubuntu-calculator-app/waitUntilOskIsHidden into lp:ubuntu-calculator-app

[Riccardo Padovani]

Wait until osk keyboard is hidden before showing our custom keyboard

Wait until osk keyboard is hidden before showing our custom keyboard

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:148
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/135/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2477
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2477/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-ci/28
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/135

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/135/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:149
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/138/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2515
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-ci/31
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/138

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/138/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested this on my krillin and it works well!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-autolanding/91/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2530
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2530/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-utopic-amd64-autolanding/26
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-autolanding/91

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-03-30 08:33:45 +0000
+++ app/ubuntu-calculator-app.qml	2015-04-06 12:49:50 +0000
@@ -34,7 +34,7 @@
     // Removes the old toolbar and enables new features of the new header.
     useDeprecatedToolbar: false;
     automaticOrientation: true
-    anchorToKeyboard: true
+    anchorToKeyboard: textInputField.visible ? false : true
 
     width: units.gu(40);
     height: units.gu(70);
@@ -73,11 +73,6 @@
     // If it is set to false, then editing will be invoked
     property bool deleteSelectedCalculation: true;
 
-    Connections {
-        id: oskKeyboard
-        target: Qt.inputMethod
-    }
-
     /**
      * The function calls the Formula.deleteLastFormulaElement function and
      * place the result in right vars
@@ -508,6 +503,7 @@
                 anchors {
                     top: header.bottom
                     bottom: parent.bottom
+                    bottomMargin: textInputField.visible ? 0 : -keyboardLoader.height
                     left: parent.left
                     right: parent.right
                 }
@@ -635,9 +631,9 @@
                 Loader {
                     id: keyboardLoader
                     width: parent.width
-                    visible: textInputField.visible && !oskKeyboard.visible
                     source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraitKeyboard.qml"
-                    opacity: ((y + height) >= scrollableView.contentY) && (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
+                    opacity: ((y + height) >= scrollableView.contentY) &&
+                            (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
                 }
             }
         }