Merge lp:~aacid/ubuntu-ui-toolkit/focus_54 into lp:ubuntu-ui-toolkit/staging

[Albert Astals Cid]

Don't use Qt::PopupFocusReason to change the focus

Even if it is the correct reason QtQuick is since 5.4 ignoring
focus changes due to PopupFocusReason

More at https://qt.gitorious.org/qt/qtdeclarative/commit/e60d8a28034550ae08b258494726050ea9638602

[lp:~aacid/ubuntu-ui-toolkit/focus_54]

1393. By Cris Dywan on 2015-01-29

Get arch for push_to_phone.sh from device and handle adb refusal.

Approved by PS Jenkins bot, Tim Peeters.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1390
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1399/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/126
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1076
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1076/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17612

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1399/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Tjis is weird... Reading the Qt bug description, I disagree that on OSX the focus is not taken away from the text input when opening a menu. The input does loose the focus, I checked it, and Qt apps are the only ones which behave different on OSX.

This fix is OK for us, but I disagree on the Qt fix comment.

review: Approve

[Zsombor Egri (zsombi)]

> Tjis is weird... Reading the Qt bug description, I disagree that on OSX the
> focus is not taken away from the text input when opening a menu. The input
> does loose the focus, I checked it, and Qt apps are the only ones which behave
> different on OSX.
>
> This fix is OK for us, but I disagree on the Qt fix comment.

Ouh, premature approval! Seems we have an AP failure that can be related to the fix, could you please check it? Thx!

review: Needs Fixing

[lp:~aacid/ubuntu-ui-toolkit/focus_54]

1394. By Cris Dywan on 2015-01-30

Abort export_modules_dir.sh and ergo run_tests.sh if binaries are absent. Fixes: https://bugs.launchpad.net/bugs/1415973.

Approved by PS Jenkins bot, Tim Peeters.

[Albert Astals Cid (aacid)]

I've had a look at the code and doesn't seem related to me, also run the test a few times and couldn't get to fail locally

[lp:~aacid/ubuntu-ui-toolkit/focus_54]

1395. By Albert Astals Cid on 2015-02-02

Don't use Qt::PopupFocusReason to change the focus

Even if it is the correct reason QtQuick is since 5.4 ignoring
focus changes due to PopupFocusReason

More at https://qt.gitorious.org/qt/qtdeclarative/commit/e60d8a28034550ae08b258494726050ea9638602

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1395
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1402/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/129
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/975
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1095
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1095/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17658

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1402/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/ubuntu-ui-toolkit/focus_54]

1396. By Albert Astals Cid on 2015-02-02

Make tests more stable

I am pretty sure they have nothing to do with this Qt 5.4 bugfix
But if we see they are fixed with these changes it'll be more clear
they were actually unstable ones and not caused by the patch itself

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1396
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1407/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/137
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/134
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/990
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1113
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17682

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1407/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/ubuntu-ui-toolkit/focus_54]

1397. By Albert Astals Cid on 2015-02-03

Fixup logic for above direction

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1397
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1408/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/138
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/135
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1000
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1120
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17693

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1408/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/ubuntu-ui-toolkit/focus_54]

1398. By Albert Astals Cid on 2015-02-03

More drag == multiple of range fixes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1398
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1410/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/140
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1125
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17705

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1410/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

All looks fine now, thanks!!

review: Approve

=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2014-12-03 14:14:09 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2015-02-03 10:59:03 +0000
@@ -200,9 +200,9 @@
         function restoreActiveFocus() {
             if (prevFocus) {
                 if (prevFocus.hasOwnProperty("requestFocus")) {
-                    prevFocus.requestFocus(Qt.PopupFocusReason);
+                    prevFocus.requestFocus(Qt.OtherFocusReason);
                 } else {
-                    prevFocus.forceActiveFocus(Qt.PopupFocusReason);
+                    prevFocus.forceActiveFocus(Qt.OtherFocusReason);
                 }
             }
         }

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-10-23 13:35:30 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2015-02-03 10:59:03 +0000
@@ -74,18 +74,22 @@
         return (object_center >= visible_top and
                 object_center <= visible_bottom)
 
