Merge lp:~om26er/notes-app/remove_autopilot_workaround into lp:notes-app

[Omer Akram]

added the functionality to make sure the keyboard appears before changing focus to another field.

added the functionality to make sure the keyboard appears before changing focus to another field.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/notes-app-ci/126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1515
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1277

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/126/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

199 + if model() != 'Desktop':

209 + if model() != 'Desktop':

Those are not needed, as the check on model() is done already in assert_osk_eventually_shown() and assert_osk_eventually_hidden().

review: Needs Fixing

[lp:~om26er/notes-app/remove_autopilot_workaround]

159. By Omer Akram on 2013-07-25

fix per suggestions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/notes-app-ci/127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1544
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1544/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1305

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/127/rebuild

review: Approve (continuous-integration)

[Omer Akram (om26er)]

> 199 + if model() != 'Desktop':
>
> 209 + if model() != 'Desktop':
>
> Those are not needed, as the check on model() is done already in
> assert_osk_eventually_shown() and assert_osk_eventually_hidden().

fixed.

[Olivier Tilloy (osomon)]

There is a conflict when merging in the latest trunk. Please merge and resolve.

review: Needs Fixing

[lp:~om26er/notes-app/remove_autopilot_workaround]

160. By Omer Akram on 2013-07-26

merge trunk, fix conflicts

[Omer Akram (om26er)]

> There is a conflict when merging in the latest trunk. Please merge and
> resolve.

Done. Thanks

[Olivier Tilloy (osomon)]

129 + KeyboardRectangle {
130 + id: osk
131 }

The id is not needed, as it’s not used anywhere, so it can be safely removed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/notes-app-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1601
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1601/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1351

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/128/rebuild

review: Approve (continuous-integration)

[lp:~om26er/notes-app/remove_autopilot_workaround]

161. By Omer Akram on 2013-07-26

remove id for KeyboardRectangle, we don't use it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/notes-app-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1608
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1612
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1612/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1360

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notes-app-ci/129/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good now.

review: Approve

