Merge lp:~mzanetti/autopilot/dont-use-touchpad-for-touch into lp:autopilot

[Michael Zanetti]

Don't use BTN_TOOL_FINGER but BTN_TOUCH instead.

BTN_TOOL_FINGER results in evdev registering a Touchpad device, which in turn causes unity8 to switch to windowed mode. BTN_TOUCH instead registers a Touchscreen device, which is the more proper thing to do anyways.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:559
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/36/console

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/autopilot/dont-use-touchpad-for-touch]

560. By Michael Zanetti on 2015-07-07

fix flake issue, rename all instances

561. By Michael Zanetti on 2015-07-07

use _get_touch_tool everywhere

562. By Michael Zanetti on 2015-07-07

no self

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:561
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1107/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/37/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:562
http://jenkins.qa.ubuntu.com/job/autopilot-ci/1108/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-wily-i386-ci/38/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'autopilot/input/_uinput.py'
--- autopilot/input/_uinput.py	2015-03-16 15:14:27 +0000
+++ autopilot/input/_uinput.py	2015-07-07 22:12:51 +0000
@@ -23,7 +23,6 @@
 
 from evdev import UInput, ecodes as e
 
-import autopilot.platform
 from autopilot.input import Keyboard as KeyboardBase
 from autopilot.input import Touch as TouchBase
 from autopilot.input._common import get_center_point
@@ -325,13 +324,7 @@
 
 
 def _get_touch_tool():
-    # android uses BTN_TOOL_FINGER, whereas desktop uses BTN_TOUCH. I have
-    # no idea why...
-    if autopilot.platform.model() == 'Desktop':
-        touch_tool = e.BTN_TOUCH
-    else:
-        touch_tool = e.BTN_TOOL_FINGER
-    return touch_tool
+    return e.BTN_TOUCH
 
 
 class _UInputTouchDevice(object):
@@ -378,7 +371,7 @@
         self._device.write(
             e.EV_ABS, e.ABS_MT_TRACKING_ID, self._get_next_tracking_id())
         press_value = 1
-        self._device.write(e.EV_KEY, e.BTN_TOOL_FINGER, press_value)
+        self._device.write(e.EV_KEY, _get_touch_tool(), press_value)
         self._device.write(e.EV_ABS, e.ABS_MT_POSITION_X, int(x))
         self._device.write(e.EV_ABS, e.ABS_MT_POSITION_Y, int(y))
         self._device.write(e.EV_ABS, e.ABS_MT_PRESSURE, 400)
@@ -430,7 +423,7 @@
         lift_tracking_id = -1
         self._device.write(e.EV_ABS, e.ABS_MT_TRACKING_ID, lift_tracking_id)
         release_value = 0
-        self._device.write(e.EV_KEY, e.BTN_TOOL_FINGER, release_value)
+        self._device.write(e.EV_KEY, _get_touch_tool(), release_value)
         self._device.syn()
         self._release_touch_finger()