-    def _slow_drag(self, start_x, stop_x, start_y, stop_y):
-        # If we drag too fast, we end up scrolling more than what we
-        # should, sometimes missing the  element we are looking for.
-        original_content_y = self.contentY
-
+    def _slow_drag_rate(self):
         # I found that when the flickDeceleration is 1500, the rate should be
         # 5 and that when it's 100, the rate should be 1. With those two points
         # we can get the following equation.
         # XXX The deceleration might not be linear with respect to the rate,
         # but this works for the two types of scrollables we have for now.
         # --elopio - 2014-05-08
-        rate = (self.flickDeceleration + 250) / 350
+        return (self.flickDeceleration + 250) / 350
+
+    def _slow_drag(self, start_x, stop_x, start_y, stop_y, rate=None):
+        # If we drag too fast, we end up scrolling more than what we
+        # should, sometimes missing the  element we are looking for.
+        original_content_y = self.contentY
+
+        if rate is None:
+            rate = self._slow_drag_rate()
         self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=rate)
 
         if self.contentY == original_content_y:
@@ -140,24 +144,29 @@
         if containers is None:
             containers = self._get_containers()
         start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
+
+        # Make the drag range be a multiple of the drag "rate" value.
+        # Workarounds https://bugs.launchpad.net/mir/+bug/1399690
+        rate = self._slow_drag_rate()
+
         # Start and stop just a little under the top and a little over the
         # bottom.
-        top = _get_visible_container_top(containers) + 5
-        bottom = _get_visible_container_bottom(containers) - 5
+        top = _get_visible_container_top(containers) + rate
+        bottom = _get_visible_container_bottom(containers) - rate
 
         if direction == 'below':
             # Take into account that swiping from below can open the toolbar or
             # trigger the bottom edge gesture.
             # XXX Do this only if we are close to the bottom edge.
             start_y = bottom - 20
-            stop_y = top
+            stop_y = start_y + (top - start_y) // rate * rate
         elif direction == 'above':
             start_y = top
-            stop_y = bottom
+            stop_y = start_y + (bottom - start_y) // rate * rate
         else:
             raise _common.ToolkitException(
                 'Invalid direction {}.'.format(direction))
-        self._slow_drag(start_x, stop_x, start_y, stop_y)
+        self._slow_drag(start_x, stop_x, start_y, stop_y, rate)
         self.dragging.wait_for(False)
         self.moving.wait_for(False)
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-11-24 16:08:45 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-02-03 10:59:03 +0000
@@ -46,10 +46,13 @@
         # fills the main view. The header has a flickable property but it
         # can't be read by autopilot. See bug http://pad.lv/1318829
         top_container = self._get_top_container()
-        start_x = stop_x = (self.globalRect.x + self.globalRect.width) // 2
+        # Make the drag range be a multiple of the drag "rate" value.
+        # Workarounds https://bugs.launchpad.net/mir/+bug/1399690
+        rate = 10
+        start_x = stop_x = self.globalRect.x + self.globalRect.width // 2
         start_y = top_container.globalRect.y + 5
-        stop_y = start_y + self.globalRect.height
-        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+        stop_y = start_y + self.globalRect.height // rate * rate
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate)
         self.y.wait_for(0)
 
     def wait_for_animation(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2014-12-01 12:40:23 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-02-03 10:59:03 +0000
@@ -147,6 +147,9 @@
         self.pointing_device.click_object(self.textfield)
         cursor = self.main_view.select_single(
             objectName='text_cursor_style_cursorPosition')
+        if (self.textfield.text):
+            # Let the cursor stabilize
+            sleep(1)
         self.pointing_device.click_object(cursor)
         self.assert_buttons(['Select All', 'Paste'])
         self.assert_discard_popover()