=== added file 'KeyboardRectangle.qml'
--- KeyboardRectangle.qml	1970-01-01 00:00:00 +0000
+++ KeyboardRectangle.qml	2013-07-26 18:20:36 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This file is part of notes-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// This file was originally part of the telephony application.
+// It is a workaround required to handle interaction with the OSK,
+// until the shell/WM takes care of that on behalf of the applications.
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    id: keyboardRect
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+
+    Behavior on height {
+        UbuntuNumberAnimation {}
+    }
+
+    states: [
+        State {
+            name: "hidden"
+            when: keyboardRect.height == 0
+        },
+        State {
+            name: "shown"
+            when: keyboardRect.height == Qt.inputMethod.keyboardRectangle.height
+        }
+    ]
+
+    function recursiveFindFocusedItem(parent) {
+        if (parent.activeFocus) {
+            return parent;
+        }
+
+        for (var i in parent.children) {
+            var child = parent.children[i];
+            if (child.activeFocus) {
+                return child;
+            }
+
+            var item = recursiveFindFocusedItem(child);
+
+            if (item != null) {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    Connections {
+        target: Qt.inputMethod
+
+        onVisibleChanged: {
+            if (!Qt.inputMethod.visible) {
+                var focusedItem = recursiveFindFocusedItem(keyboardRect.parent);
+                if (focusedItem != null) {
+                    focusedItem.focus = false;
+                }
+            }
+        }
+    }
+}

=== modified file 'NotesApp.qml'
--- NotesApp.qml	2013-07-24 14:52:07 +0000
+++ NotesApp.qml	2013-07-26 18:20:36 +0000
@@ -118,40 +118,6 @@
         noteList.setActiveIndex(0);
     }
 
-    // Workaround for https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1201400.
-    // Inspired by the KeyboardRectangle component, originally written for the
-    // telephony application.
-    Connections {
-        target: Qt.inputMethod
-
-        onVisibleChanged: {
-            if (!Qt.inputMethod.visible) {
-                var focusedItem = recursiveFindFocusedItem(window);
-                if (focusedItem != null) {
-                    focusedItem.focus = false;
-                }
-            }
-        }
-
-        function recursiveFindFocusedItem(parent) {
-            if (parent.activeFocus) {
-                return parent;
-            }
-
-            for (var i in parent.children) {
-                var child = parent.children[i];
-                if (child.activeFocus) {
-                    return child;
-                }
-
-                var item = recursiveFindFocusedItem(child);
-
-                if (item != null) {
-                    return item;
-                }
-            }
-
-            return null;
-        }
+    KeyboardRectangle {
     }
 }

=== modified file 'tests/autopilot/notes_app/emulators/main_window.py'
--- tests/autopilot/notes_app/emulators/main_window.py	2013-04-08 11:22:07 +0000
+++ tests/autopilot/notes_app/emulators/main_window.py	2013-07-26 18:20:36 +0000
@@ -27,3 +27,6 @@
         edit = note_item.select_single("MixedEdit")
         parts = edit.select_single("QQuickColumn").get_children_by_type("QQuickLoader")
         return parts
+
+    def get_keyboard_rectangle(self):
+        return self.app.select_single("KeyboardRectangle")

=== modified file 'tests/autopilot/notes_app/tests/__init__.py'
--- tests/autopilot/notes_app/tests/__init__.py	2013-07-23 12:04:26 +0000
+++ tests/autopilot/notes_app/tests/__init__.py	2013-07-26 18:20:36 +0000
@@ -14,8 +14,10 @@
 import base64
 
 from autopilot.input import Mouse, Touch, Pointer
+from autopilot.matchers import Eventually
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
+from testtools.matchers import Equals
 
 from notes_app.emulators.main_window import MainWindow
 import imagedata
@@ -77,6 +79,18 @@
         # the process during regular test setup.
         self.doCleanups()
 
+    def assert_osk_eventually_shown(self):
+        if model() != 'Desktop':
+            keyboardRectangle = self.main_window.get_keyboard_rectangle()
+            self.assertThat(keyboardRectangle.state,
+                            Eventually(Equals("shown")))
+
+    def assert_osk_eventually_hidden(self):
+        if model() != 'Desktop':
+            keyboardRectangle = self.main_window.get_keyboard_rectangle()
+            self.assertThat(keyboardRectangle.state,
+                            Eventually(Equals("hidden")))
+
     @property
     def main_window(self):
         return MainWindow(self.app)

=== modified file 'tests/autopilot/notes_app/tests/test_parts.py'
--- tests/autopilot/notes_app/tests/test_parts.py	2013-07-23 12:21:36 +0000
+++ tests/autopilot/notes_app/tests/test_parts.py	2013-07-26 18:20:36 +0000
@@ -16,7 +16,6 @@
 from notes_app.tests import NotesTestCaseBaseWithHTTPServer, DatabaseMixin
 
 import sqlite3
-from time import sleep
 
 
 class TestFocus(NotesTestCaseBaseWithHTTPServer, DatabaseMixin):
@@ -80,17 +79,18 @@
         part_x, part_y, part_w, part_h = image.globalRect
         self.pointing_device.move(part_x + part_w / 2, part_y + 1)
         self.pointing_device.click()
+        self.assert_osk_eventually_shown()
         self.assertThat(text.activeFocus, Eventually(Equals(True)))
 
         # Clicking on the lower half of the image should create a new text area below
         # the image and focus it
         self.pointing_device.move(part_x + part_w / 2, part_y + part_h - 1)
         self.pointing_device.click()
+        self.assert_osk_eventually_hidden()
         # On the phone input focus is lost when the OSK appears so
         # we click the input box to gain focus again. LP: #1204084
         if model() != 'Desktop':
-            sleep(1)
-        self.pointing_device.click()
+            self.pointing_device.click()
         self.assertThat(text.activeFocus, Eventually(Equals(False)))
 
         parts = self.main_window.get_note_parts(note)