Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1477901 into lp:ubuntu-keyboard

[Michael Sheldon]

Check that another key hasn't been pressed in between double click presses

Check that another key hasn't been pressed in between double click presses

[Michael Sheldon (michael-sheldon)]

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/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:395
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/622/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/123
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/123
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2893
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3472
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3472/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22111

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

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1477901]

396. By Michael Sheldon on 2015-07-28

Remove no longer necessary sleep workaround from test

397. By Michael Sheldon on 2015-07-28

Don't attempt to automatically switch to a requested state in keyboard tests if the test is manually pressing the shift key, as this will also change state.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/624/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2900
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3479
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3479/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22168

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

I can confirm this fixed the issue we had in ubuntu-system-settings, all keyboard related tests pass again.

review: Approve

=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml	2015-05-06 10:33:53 +0000
+++ qml/KeyboardContainer.qml	2015-07-28 10:57:42 +0000
@@ -36,6 +36,8 @@
     property bool switchBack: false // Switch back to the previous layout when changing fields
     property bool justChangedLanguage: true // Don't switch back languages during language switch process
 
+    property Item lastKeyPressed // Used for determining double click validity in PressArea
+
     state: "CHARACTERS"
 
     function closeExtendedKeys()

=== modified file 'qml/keys/PressArea.qml'
--- qml/keys/PressArea.qml	2014-10-20 17:31:39 +0000
+++ qml/keys/PressArea.qml	2015-07-28 10:57:42 +0000
@@ -107,11 +107,21 @@
         held = false;
         swipedOut = false;
         holdTimer.restart();
+
+        // We keep a global view of whether any other keys have been
+        // pressed in between the first tap on this key and the second
+        // one, so that quickly tapping one key, then tapping another,
+        // then tapping the first again doesn't trigger a double click.
+
         if (doubleClickTimer.running) {
-            doubleClicked();
-        }
-        if (acceptDoubleClick) {
-            doubleClickTimer.restart();
+            if (panel.lastKeyPressed == root) {
+                doubleClicked();
+            }
+        } else {
+            if (acceptDoubleClick) {
+                doubleClickTimer.restart();
+            }
+            panel.lastKeyPressed = root
         }
     }
 

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-07-16 13:55:08 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-07-28 10:57:42 +0000
@@ -180,7 +180,12 @@
 
         key_pos = self._get_key_pos_from_keypad(req_keypad, key)
         self._show_keypad(req_keypad)
-        self._change_keypad_to_state(req_key_state)
+
+        # Don't attempt to automatically switch to a requested state if the
+        # test is manually pressing the shift key, as this will also change
+        # state.
+        if key != "shift":
+            self._change_keypad_to_state(req_key_state)
 
         if slide_offset is not None:
             self._select_extended_key(key_pos, slide_offset)

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-07-16 13:55:08 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-07-28 10:57:42 +0000
@@ -389,8 +389,6 @@
         self.addCleanup(keyboard.dismiss)
 
         keyboard.type('abc')
-        # Bug lp:1229003 and lp:1229001
-        sleep(.2)
         keyboard.press_key('shift')
         keyboard.press_key('shift', True)