Merge lp:~dandrader/unity8/touchOwnership into lp:unity8

[Daniel d'Andrada]

Add touch ownership logic on top of qt input handling

It does mainly 3 things:
- Adds TouchRegistry.
- Adds TouchGate
- Modifies DirectionalDragArea so that it uses TouchRegistry and only grabs a touch once it has recognized a gesture done by it.

TouchRegistry was put into a library as both unity8 and Ubuntu.Gestures plugin need to use it.

The next step is to have surfaces participating in the touch ownership negotiation. But for now they're put behind TouchGates so that they only receive thouches whose ownership has already been settled.

The most noticeable improvement of this patch is that taps near screen edges will now reach applications.

It also makes right-edge and bottom-edge drags only animate once a directional drag gesture has been fully recognized.

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/qtmir/UbuntuKeyboardInfoQMLSingleton/+merge/236151

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

* Did you make sure that your branch does not contain spurious tags?
Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.

* If you changed the UI, has there been a design review?
Not applicable.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1296
http://jenkins.qa.ubuntu.com/job/unity8-ci/4415/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5241/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1411/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1509/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1509/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6493/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1297
http://jenkins.qa.ubuntu.com/job/unity8-ci/4416/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5243/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1412/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1510/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1510/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6495/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1299
http://jenkins.qa.ubuntu.com/job/unity8-ci/4418/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5247/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1414/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6499/console

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1296. By Nick Dedekind on 2014-09-26

Visual changes for indicator RTM polishing Fixes: 1329289, 1349921, 1350308, 1350952, 1354506, 1373319
Approved by: Andrea Cimitan

1297. By PS Jenkins bot on 2014-09-26

Releasing 8.00+14.10.20140926-0ubuntu1

1298. By PS Jenkins bot on 2014-09-28

Resync trunk

1299. By Launchpad Translations on behalf of unity-team on 2014-09-28

Launchpad automatic translations update.

1300. By Launchpad Translations on behalf of unity-team on 2014-09-29

Launchpad automatic translations update.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1300
http://jenkins.qa.ubuntu.com/job/unity8-ci/4433/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5287/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1429/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1527/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1527/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6539/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1301
http://jenkins.qa.ubuntu.com/job/unity8-ci/4434/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1528/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1528/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6546/console

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1301. By Launchpad Translations on behalf of unity-team on 2014-09-30

Launchpad automatic translations update.

[Albert Astals Cid (aacid)]

Found 2 license problems:
libs/UbuntuGestures/UnownedTouchEvent.cpp UNKNOWN *No copyright*
tests/plugins/Ubuntu/Gestures/touchGateExample.qml UNKNOWN *No copyright*

[kevin gunn (kgunn72)]

currently failling to build in rtm-silo

https://launchpadlibrarian.net/186133082/buildlog_ubuntu-rtm-14.09-i386.unity8_8.00%2B14.10.20140930.2-0ubuntu1_FAILEDTOBUILD.txt.gz

looks like some code unhappiness & unit test failure of touchRegistryInput

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> Found 2 license problems:
> libs/UbuntuGestures/UnownedTouchEvent.cpp UNKNOWN *No copyright*
> tests/plugins/Ubuntu/Gestures/touchGateExample.qml UNKNOWN *No copyright*

Fixed.

[Daniel d'Andrada (dandrader)]

> currently failling to build in rtm-silo
>
> https://launchpadlibrarian.net/186133082/buildlog_ubuntu-
> rtm-14.09-i386.unity8_8.00%2B14.10.20140930.2-0ubuntu1_FAILEDTOBUILD.txt.gz
>
> looks like some code unhappiness & unit test failure of touchRegistryInput

Fixed.

[Daniel d'Andrada (dandrader)]

> currently failling to build in rtm-silo
>
> https://launchpadlibrarian.net/186133082/buildlog_ubuntu-
> rtm-14.09-i386.unity8_8.00%2B14.10.20140930.2-0ubuntu1_FAILEDTOBUILD.txt.gz
>
> looks like some code unhappiness & unit test failure of touchRegistryInput

Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1302
http://jenkins.qa.ubuntu.com/job/unity8-ci/4450/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5334/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1446
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1544/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1544/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6586/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1304
http://jenkins.qa.ubuntu.com/job/unity8-ci/4454/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5344
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1548
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1548
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6596
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6596/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13953

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1302. By Josh Arenson on 2014-09-30

Fix lp:1367894 by correcting how the minute value is calculated in the panel. Fixes: 1367894
Approved by: Nick Dedekind

1303. By Ying-Chun Liu on 2014-09-30

Remove maxLineCount in preview. (LP: 1328513) Fixes: 1328513
Approved by: Michael Terry

1304. By Gerry Boland on 2014-09-30

Cleanup: Remove unused member and fix small syntax error in OrientationLock
Approved by: Daniel d'Andrada

1305. By Andrea Cimitan on 2014-09-30

Move activity indicator on top of keyboard Fixes: 1354519
Approved by: Michael Terry

1306. By Alexandros Frantzis on 2014-09-30

Remove stale trusted socket before starting unity8 from upstart (LP: #1371597) Fixes: 1371597
Approved by: Ying-Chun Liu

1307. By Michael Terry on 2014-09-30

Fix some code that accidentally landed in trunk before it got cleaned up. The current code just has some duplication to it that should be unified.
Approved by: Michael Zanetti

1308. By Michael Terry on 2014-09-30

Implement latest visual designs for passphrase lockscreen.

The visual specs are here:
https://drive.google.com/a/canonical.com/folderview?id=0B8I8ZVKH-8Ssb2Zhcm9kUE9TLVE

This branch does a few things:

- Total redesign for passphrase lockscreen. It now has no visible text box nor says "Hello".
- Total redesign of how we inform the user that they have attempted to log in too many times. Now instead of saying something like "please wait" in the same lockscreen, we show a custom lockscreen with a longer message and a lock icon.
- Tweak the spacing on the passcode lockscreen.
- Adds a phone icon to the "Emergency Call" label on the bottom -- and makes that label move up if the OSK covers it.
- Changes the "Swipe to Unlock" text to just "Unlock" with arrow brackets on either side.
Approved by: Michael Zanetti

1309. By Michael Terry on 2014-09-30

Make it easier to use the Lockscreen component from the welcome wizard.
Approved by: Albert Astals Cid

1310. By Daniel d'Andrada on 2014-09-30

Add gdbTestComponentName build targets
Approved by: Michael Zanetti

1311. By Michael Terry on 2014-09-30

Limit how much memory we reserve for the greeter background image, allowing giant images to appear correctly.

The downside is that even if the image is smaller, we'll still reserve the whole screen size in memory. But we avoid the actual bug anyway. Fixes: 1373462
Approved by: Michael Zanetti

1312. By Nick Dedekind on 2014-09-30

Fixed DefaultIndicatorPage test. Fixed warnings from test.
Approved by: Albert Astals Cid

1313. By PS Jenkins bot on 2014-09-30

Releasing 8.00+14.10.20140930.2-0ubuntu1

[Albert Astals Cid (aacid)]

Do you think you can add to the commit a two or three lines description of the big picture of this change so that if someone in the future comes back looking at it has a starting point?

review: Needs Information

[Albert Astals Cid (aacid)]

Copyright (C) 2013 Canonical -> 2014

review: Needs Fixing

[Albert Astals Cid (aacid)]

 m_touchId = touchId;
 m_candidate = candidate;

Move those up to the constructor initializer list?

review: Needs Fixing

[Albert Astals Cid (aacid)]

default: // Qt::TouchPointReleased:
default: //QEvent::TouchCancel

I think it's better if you actually add a case so if/when they add new values to the enum we get a warning.

review: Needs Fixing

[Albert Astals Cid (aacid)]

for (int i=0; i < ev->touchPoints().size(); ++i) {
   const QTouchEvent::TouchPoint& touchPoint = ev->touchPoints().at(i);

foreach?

review: Needs Fixing

[Albert Astals Cid (aacid)]

template <class ItemType> class Pool

Can you please document the functions that ItemType has to have to be able to use Pool?

review: Needs Fixing

[Albert Astals Cid (aacid)]

virtual void start() { m_isRunning = true; };

Remove the extra ; at the end

review: Needs Fixing

[Albert Astals Cid (aacid)]

 FakeTimer(QObject *parent = nullptr) needs to initialize m_interval to something

review: Needs Fixing

[Albert Astals Cid (aacid)]

auto &watchers = touchInfo->watchers;

is this smart enough to make it const? if not make it const :)

review: Needs Fixing

[lp:~dandrader/unity8/touchOwnership]

1314. By PS Jenkins bot on 2014-10-01

Resync trunk

[Daniel d'Andrada (dandrader)]

> Do you think you can add to the commit a two or three lines description of the
> big picture of this change so that if someone in the future comes back looking
> at it has a starting point?

Done.

[Daniel d'Andrada (dandrader)]

> Copyright (C) 2013 Canonical -> 2014

Done.

[Albert Astals Cid (aacid)]

what about this?

=== modified file 'libs/UbuntuGestures/TouchRegistry.cpp'
--- libs/UbuntuGestures/TouchRegistry.cpp 2014-09-26 16:08:18 +0000
+++ libs/UbuntuGestures/TouchRegistry.cpp 2014-10-01 11:00:28 +0000
@@ -139,10 +139,10 @@
     // TODO: Consider what happens if an item calls any of TouchRegistry's public methods
     // from the event handler callback.
     m_inDispatchLoop = true;
- auto it = touchIdsForItems.begin();
- while (it != touchIdsForItems.end()) {
+ auto it = touchIdsForItems.constBegin();
+ while (it != touchIdsForItems.constEnd()) {
         QQuickItem *item = it.key();
- QList<int> &touchIds = it.value();
+ const QList<int> &touchIds = it.value();
         dispatchPointsToItem(event, touchIds, item);
         ++it;
     };
@@ -163,7 +163,7 @@
    Extracts the touches with the given touchIds from event and send them in a
    UnownedTouchEvent to the given item
  */
-void TouchRegistry::dispatchPointsToItem(const QTouchEvent *event, QList<int> &touchIds,
+void TouchRegistry::dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,
         QQuickItem *item)
 {
     Qt::TouchPointStates touchPointStates = 0;

=== modified file 'libs/UbuntuGestures/TouchRegistry.h'
--- libs/UbuntuGestures/TouchRegistry.h 2014-09-26 15:52:09 +0000
+++ libs/UbuntuGestures/TouchRegistry.h 2014-10-01 11:01:03 +0000
@@ -156,7 +156,7 @@

     static void translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint);

- static void dispatchPointsToItem(const QTouchEvent *event, QList<int> &touchIds,
+ static void dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,
                                      QQuickItem *item);
     void freeEndedTouchInfos();

[Daniel d'Andrada (dandrader)]

> m_touchId = touchId;
> m_candidate = candidate;
>
> Move those up to the constructor initializer list?

Done.

[Daniel d'Andrada (dandrader)]

> default: // Qt::TouchPointReleased:
> default: //QEvent::TouchCancel
>
> I think it's better if you actually add a case so if/when they add new values
> to the enum we get a warning.

Done.

[Daniel d'Andrada (dandrader)]

> for (int i=0; i < ev->touchPoints().size(); ++i) {
> const QTouchEvent::TouchPoint& touchPoint = ev->touchPoints().at(i);
>
> foreach?

Done.

[Albert Astals Cid (aacid)]

In TouchRegistry::dispatchPointsToItem who is deleting?

QTouchEvent *eventForItem = new QTouchEvent

?

review: Needs Information

[Daniel d'Andrada (dandrader)]

> template <class ItemType> class Pool
>
> Can you please document the functions that ItemType has to have to be able to
> use Pool?

Done.

[Albert Astals Cid (aacid)]

"2- That item will receive UnownedTouchEvents about for items"

I could not understand, Daniel agrees needs to be fixed

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> virtual void start() { m_isRunning = true; };
>
> Remove the extra ; at the end

Done.

[Daniel d'Andrada (dandrader)]

> FakeTimer(QObject *parent = nullptr) needs to initialize m_interval to
> something

Done.

[Daniel d'Andrada (dandrader)]

> auto &watchers = touchInfo->watchers;
>
> is this smart enough to make it const? if not make it const :)

Done.

[Daniel d'Andrada (dandrader)]

> what about this?
>
> === modified file 'libs/UbuntuGestures/TouchRegistry.cpp'
> [...]

Done.

[Daniel d'Andrada (dandrader)]

> In TouchRegistry::dispatchPointsToItem who is deleting?
>
> QTouchEvent *eventForItem = new QTouchEvent
>
> ?

Oh, you scared me for a minute.

UnownedTouchEvent::m_touchEvent is a QScopedPointer. Thus eventForItem will get deleted once the UnownedTouchEvent that holds it gets deleted.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1305
http://jenkins.qa.ubuntu.com/job/unity8-ci/4458/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5370
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1552
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6622
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6622/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13994

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

> "2- That item will receive UnownedTouchEvents about for items"
>
> I could not understand, Daniel agrees needs to be fixed

Done.

[lp:~dandrader/unity8/touchOwnership]

1315. By Daniel d'Andrada on 2014-10-01

Add touch ownership logic on top of qt input handling

It does mainly 3 things:
- Adds TouchRegistry.
- Adds TouchGate
- Modifies DirectionalDragArea so that it uses TouchRegistry and only grabs a touch once it has recognized a gesture done by it.

TouchRegistry was put into a library as both unity8 and Ubuntu.Gestures plugin need to use it.

The next step is to have surfaces participating in the touch ownership negotiation. But for now they're put behind TouchGates so that they only receive thouches whose ownership has already been settled.

The most noticeable improvement of this patch is that taps near screen edges will now reach applications.

[Albert Astals Cid (aacid)]

DirectionalDragArea::touchEvent_undecided has a return at the end that is not necessary

review: Needs Fixing

[Albert Astals Cid (aacid)]

 if (oldStatus == Undecided) {
 }

in WaitingForTouch case of DirectionalDragArea::setStatus feels like it either needs a body or should be removed.

review: Needs Fixing

[lp:~dandrader/unity8/touchOwnership]

1316. By Daniel d'Andrada on 2014-10-01

exit loop once there's no point in continuing

1317. By Daniel d'Andrada on 2014-10-01

Remove superfluous return statement.

[Daniel d'Andrada (dandrader)]

On 01/10/14 10:38, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> DirectionalDragArea::touchEvent_undecided has a return at the end that is not necessary
Fixed.

[lp:~dandrader/unity8/touchOwnership]

1318. By Daniel d'Andrada on 2014-10-01

Remove leftover code

[Daniel d'Andrada (dandrader)]

On 01/10/14 10:40, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> if (oldStatus == Undecided) {
> }
>
> in WaitingForTouch case of DirectionalDragArea::setStatus feels like it either needs a body or should be removed.

Curious leftover. :)
Removed.

[Albert Astals Cid (aacid)]

What about ?

 void TouchGate::dispatchFullyOwnedEvents()
 {
     while (!m_storedEvents.isEmpty() && eventIsFullyOwned(m_storedEvents.first())) {
- QTouchEvent *event = m_storedEvents.first();
- m_storedEvents.removeFirst();
+ QTouchEvent *event = m_storedEvents.takeFirst();

[Albert Astals Cid (aacid)]

I think we're leaking event in TouchGate::removeTouchFromStoredEvents when doing m_storedEvents.removeAt(i); ?

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 01/10/14 11:44, Albert Astals Cid wrote:
> What about ?
>
> void TouchGate::dispatchFullyOwnedEvents()
> {
> while (!m_storedEvents.isEmpty() && eventIsFullyOwned(m_storedEvents.first())) {
> - QTouchEvent *event = m_storedEvents.first();
> - m_storedEvents.removeFirst();
> + QTouchEvent *event = m_storedEvents.takeFirst();
>

Done.

[lp:~dandrader/unity8/touchOwnership]

1319. By Daniel d'Andrada on 2014-10-01

Small refactoring

[Albert Astals Cid (aacid)]

Should we have a qDeleteAll(m_storedEvents); on TouchGate destructor?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1309
http://jenkins.qa.ubuntu.com/job/unity8-ci/4460/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5376
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1554
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1554
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5087
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6628
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14004

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1320. By Daniel d'Andrada on 2014-10-01

TouchGate can no longer leak stored QTouchEvents

[Daniel d'Andrada (dandrader)]

On 01/10/14 11:46, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> I think we're leaking event in TouchGate::removeTouchFromStoredEvents when doing m_storedEvents.removeAt(i); ?
Yes. Fixed. Thanks for spotting this.

[Daniel d'Andrada (dandrader)]

On 01/10/14 11:52, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> Should we have a qDeleteAll(m_storedEvents); on TouchGate destructor?
No longer applicable after I refactored m_storedEvents.

[lp:~dandrader/unity8/touchOwnership]

1321. By Daniel d'Andrada on 2014-10-01

Missing bit

1322. By Daniel d'Andrada on 2014-10-01

Clean up things

1323. By Daniel d'Andrada on 2014-10-01

Fix debug code

1324. By Daniel d'Andrada on 2014-10-01

fix tst_ApplicationWindow.qml

[Albert Astals Cid (aacid)]

Failing tests:

FAIL! : qmltestrunner::Drag and Drop::test_dragndrop(startDrag) property x
   Actual (): -64
   Expected (): 0
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(82)]

FAIL! : qmltestrunner::Drag and Drop::test_dragndrop(startDrag) property x
   Actual (): -64
   Expected (): 0
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(82)]

FAIL! : qmltestrunner::Drag and Drop::test_quicklist_dismiss() property visible
   Actual (): false
   Expected (): true
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(384)]

FAIL! : qmltestrunner::Drag and Drop::test_quicklist_positioning(bottom) property opacity
   Actual (): 0
   Expected (): 0.8
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(419)]

FAIL! : qmltestrunner::Launcher::test_clickingOnAppIconCausesSignalEmission() property lastSelectedApplication
   Actual ():
   Expected (): dialer-app
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(139)]

FAIL! : qmltestrunner::test_clickFlick(unfolded top) 'verify()' returned FALSE. ()
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(253)]

FAIL! : qmltestrunner::test_clickFlick(unfolded bottom) 'verify()' returned FALSE. ()
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(253)]

FAIL! : qmltestrunner::Panel::test_drag_show(fullscreen) function returned unexpected result
   Actual (): false
   Expected (): true
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Panel/tst_Panel.qml(281)]

QFATAL : qmltestrunner::Panel::test_drag_show(pinned-alreadyOpen) ASSERT: "!event->touchPointStates().testFlag(Qt::TouchPointPressed)" in file /home/tsdgeos_work/phablet/unity8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp, line 263
FAIL! : qmltestrunner::Panel::test_drag_show(pinned-alreadyOpen) Received a fatal error.
   Loc: [Unknown file(0)]

FAIL! : qmltestrunner::PhoneStage::test_enterSpread(<position1 (linear movement)) property focusedApplicationId
   Actual (): webbrowser-app
   Expected (): facebook-webapp

review: Needs Fixing

[lp:~dandrader/unity8/touchOwnership]

1325. By Daniel d'Andrada on 2014-10-02

Add a mock UbuntuKeyboardInfo

1326. By Daniel d'Andrada on 2014-10-02

Made tst_Launcher tests pass again took the opportunity to recfactor it a bit

[Daniel d'Andrada (dandrader)]

> Failing tests:
>
> [...]

Fixed.

[Albert Astals Cid (aacid)]

New one

FAIL! : qmltestrunner::Launcher::test_clickFlick(unfolded bottom) 'verify()' returned FALSE. ()
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(282)]

review: Needs Fixing

[Albert Astals Cid (aacid)]

Interestingly now test_clickFlick failed but got

FAIL! : qmltestrunner::Launcher::test_dragndrop(fullDrag vertical) property itemOpacity
   Actual (): 1
   Expected (): 0
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launcher/tst_Launcher.qml(318)]

Try looping it with

while [ true ]; do make xvfbtestLauncher; if [ $? -ne 0 ]; then break; fi; done

review: Needs Fixing

[Albert Astals Cid (aacid)]

Crashes when trying to show the dash overview.

$ GRID_UNIT_PX=12 gdb -arg ./builddir/src/Dash/unity8-dash -mousetouch

#0 0x00007fffcf9c0f11 in Pool<TouchRegistry::TouchInfo>::forEach<TouchRegistry::findTouchInfo(int)::<lambda(Pool<TouchRegistry::TouchInfo>::Iterator&)> >(TouchRegistry::<lambda(Pool<TouchRegistry::TouchInfo>::Iterator&)>) (this=0x10, func=...)
    at /home/tsdgeos_work/phablet/unity8/touchOwnership/libs/UbuntuGestures/Pool.h:116
#1 0x00007fffcf9c0675 in TouchRegistry::findTouchInfo (this=0x0, id=0) at /home/tsdgeos_work/phablet/unity8/touchOwnership/libs/UbuntuGestures/TouchRegistry.cpp:380
#2 0x00007fffcf9bfdd7 in TouchRegistry::addCandidateOwnerForTouch (this=0x0, id=0, candidate=0xb67fb0) at /home/tsdgeos_work/phablet/unity8/touchOwnership/libs/UbuntuGestures/TouchRegistry.cpp:252
#3 0x00007fffcfbe4ed2 in DirectionalDragArea::touchEvent_absent (this=0xb67fb0, event=0x45f53e0) at /home/tsdgeos_work/phablet/unity8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp:443
#4 0x00007fffcfbe4bf8 in DirectionalDragArea::touchEvent (this=0xb67fb0, event=0x45f53e0) at /home/tsdgeos_work/phablet/unity8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp:370
#5 0x00007ffff6c6677d in QQuickItem::event(QEvent*) () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#6 0x00007fffcfbe4606 in DirectionalDragArea::event (this=0xb67fb0, event=0x45f53e0) at /home/tsdgeos_work/phablet/unity8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp:241
#7 0x00007ffff610ad05 in QCoreApplication::notify (this=<optimized out>, receiver=<optimized out>, event=<optimized out>) at kernel/qcoreapplication.cpp:997
#8 0x00007ffff610ae3b in QCoreApplication::notifyInternal (this=0x613000, receiver=0xb67fb0, event=0x45f53e0) at kernel/qcoreapplication.cpp:935
#9 0x00007ffff6c77f57 in QQuickWindowPrivate::deliverMatchingPointsToItem(QQuickItem*, QTouchEvent*, QSet<int>*, QSet<int> const&, QList<QTouchEvent::TouchPoint> const&) () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#10 0x00007ffff6c788cb in QQuickWindowPrivate::deliverTouchPoints(QQuickItem*, QTouchEvent*, QList<QTouchEvent::TouchPoint> const&, QSet<int>*, QHash<QQuickItem*, QList<QTouchEvent::TouchPoint> >*) () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#11 0x00007ffff6c7873e in QQuickWindowPrivate::deliverTouchPoints(QQuickItem*, QTouchEvent*, QList<QTouchEvent::TouchPoint> const&, QSet<int>*, QHash<QQuickItem*, QList<QTouchEvent::TouchPoint> >*) () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#12 0x00007ffff6c7873e in QQuickWindowPrivate::deliverTouchPoints(QQuickItem*, QTouchEvent*, QList<QTouchEvent::TouchPoint> const&, QSet<int>*, QHash<QQuickItem*, QList<QTouchEvent::TouchPoint> >*) () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#13 0x00007ffff6c7873e in QQuickWindowPrivate::deliverTouchPoints(QQuickItem*, QTouchEvent*, QList<QTouchEvent::TouchPoint> const&, QSet<int>*, QHash<QQuickItem*, QList<QTouchEvent::TouchPoint> >*) () from /usr/lib/x86_64-linux-gnu/libQt5Quick.so.5
#14 0x00007ffff6c7873e in QQuickWindowPrivate::deliverTouchPoints(QQuickItem*, QTouchEvent*, QList<QTouchEvent::TouchPoint> const&, QSet<int>*, QHash<QQuickItem*, QList<Q...

review: Needs Fixing

[lp:~dandrader/unity8/touchOwnership]

1327. By Daniel d'Andrada on 2014-10-02

unity8-dash also needs a TouchRegistry

as it uses DirectionDragArea as well

[Daniel d'Andrada (dandrader)]

On 02/10/14 12:10, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> Crashes when trying to show the dash overview.

Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1327
http://jenkins.qa.ubuntu.com/job/unity8-ci/4480/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5445
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1465
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1574
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6697
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6697/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14080

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I've been playing with it and the right hand site is much better but still is a bit flacky, i'm using this ppa https://launchpad.net/~unity-team/+archive/ubuntu/phone-right-edge/ that contains both lp:~aacid/unity8/list_on_bottom_swipe and merge edgeowner lp:~dandrader/unity8/touchOwnership and half of the times i do a click tap very close to the right edge while being the the "scopes list" (the thing that shows when you pull up from the bottom in the scopes) i get the favorite/unfavorite toggled and the other half i get the right edge animation.

Can you have a look? I did put a
  Rectangle { anchors.fill: parent; color: "red"; opacity: 0.5 }
inside starArea of /usr/share/unity8/Dash/ScopesListCategoryItem.qml to make sure it's really attach to the border.

[Daniel d'Andrada (dandrader)]

> I've been playing with it and the right hand site is much better but still is
> a bit flacky, i'm using this ppa https://launchpad.net/~unity-
> team/+archive/ubuntu/phone-right-edge/ that contains both
> lp:~aacid/unity8/list_on_bottom_swipe and merge edgeowner
> lp:~dandrader/unity8/touchOwnership and half of the times i do a click tap
> very close to the right edge while being the the "scopes list" (the thing that
> shows when you pull up from the bottom in the scopes) i get the
> favorite/unfavorite toggled and the other half i get the right edge animation.
>
> Can you have a look? I did put a
> Rectangle { anchors.fill: parent; color: "red"; opacity: 0.5 }
> inside starArea of /usr/share/unity8/Dash/ScopesListCategoryItem.qml to make
> sure it's really attach to the border.

The remaining problem with the right edge is that its edge-drag recognizer parameters makes it recognize pretty much anything as a edge drag. So a tap there with a fat finger will cause a small movement enough for it to consider as an edge drag. So it's parameters must be tweaked. Strictly speaking it's a separate issue and thus I was planning to tackle it on a separate MP as this one is already huge. But maybe I should do it already...

[lp:~dandrader/unity8/touchOwnership]

1328. By Daniel d'Andrada on 2014-10-03

Make tst_Launcher stable

[Daniel d'Andrada (dandrader)]

> New one
>
> FAIL! : qmltestrunner::Launcher::test_clickFlick(unfolded bottom) 'verify()'
> returned FALSE. ()
> Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/Launc
> her/tst_Launcher.qml(282)]

Fixed. tst_Launcher works reliably now.

[lp:~dandrader/unity8/touchOwnership]

1329. By Daniel d'Andrada on 2014-10-03

Only move the stage once an edge-drag gesture has been recognized

[Daniel d'Andrada (dandrader)]

> > I've been playing with it and the right hand site is much better but still
> is
> > a bit flacky, i'm using this ppa https://launchpad.net/~unity-
> > team/+archive/ubuntu/phone-right-edge/ that contains both
> > lp:~aacid/unity8/list_on_bottom_swipe and merge edgeowner
> > lp:~dandrader/unity8/touchOwnership and half of the times i do a click tap
> > very close to the right edge while being the the "scopes list" (the thing
> that
> > shows when you pull up from the bottom in the scopes) i get the
> > favorite/unfavorite toggled and the other half i get the right edge
> animation.
> >
> > Can you have a look? I did put a
> > Rectangle { anchors.fill: parent; color: "red"; opacity: 0.5 }
> > inside starArea of /usr/share/unity8/Dash/ScopesListCategoryItem.qml to make
> > sure it's really attach to the border.
>
> The remaining problem with the right edge is that its edge-drag recognizer
> parameters makes it recognize pretty much anything as a edge drag. So a tap
> there with a fat finger will cause a small movement enough for it to consider
> as an edge drag. So it's parameters must be tweaked. Strictly speaking it's a
> separate issue and thus I was planning to tackle it on a separate MP as this
> one is already huge. But maybe I should do it already...

Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1328
http://jenkins.qa.ubuntu.com/job/unity8-ci/4485/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5472
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1579
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1579
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6724
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6724/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14116

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1329
http://jenkins.qa.ubuntu.com/job/unity8-ci/4486/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5477
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1471
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1580
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6729
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6729/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14121

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1330. By Daniel d'Andrada on 2014-10-03

Only show app shadows when we are indeed perfoming and edge drag

1331. By Daniel d'Andrada on 2014-10-03

Only animate the dash overview drag after the gesture has been recognized

[Daniel d'Andrada (dandrader)]

Found an issue that seems to have been caused by this branch:
1 - Launch a couple of apps
2 - go to the app spread
3 - Drag in the launcher
4 - tap on the ubuntu icon

expected outcome:
dash is brought to foreground

actual outcome:
the app spread behind the launcher just shudders a bit and that's it. Only on the third tap or so does the dash finally go to foreground.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1330
http://jenkins.qa.ubuntu.com/job/unity8-ci/4489/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5491
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1583
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6743
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6743/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14136

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1331
http://jenkins.qa.ubuntu.com/job/unity8-ci/4490/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5494
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1584
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1584
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6746
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6746/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14146

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1332. By Daniel d'Andrada on 2014-10-06

Add regression test Shell.test_tapUbuntuIconInLauncherOverAppSpread

1333. By Daniel d'Andrada on 2014-10-06

Merge lp:unity8

[ Andrea Cimitan ]
* Tweak card header to match the spec
* Add preview image slideshow (LP: #1351537)
[ Michał Sawicz ]
* Cache more things in memory, so flicking scopes should be faster
  (LP: #1336724)
* Tweak card header to match the spec
* Save texture memory by limiting sourceSize (LP: #1338430)
[ Ying-Chun Liu ]
* Add attributes to Preview. (LP: #1282460)
[ Albert Astals ]
* Update pot
* Cache more things in memory, so flicking scopes should be faster
  (LP: #1336724)
* Save texture memory by limiting sourceSize (LP: #1338430)
* Clip the settings list
* Fix unlocking from the left again
* Add wait_ makes tests more reliable
[ Michael Zanetti ]
* fix fading out the launcher instead of sliding it out on left-edge
  minimizing an app.
* Make the DashCommunicator async and more flexible to handle a
  lifecycle-suspended dash (LP: #1339883)
[ Michael Terry ]
* Retry unlock-device script if it fails, as there is always a risk of
  a small race with boot-up. (LP: #1370644)
* Add pull-to-refresh functionality to scopes. (LP: #1368336)
[ CI bot ]
* Resync trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1333
http://jenkins.qa.ubuntu.com/job/unity8-ci/4502/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5540/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1487/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1596/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1596/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6792/console

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1334. By Daniel d'Andrada on 2014-10-07

Work around bug in Qt

[Daniel d'Andrada (dandrader)]

> Found an issue that seems to have been caused by this branch:
> 1 - Launch a couple of apps
> 2 - go to the app spread
> 3 - Drag in the launcher
> 4 - tap on the ubuntu icon
>
> expected outcome:
> dash is brought to foreground
>
> actual outcome:
> the app spread behind the launcher just shudders a bit and that's it. Only on
> the third tap or so does the dash finally go to foreground.

Fixed it. It's actually caused by a problem in Qt code.

[Albert Astals Cid (aacid)]

> > Found an issue that seems to have been caused by this branch:
> > 1 - Launch a couple of apps
> > 2 - go to the app spread
> > 3 - Drag in the launcher
> > 4 - tap on the ubuntu icon
> >
> > expected outcome:
> > dash is brought to foreground
> >
> > actual outcome:
> > the app spread behind the launcher just shudders a bit and that's it. Only
> on
> > the third tap or so does the dash finally go to foreground.
>
> Fixed it. It's actually caused by a problem in Qt code.

Should we file a bug for it with testcase?

review: Needs Information

[lp:~dandrader/unity8/touchOwnership]

1335. By Daniel d'Andrada on 2014-10-07

Remove traling whitespace

1336. By Daniel d'Andrada on 2014-10-07

Add TODO comment on bug report

[Daniel d'Andrada (dandrader)]

> > > Found an issue that seems to have been caused by this branch:
> > > 1 - Launch a couple of apps
> > > 2 - go to the app spread
> > > 3 - Drag in the launcher
> > > 4 - tap on the ubuntu icon
> > >
> > > expected outcome:
> > > dash is brought to foreground
> > >
> > > actual outcome:
> > > the app spread behind the launcher just shudders a bit and that's it. Only
> > on
> > > the third tap or so does the dash finally go to foreground.
> >
> > Fixed it. It's actually caused by a problem in Qt code.
>
> Should we file a bug for it with testcase?

Yes, but this kind of thing takes time and a critical bug just landed on my lap.
Added it to my TODO list and add a TODO comment in the code.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1334
http://jenkins.qa.ubuntu.com/job/unity8-ci/4521/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5590/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1506
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1615/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1615/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6842/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1336
http://jenkins.qa.ubuntu.com/job/unity8-ci/4524/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5611
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6863
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6863/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14282

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1337. By Daniel d'Andrada on 2014-10-07

Update tst_PhoneStage.qml

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1337
http://jenkins.qa.ubuntu.com/job/unity8-ci/4531/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5634/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1516/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1625
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6886/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1337
http://jenkins.qa.ubuntu.com/job/unity8-ci/4533/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5650/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1518/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1629
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1627
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6902/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

So i've been playing with the bottom edge and still didn't like that sometimes you can get it to scroll the list while doing the overview and i came up with http://paste.ubuntu.com/8520086/ that seems to solve the thing for me and you can still click on the bottom edges.

What do you think? Maybe the name should forceNoFlickInteractive since ClickInteractions are still enabled?

[lp:~dandrader/unity8/touchOwnership]

1338. By Daniel d'Andrada on 2014-10-08

Avoid conflict between dash vertical flickable and its bottom-edge DDA

[Daniel d'Andrada (dandrader)]

> So i've been playing with the bottom edge and still didn't like that sometimes
> you can get it to scroll the list while doing the overview and i came up with
> http://paste.ubuntu.com/8520086/ that seems to solve the thing for me and you
> can still click on the bottom edges.
>
> What do you think? Maybe the name should forceNoFlickInteractive since
> ClickInteractions are still enabled?

I think it's a sound approach. Pushed with minor modifications (added a big fat comment and s/forceNoInteractive/forceNonInteractive)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1338
http://jenkins.qa.ubuntu.com/job/unity8-ci/4538/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5662/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1523/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1634
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1632
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6914/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

$ make xvfbtestPhoneStage
...
QFATAL : qmltestrunner::PhoneStage::test_enterSpread(>position1) ASSERT: "event->type() == QEvent::TouchBegin" in file /home/tsdgeos_work/phablet/unity8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp, line 475
FAIL! : qmltestrunner::PhoneStage::test_enterSpread(>position1) Received a fatal error.

review: Needs Fixing

[Albert Astals Cid (aacid)]

$ make xvfbtestShell
....
FAIL! : qmltestrunner::Shell::test_leftEdgeDrag(with launcher) property focusedApplicationId
   Actual (): dialer-app
   Expected (): unity8-dash
   Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/tst_Shell.qml(440)]

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

On 08/10/14 10:40, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> $ make xvfbtestPhoneStage
> ...
> QFATAL : qmltestrunner::PhoneStage::test_enterSpread(>position1) ASSERT: "event->type() == QEvent::TouchBegin" in file /home/tsdgeos_work/phablet/unity8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp, line 475
> FAIL! : qmltestrunner::PhoneStage::test_enterSpread(>position1) Received a fatal error.
>
I don't get this error. Are you sure you have the latest version of this
branch?

[Daniel d'Andrada (dandrader)]

On 08/10/14 10:42, Albert Astals Cid wrote:
> Review: Needs Fixing
>
> $ make xvfbtestShell
> ....
> FAIL! : qmltestrunner::Shell::test_leftEdgeDrag(with launcher) property focusedApplicationId
> Actual (): dialer-app
> Expected (): unity8-dash
> Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/tst_Shell.qml(440)]
>
That's failing in lp:unity8 as well. I'm not fixing it in this branch.

[Albert Astals Cid (aacid)]

> On 08/10/14 10:40, Albert Astals Cid wrote:
> > Review: Needs Fixing
> >
> > $ make xvfbtestPhoneStage
> > ...
> > QFATAL : qmltestrunner::PhoneStage::test_enterSpread(>position1) ASSERT:
> "event->type() == QEvent::TouchBegin" in file /home/tsdgeos_work/phablet/unity
> 8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp, line 475
> > FAIL! : qmltestrunner::PhoneStage::test_enterSpread(>position1) Received a
> fatal error.
> >
> I don't get this error. Are you sure you have the latest version of this
> branch?

Error went away when i dist-upgraded and this came in via the ppa so i guess there is a need to prepend the local libUbuntuGestures to the library path so the one compiled in the code is the one that takes precedence and not this one.

[Daniel d'Andrada (dandrader)]

On 08/10/14 11:01, Albert Astals Cid wrote:
>> On 08/10/14 10:40, Albert Astals Cid wrote:
>>> Review: Needs Fixing
>>>
>>> $ make xvfbtestPhoneStage
>>> ...
>>> QFATAL : qmltestrunner::PhoneStage::test_enterSpread(>position1) ASSERT:
>> "event->type() == QEvent::TouchBegin" in file /home/tsdgeos_work/phablet/unity
>> 8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp, line 475
>>> FAIL! : qmltestrunner::PhoneStage::test_enterSpread(>position1) Received a
>> fatal error.
>> I don't get this error. Are you sure you have the latest version of this
>> branch?
> Error went away when i dist-upgraded and this came in via the ppa so i guess there is a need to prepend the local libUbuntuGestures to the library path so the one compiled in the code is the one that takes precedence and not this one.
Code in libUbuntuGestures didn't change in a while.

[Albert Astals Cid (aacid)]

> On 08/10/14 11:01, Albert Astals Cid wrote:
> >> On 08/10/14 10:40, Albert Astals Cid wrote:
> >>> Review: Needs Fixing
> >>>
> >>> $ make xvfbtestPhoneStage
> >>> ...
> >>> QFATAL : qmltestrunner::PhoneStage::test_enterSpread(>position1) ASSERT:
> >> "event->type() == QEvent::TouchBegin" in file
> /home/tsdgeos_work/phablet/unity
> >> 8/touchOwnership/plugins/Ubuntu/Gestures/DirectionalDragArea.cpp, line 475
> >>> FAIL! : qmltestrunner::PhoneStage::test_enterSpread(>position1) Received
> a
> >> fatal error.
> >> I don't get this error. Are you sure you have the latest version of this
> >> branch?
> > Error went away when i dist-upgraded and this came in via the ppa so i guess
> there is a need to prepend the local libUbuntuGestures to the library path so
> the one compiled in the code is the one that takes precedence and not this
> one.
> Code in libUbuntuGestures didn't change in a while.

Ok, the plugin then r1334?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1338
http://jenkins.qa.ubuntu.com/job/unity8-ci/4551/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5706/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1647
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1645
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6958/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1338
http://jenkins.qa.ubuntu.com/job/unity8-ci/4560/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5718
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1654
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6970
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6970/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14381

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1339. By Daniel d'Andrada on 2014-10-09

left-edge swipe should always work, even when the launcher is being show

1340. By Daniel d'Andrada on 2014-10-09

Work around qt bug to make tests pass

[Daniel d'Andrada (dandrader)]

> On 08/10/14 10:42, Albert Astals Cid wrote:
> > Review: Needs Fixing
> >
> > $ make xvfbtestShell
> > ....
> > FAIL! : qmltestrunner::Shell::test_leftEdgeDrag(with launcher) property
> focusedApplicationId
> > Actual (): dialer-app
> > Expected (): unity8-dash
> > Loc: [/home/tsdgeos_work/phablet/unity8/touchOwnership/tests/qmltests/tst
> _Shell.qml(440)]
> >
> That's failing in lp:unity8 as well. I'm not fixing it in this branch.

I messed up. Indeed passes in lp:unity8.
Fixed it, finally.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1339
http://jenkins.qa.ubuntu.com/job/unity8-ci/4587/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5756
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1681
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7009
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14425

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/touchOwnership]

1341. By Daniel d'Andrada on 2014-10-09

DDA - ungrab current mouse grabber instead of going all the way grabbing for himself

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1340
http://jenkins.qa.ubuntu.com/job/unity8-ci/4595/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5774
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1581
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1691
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1689
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5433
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7026
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7026/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14447

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1341
http://jenkins.qa.ubuntu.com/job/unity8-ci/4601/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5787/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1697
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1695
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5443/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7039
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7039/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14462

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
qmluitests: ShellWithPin::test_factoryReset is broken in trunk
autopilot: could not reproduce locally

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[lp:~dandrader/unity8/touchOwnership]

1342. By Daniel d'Andrada on 2014-10-10

Bump qtmir version dependency

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-06 15:56:08 +0000
+++ CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -58,6 +58,7 @@
 include(GNUInstallDirs)
 
 set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
+set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
 
 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)
 if(SHELL_INSTALL_QML STREQUAL "")
@@ -109,6 +110,7 @@
 
 # add subdirectories to build
 add_subdirectory(include)
+add_subdirectory(libs)
 add_subdirectory(src)
 add_subdirectory(tools)
 add_subdirectory(qml)

=== modified file 'debian/control'
--- debian/control	2014-10-06 08:00:45 +0000
+++ debian/control	2014-10-10 15:05:15 +0000
@@ -86,7 +86,7 @@
          qmenumodel-qml (>= 0.2.8),
          qml-module-qtquick-xmllistmodel,
          qtdeclarative5-gsettings1.0,
-         qtdeclarative5-qtmir-plugin (>= 0.4.3),
+         qtdeclarative5-qtmir-plugin (>= 0.4.4),
          qtdeclarative5-ubuntu-telephony0.1,
          unity-launcher-impl-4,
          unity8-common (= ${source:Version}),

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2014-09-05 12:25:51 +0000
+++ debian/unity8-private.install	2014-10-10 15:05:15 +0000
@@ -9,5 +9,6 @@
 usr/lib/*/unity8/qml/Ubuntu
 usr/lib/*/unity8/qml/Unity
 usr/lib/*/unity8/qml/Utils
+usr/lib/*/unity8/libUbuntuGestures*
 usr/share/accountsservice/interfaces
 usr/share/dbus-1/interfaces

=== added directory 'libs'
=== added file 'libs/CMakeLists.txt'
--- libs/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libs/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(UbuntuGestures)

=== added directory 'libs/UbuntuGestures'
=== added file 'libs/UbuntuGestures/CMakeLists.txt'
--- libs/UbuntuGestures/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -0,0 +1,40 @@
+# in order to include Qt's private headers
+remove_definitions(-DQT_NO_KEYWORDS)
+
+set(UbuntuGestures_SOURCES
+    CandidateInactivityTimer.cpp
+    DebugHelpers.cpp
+    Timer.cpp
+    TouchOwnershipEvent.cpp
+    TouchRegistry.cpp
+    UnownedTouchEvent.cpp
+)
+
+add_definitions(-DUBUNTUGESTURES_LIBRARY)
+
+add_library(UbuntuGestures SHARED ${UbuntuGestures_SOURCES})
+
+qt5_use_modules(UbuntuGestures Core Quick)
+
+# So that Foo.cpp can #include "Foo.moc"
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+install(TARGETS UbuntuGestures
+        DESTINATION ${SHELL_PRIVATE_LIBDIR})
+
+
+# There's no cmake var for v8 include path :-/ so create one
+LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
+if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.1.0")
+    SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)
+else()
+    SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
+endif()
+
+# DANGER! DANGER! Using Qt's private API!
+include_directories(
+    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
+    ${Qt5Quick_INCLUDE_DIRS}
+    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+    ${Qt5V8_PRIVATE_INCLUDE_DIR}
+)

=== added file 'libs/UbuntuGestures/CandidateInactivityTimer.cpp'
--- libs/UbuntuGestures/CandidateInactivityTimer.cpp	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/CandidateInactivityTimer.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include "CandidateInactivityTimer.h"
+
+namespace UbuntuGestures {
+
+CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,
+        AbstractTimerFactory &timerFactory, QObject *parent)
+    : QObject(parent)
+    , m_touchId(touchId)
+    , m_candidate(candidate)
+{
+    m_timer = timerFactory.createTimer(this);
+    connect(m_timer, &AbstractTimer::timeout,
+            this, &CandidateInactivityTimer::onTimeout);
+    m_timer->setInterval(durationMs);
+    m_timer->setSingleShot(true);
+    m_timer->start();
+}
+
+void CandidateInactivityTimer::onTimeout()
+{
+    qWarning("[TouchRegistry] Candidate for touch %d defaulted!", m_touchId);
+    Q_EMIT candidateDefaulted(m_touchId, m_candidate);
+}
+
+} // namespace UbuntuGestures

=== added file 'libs/UbuntuGestures/CandidateInactivityTimer.h'
--- libs/UbuntuGestures/CandidateInactivityTimer.h	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/CandidateInactivityTimer.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
+#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H
+
+#include <QObject>
+
+class QQuickItem;
+
+#include "Timer.h"
+
+namespace UbuntuGestures {
+
+class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {
+    Q_OBJECT
+public:
+    CandidateInactivityTimer(int touchId, QQuickItem *candidate,
+                             AbstractTimerFactory &timerFactory,
+                             QObject *parent = nullptr);
+
+    const int durationMs = 350;
+
+Q_SIGNALS:
+    void candidateDefaulted(int touchId, QQuickItem *candidate);
+private Q_SLOTS:
+    void onTimeout();
+private:
+    AbstractTimer *m_timer;
+    int m_touchId;
+    QQuickItem *m_candidate;
+};
+
+} // namespace UbuntuGestures
+
+#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

=== added file 'libs/UbuntuGestures/DebugHelpers.cpp'
--- libs/UbuntuGestures/DebugHelpers.cpp	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/DebugHelpers.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include "DebugHelpers.h"
+#include <QTouchEvent>
+
+QString touchPointStateToString(Qt::TouchPointState state)
+{
+    switch (state) {
+    case Qt::TouchPointPressed:
+        return QString("pressed");
+    case Qt::TouchPointMoved:
+        return QString("moved");
+    case Qt::TouchPointStationary:
+        return QString("stationary");
+    case Qt::TouchPointReleased:
+        return QString("released");
+    default:
+        return QString("INVALID_STATE");
+    }
+}
+
+QString touchEventToString(const QTouchEvent *ev)
+{
+    QString message;
+
+    switch (ev->type()) {
+    case QEvent::TouchBegin:
+        message.append("TouchBegin ");
+        break;
+    case QEvent::TouchUpdate:
+        message.append("TouchUpdate ");
+        break;
+    case QEvent::TouchEnd:
+        message.append("TouchEnd ");
+        break;
+    case QEvent::TouchCancel:
+        message.append("TouchCancel ");
+        break;
+    default:
+        message.append("INVALID_TOUCH_EVENT_TYPE ");
+    }
+
+    foreach(const QTouchEvent::TouchPoint& touchPoint, ev->touchPoints()) {
+        message.append(
+            QString("(id:%1, state:%2, scenePos:(%3,%4)) ")
+                .arg(touchPoint.id())
+                .arg(touchPointStateToString(touchPoint.state()))
+                .arg(touchPoint.scenePos().x())
+                .arg(touchPoint.scenePos().y())
+            );
+    }
+
+    return message;
+}

=== added file 'libs/UbuntuGestures/DebugHelpers.h'
--- libs/UbuntuGestures/DebugHelpers.h	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/DebugHelpers.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#ifndef UBUNTUGESTURES_DEBUG_HELPER_H
+#define UBUNTUGESTURES_DEBUG_HELPER_H
+
+#include <QString>
+
+#include "UbuntuGesturesGlobal.h"
+
+class QTouchEvent;
+
+UBUNTUGESTURES_EXPORT QString touchPointStateToString(Qt::TouchPointState state);
+UBUNTUGESTURES_EXPORT QString touchEventToString(const QTouchEvent *ev);
+
+#endif // UBUNTUGESTURES_DEBUG_HELPER_H

=== added file 'libs/UbuntuGestures/Pool.h'
--- libs/UbuntuGestures/Pool.h	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/Pool.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#ifndef UBUNTUGESTURES_POOL_H
+#define UBUNTUGESTURES_POOL_H
+
+#include <QVector>
+
+#include "UbuntuGesturesGlobal.h"
+
+/*
+  An object pool.
+  Avoids unnecessary creations/initializations and deletions/destructions of items. Useful
+  in a scenario where items are created and destroyed very frequently but the total number
+  of items at any given time remains small. They're stored in a unordered fashion.
+
+  To be used in Pool, ItemType needs to have the following methods:
+
+  - ItemType();
+
+  A constructor that takes no parameters. An object contructed with it must return false if
+  isValid() is called.
+
+  - bool isValid() const;
+
+  Returns wheter the object holds a valid , "filled" state or is empty.
+  Used by Pool to check if the slot occupied by this object is actually available.
+
+  - void reset();
+
+  Resets the object to its initial, empty, state. After calling this method, isValid() must
+  return false.
+ */
+template <class ItemType> class Pool
+{
+public:
+    Pool() : m_lastUsedIndex(-1) {
+    }
+
+    class Iterator {
+    public:
+        Iterator() : index(-1), item(nullptr) {}
+        Iterator(int index, ItemType *item)
+            : index(index), item(item) {}
+
+        ItemType *operator->() const { return item; }
+        ItemType &operator*() const { return *item; }
+        ItemType &value() const { return *item; }
+
+        Iterator &operator= (const Iterator& other) {
+            index = other.index;
+            item = other.item;
+
+            // by convention, always return *this
+            return *this;
+        }
+
+        operator bool() const { return item != nullptr; }
+
+        int index;
+        ItemType *item;
+    };
+
+    Iterator &end() const { return Iterator(); }
+
+    ItemType &getEmptySlot() {
+        Q_ASSERT(m_lastUsedIndex < m_slots.size());
+
+        // Look for an in-between vacancy first
+        for (int i = 0; i < m_lastUsedIndex; ++i) {
+            ItemType &item = m_slots[i];
+            if (!item.isValid()) {
+                return item;
+            }
+        }
+
+        ++m_lastUsedIndex;
+        if (m_lastUsedIndex >= m_slots.size()) {
+            m_slots.resize(m_lastUsedIndex + 1);
+        }
+
+        return m_slots[m_lastUsedIndex];
+    }
+
+    void freeSlot(Iterator &iterator) {
+        m_slots[iterator.index].reset();
+        if (iterator.index == m_lastUsedIndex) {
+            do {
+                --m_lastUsedIndex;
+            } while (m_lastUsedIndex >= 0 && !m_slots.at(m_lastUsedIndex).isValid());
+        }
+    }
+
+    // Iterates through all valid items (i.e. the occupied slots)
+    // calling the given function, with the option of ending the loop early.
+    //
+    // bool Func(Iterator& item)
+    //
+    // Returning true means it wants to continue the "for" loop, false
+    // terminates the loop.
+    template<typename Func> void forEach(Func func) {
+        Iterator it;
+        for (it.index = 0; it.index <= m_lastUsedIndex; ++it.index) {
+            it.item = &m_slots[it.index];
+            if (!it.item->isValid())
+                continue;
+
+            if (!func(it))
+                break;
+        }
+    }
+
+    bool isEmpty() const { return m_lastUsedIndex == -1; }
+
+
+private:
+    QVector<ItemType> m_slots;
+    int m_lastUsedIndex;
+};
+
+#endif // UBUNTUGESTURES_POOL_H

=== added file 'libs/UbuntuGestures/Timer.cpp'
--- libs/UbuntuGestures/Timer.cpp	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/Timer.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include "Timer.h"
+
+namespace UbuntuGestures {
+
+Timer::Timer(QObject *parent) : AbstractTimer(parent)
+{
+    m_timer.setSingleShot(false);
+    connect(&m_timer, &QTimer::timeout, this, &AbstractTimer::timeout);
+}
+
+int Timer::interval() const
+{
+    return m_timer.interval();
+}
+
+void Timer::setInterval(int msecs)
+{
+    m_timer.setInterval(msecs);
+}
+
+void Timer::start()
+{
+    m_timer.start();
+    AbstractTimer::start();
+}
+
+void Timer::stop()
+{
+    m_timer.stop();
+    AbstractTimer::stop();
+}
+
+bool Timer::isSingleShot() const
+{
+    return m_timer.isSingleShot();
+}
+
+void Timer::setSingleShot(bool value)
+{
+    m_timer.setSingleShot(value);
+}
+
+/////////////////////////////////// FakeTimer //////////////////////////////////
+
+FakeTimer::FakeTimer(QObject *parent)
+    : UbuntuGestures::AbstractTimer(parent)
+    , m_interval(0)
+    , m_singleShot(false)
+{
+}
+
+int FakeTimer::interval() const
+{
+    return m_interval;
+}
+
+void FakeTimer::setInterval(int msecs)
+{
+    m_interval = msecs;
+}
+
+bool FakeTimer::isSingleShot() const
+{
+    return m_singleShot;
+}
+
+void FakeTimer::setSingleShot(bool value)
+{
+    m_singleShot = value;
+}
+
+/////////////////////////////////// FakeTimerFactory //////////////////////////////////
+
+AbstractTimer *FakeTimerFactory::createTimer(QObject *parent)
+{
+    FakeTimer *fakeTimer = new FakeTimer(parent);
+
+    timers.append(fakeTimer);
+
+    return fakeTimer;
+}
+
+void FakeTimerFactory::makeRunningTimersTimeout()
+{
+    for (int i = 0; i < timers.count(); ++i) {
+        FakeTimer *timer = timers[i].data();
+        if (timer && timer->isRunning()) {
+            timer->emitTimeout();
+        }
+    }
+}
+
+} // namespace UbuntuGestures

=== added file 'libs/UbuntuGestures/Timer.h'
--- libs/UbuntuGestures/Timer.h	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/Timer.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#ifndef UBUNTUGESTURES_TIMER_H
+#define UBUNTUGESTURES_TIMER_H
+
+#include "UbuntuGesturesGlobal.h"
+
+#include <QObject>
+#include <QPointer>
+#include <QTimer>
+
+namespace UbuntuGestures {
+
+/* Defines an interface for a Timer. Useful for tests. */
+class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject
+{
+    Q_OBJECT
+public:
+    AbstractTimer(QObject *parent) : QObject(parent), m_isRunning(false) {}
+    virtual int interval() const = 0;
+    virtual void setInterval(int msecs) = 0;
+    virtual void start() { m_isRunning = true; }
+    virtual void stop() { m_isRunning = false; }
+    bool isRunning() const { return m_isRunning; }
+    virtual bool isSingleShot() const = 0;
+    virtual void setSingleShot(bool value) = 0;
+Q_SIGNALS:
+    void timeout();
+private:
+    bool m_isRunning;
+};
+
+/* Essentially a QTimer wrapper */
+class UBUNTUGESTURES_EXPORT Timer : public AbstractTimer
+{
+    Q_OBJECT
+public:
+    Timer(QObject *parent = nullptr);
+
+    int interval() const override;
+    void setInterval(int msecs) override;
+    void start() override;
+    void stop() override;
+    bool isSingleShot() const override;
+    void setSingleShot(bool value) override;
+private:
+    QTimer m_timer;
+};
+
+/* For tests */
+class UBUNTUGESTURES_EXPORT FakeTimer : public AbstractTimer
+{
+    Q_OBJECT
+public:
+    FakeTimer(QObject *parent = nullptr);
+
+    virtual void emitTimeout() { Q_EMIT timeout(); }
+
+    int interval() const override;
+    void setInterval(int msecs) override;
+    bool isSingleShot() const override;
+    void setSingleShot(bool value) override;
+private:
+    int m_interval;
+    bool m_singleShot;
+};
+
+class UBUNTUGESTURES_EXPORT AbstractTimerFactory
+{
+public:
+    virtual ~AbstractTimerFactory() {}
+    virtual AbstractTimer *createTimer(QObject *parent = nullptr) = 0;
+};
+
+class UBUNTUGESTURES_EXPORT TimerFactory : public AbstractTimerFactory
+{
+public:
+    AbstractTimer *createTimer(QObject *parent = nullptr) override { return new Timer(parent); }
+};
+
+class UBUNTUGESTURES_EXPORT FakeTimerFactory : public AbstractTimerFactory
+{
+public:
+    AbstractTimer *createTimer(QObject *parent = nullptr) override;
+    void makeRunningTimersTimeout();
+    QList<QPointer<FakeTimer>> timers;
+};
+
+} // namespace UbuntuGestures
+
+#endif // UBUNTUGESTURES_TIMER_H

=== added file 'libs/UbuntuGestures/TouchOwnershipEvent.cpp'
--- libs/UbuntuGestures/TouchOwnershipEvent.cpp	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/TouchOwnershipEvent.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include "TouchOwnershipEvent.h"
+
+QEvent::Type TouchOwnershipEvent::m_touchOwnershipType = (QEvent::Type)-1;
+
+TouchOwnershipEvent::TouchOwnershipEvent(int touchId, bool gained)
+    : QEvent(touchOwnershipEventType())
+    , m_touchId(touchId)
+    , m_gained(gained)
+{
+}
+
+QEvent::Type TouchOwnershipEvent::touchOwnershipEventType()
+{
+    if (m_touchOwnershipType == (QEvent::Type)-1) {
+        m_touchOwnershipType = (QEvent::Type)registerEventType();
+    }
+
+    return m_touchOwnershipType;
+}

=== added file 'libs/UbuntuGestures/TouchOwnershipEvent.h'
--- libs/UbuntuGestures/TouchOwnershipEvent.h	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/TouchOwnershipEvent.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#ifndef UBUNTU_TOUCHOWNERSHIPEVENT_H
+#define UBUNTU_TOUCHOWNERSHIPEVENT_H
+
+#include <QEvent>
+#include "UbuntuGesturesGlobal.h"
+
+/*
+   When an item get an ownership event for a touch it can grab/steal that touch
+   with a clean conscience.
+ */
+class UBUNTUGESTURES_EXPORT TouchOwnershipEvent : public QEvent
+{
+public:
+    TouchOwnershipEvent(int touchId, bool gained);
+
+    static Type touchOwnershipEventType();
+
+    /*
+      Whether ownership was gained (true) or lost (false)
+     */
+    bool gained() const { return m_gained; }
+
+    /*
+        Id of the touch whose ownership was granted.
+     */
+    int touchId() const { return m_touchId; }
+
+private:
+    static Type m_touchOwnershipType;
+    int m_touchId;
+    bool m_gained;
+};
+
+#endif // UBUNTU_TOUCHOWNERSHIPEVENT_H

=== added file 'libs/UbuntuGestures/TouchRegistry.cpp'
--- libs/UbuntuGestures/TouchRegistry.cpp	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/TouchRegistry.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,500 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include "TouchRegistry.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-pedantic"
+#include <private/qquickitem_p.h>
+#pragma GCC diagnostic pop
+
+#include "CandidateInactivityTimer.h"
+#include "Timer.h"
+#include "TouchOwnershipEvent.h"
+#include "UnownedTouchEvent.h"
+
+#define TOUCHREGISTRY_DEBUG 0
+
+#if TOUCHREGISTRY_DEBUG
+    #include "DebugHelpers.h"
+    #define UG_DEBUG qDebug() << "[TouchRegistry]"
+#endif // TOUCHREGISTRY_DEBUG
+
+using namespace UbuntuGestures;
+
+TouchRegistry *TouchRegistry::m_instance = nullptr;
+
+TouchRegistry::TouchRegistry(QObject *parent)
+    : TouchRegistry(parent, new TimerFactory)
+{
+}
+
+TouchRegistry::TouchRegistry(QObject *parent, AbstractTimerFactory *timerFactory)
+    : QObject(parent)
+    , m_inDispatchLoop(false)
+    , m_timerFactory(timerFactory)
+{
+    if (m_instance == nullptr) {
+        m_instance = this;
+    } else {
+        qFatal("Cannot have more than one instance of TouchRegistry. It must be a singleton.");
+    }
+}
+
+TouchRegistry::~TouchRegistry()
+{
+    Q_ASSERT(m_instance != nullptr);
+    m_instance = nullptr;
+    delete m_timerFactory;
+}
+
+void TouchRegistry::update(const QTouchEvent *event)
+{
+    #if TOUCHREGISTRY_DEBUG
+    UG_DEBUG << "got" << qPrintable(touchEventToString(event));
+    #endif
+
+    const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
+    for (int i = 0; i < touchPoints.count(); ++i) {
+        const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
+        if (touchPoint.state() == Qt::TouchPointPressed) {
+            TouchInfo &touchInfo = m_touchInfoPool.getEmptySlot();
+            touchInfo.init(touchPoint.id());
+        } else if (touchPoint.state() == Qt::TouchPointReleased) {
+            Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchPoint.id());
+
+            touchInfo->physicallyEnded = true;
+        }
+    }
+
+    deliverTouchUpdatesToUndecidedCandidatesAndWatchers(event);
+
+    freeEndedTouchInfos();
+}
+
+void TouchRegistry::deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event)
+{
+    // TODO: Look into how we could optimize this whole thing.
+    //       Although it's not really a problem as we should have at most two candidates
+    //       for each point and there should not be many active points at any given moment.
+    //       But having three nested for-loops does scare.
+
+    // TODO: Don't send it to the object that is already receiving the regular event
+    // because QQuickWindow is sending it to him (i.e., he's the touch owner from Qt's point of view)
+    // Problem is, we cannnot easily get this information.
+
+    const QList<QTouchEvent::TouchPoint> &updatedTouchPoints = event->touchPoints();
+
+    // Maps an item to the touches in this event he should be informed about.
+    // E.g.: a QTouchEvent might have three touches but a given item might be interested in only
+    // one of them. So he will get a UnownedTouchEvent from this QTouchEvent containing only that
+    // touch point.
+    QMap<QQuickItem*, QList<int>> touchIdsForItems;
+
+    // Build touchIdsForItems
+    m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {
+        if (touchInfo->isOwned() && touchInfo->watchers.isEmpty())
+            return true;
+
+        for (int j = 0; j < updatedTouchPoints.count(); ++j) {
+            if (updatedTouchPoints[j].id() == touchInfo->id) {
+                if (!touchInfo->isOwned()) {
+                    for (int i = 0; i < touchInfo->candidates.count(); ++i) {
+                        CandidateInfo &candidate = touchInfo->candidates[i];
+                        Q_ASSERT(!candidate.item.isNull());
+                        touchIdsForItems[candidate.item.data()].append(touchInfo->id);
+                    }
+                }
+
+                const QList<QPointer<QQuickItem>> &watchers = touchInfo->watchers;
+                for (int i = 0; i < watchers.count(); ++i) {
+                    if (!watchers[i].isNull()) {
+                        touchIdsForItems[watchers[i].data()].append(touchInfo->id);
+                    }
+                }
+
+                return true;
+            }
+        }
+
+        return true;
+    });
+
+    // TODO: Consider what happens if an item calls any of TouchRegistry's public methods
+    // from the event handler callback.
+    m_inDispatchLoop = true;
+    auto it = touchIdsForItems.constBegin();
+    while (it != touchIdsForItems.constEnd()) {
+        QQuickItem *item = it.key();
+        const QList<int> &touchIds = it.value();
+        dispatchPointsToItem(event, touchIds, item);
+        ++it;
+    };
+    m_inDispatchLoop = false;
+}
+
+void TouchRegistry::freeEndedTouchInfos()
+{
+    m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {
+        if (touchInfo->ended()) {
+            m_touchInfoPool.freeSlot(touchInfo);
+        }
+        return true;
+    });
+}
+
+/*
+   Extracts the touches with the given touchIds from event and send them in a
+   UnownedTouchEvent to the given item
+ */
+void TouchRegistry::dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,
+        QQuickItem *item)
+{
+    Qt::TouchPointStates touchPointStates = 0;
+    QList<QTouchEvent::TouchPoint> touchPoints;
+
+    const QList<QTouchEvent::TouchPoint> &allTouchPoints = event->touchPoints();
+
+    QTransform windowToCandidateTransform = QQuickItemPrivate::get(item)->windowToItemTransform();
+    QMatrix4x4 windowToCandidateMatrix(windowToCandidateTransform);
+
+    for (int i = 0; i < allTouchPoints.count(); ++i) {
+        const QTouchEvent::TouchPoint &originalTouchPoint = allTouchPoints[i];
+        if (touchIds.contains(originalTouchPoint.id())) {
+            QTouchEvent::TouchPoint touchPoint = originalTouchPoint;
+
+            translateTouchPointFromScreenToWindowCoords(touchPoint);
+
+            // Set the point's local coordinates to that of the item
+            touchPoint.setRect(windowToCandidateTransform.mapRect(touchPoint.sceneRect()));
+            touchPoint.setStartPos(windowToCandidateTransform.map(touchPoint.startScenePos()));
+            touchPoint.setLastPos(windowToCandidateTransform.map(touchPoint.lastScenePos()));
+            touchPoint.setVelocity(windowToCandidateMatrix.mapVector(touchPoint.velocity()).toVector2D());
+
+            touchPoints.append(touchPoint);
+            touchPointStates |= touchPoint.state();
+        }
+    }
+
+    QTouchEvent *eventForItem = new QTouchEvent(event->type(),
+                                                event->device(),
+                                                event->modifiers(),
+                                                touchPointStates,
+                                                touchPoints);
+    eventForItem->setWindow(event->window());
+    eventForItem->setTimestamp(event->timestamp());
+    eventForItem->setTarget(event->target());
+
+    UnownedTouchEvent unownedTouchEvent(eventForItem);
+
+    #if TOUCHREGISTRY_DEBUG
+    UG_DEBUG << "Sending unowned" << qPrintable(touchEventToString(eventForItem))
+        << "to" << item;
+    #endif
+
+    QCoreApplication::sendEvent(item, &unownedTouchEvent);
+}
+
+void TouchRegistry::translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint)
+{
+    touchPoint.setScreenRect(touchPoint.sceneRect());
+    touchPoint.setStartScreenPos(touchPoint.startScenePos());
+    touchPoint.setLastScreenPos(touchPoint.lastScenePos());
+
+    touchPoint.setSceneRect(touchPoint.rect());
+    touchPoint.setStartScenePos(touchPoint.startPos());
+    touchPoint.setLastScenePos(touchPoint.lastPos());
+}
+
+bool TouchRegistry::eventFilter(QObject *watched, QEvent *event)
+{
+    Q_UNUSED(watched);
+
+    switch (event->type()) {
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
+    case QEvent::TouchCancel:
+        update(static_cast<QTouchEvent*>(event));
+        break;
+    default:
+        // do nothing
+        break;
+    }
+
+    // Do not filter out the event. i.e., let it be handled further as
+    // we're just monitoring events
+    return false;
+}
+
+void TouchRegistry::addCandidateOwnerForTouch(int id, QQuickItem *candidate)
+{
+    #if TOUCHREGISTRY_DEBUG
+    UG_DEBUG << "addCandidateOwnerForTouch id" << id << "candidate" << candidate;
+    #endif
+
+    Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
+    if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
+
+    if (touchInfo->isOwned()) {
+        qWarning("TouchRegistry: trying to add candidate owner for a touch that's already owned");
+        return;
+    }
+
+    // TODO: Check if candidate already exists
+
+    CandidateInfo candidateInfo;
+    candidateInfo.undecided = true;
+    candidateInfo.item = candidate;
+    candidateInfo.inactivityTimer = new CandidateInactivityTimer(id, candidate,
+                                                                 *m_timerFactory,
+                                                                 this);
+    connect(candidateInfo.inactivityTimer, &CandidateInactivityTimer::candidateDefaulted,
+            this, &TouchRegistry::rejectCandidateOwnerForTouch);
+
+    touchInfo->candidates.append(candidateInfo);
+}
+
+void TouchRegistry::addTouchWatcher(int touchId, QQuickItem *watcher)
+{
+    #if TOUCHREGISTRY_DEBUG
+    UG_DEBUG << "addTouchWatcher id" << touchId << "watcher" << watcher;
+    #endif
+
+    Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);
+    if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
+
+    // TODO: Check if watcher already exists
+
+    touchInfo->watchers.append(watcher);
+}
+
+void TouchRegistry::removeCandidateOwnerForTouch(int id, QQuickItem *candidate)
+{
+    #if TOUCHREGISTRY_DEBUG
+    UG_DEBUG << "removeCandidateOwnerForTouch id" << id << "candidate" << candidate;
+    #endif
+
+    Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
+    if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
+
+    int indexRemoved = -1;
+
+    // TODO: check if the candidate is in fact the owner of the touch
+
+    for (int i = 0; i < touchInfo->candidates.count() && indexRemoved == -1; ++i) {
+        CandidateInfo &candidateInfo = touchInfo->candidates[i];
+        if (candidateInfo.item == candidate) {
+            Q_ASSERT(i > 0 || candidateInfo.undecided);
+            if (i == 0 && !candidateInfo.undecided) {
+                qCritical("TouchRegistry: touch owner is being removed.");
+            }
+            delete candidateInfo.inactivityTimer;
+            candidateInfo.inactivityTimer = nullptr;
+            touchInfo->candidates.removeAt(i);
+            indexRemoved = i;
+        }
+    }
+
+    if (indexRemoved == 0) {
+        // the top candidate has been removed. if the new top candidate
+        // wants the touch let him know he's now the owner.
+        if (touchInfo->isOwned()) {
+            touchInfo->notifyCandidatesOfOwnershipResolution();
+        }
+    }
+
+    if (!m_inDispatchLoop && touchInfo->ended()) {
+        m_touchInfoPool.freeSlot(touchInfo);
+    }
+}
+
+void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)
+{
+    #if TOUCHREGISTRY_DEBUG
+    UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate;
+    #endif
+
+    Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
+    if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }
+
+    Q_ASSERT(!touchInfo->isOwned());
+
+    int candidateIndex = -1;
+    for (int i = 0; i < touchInfo->candidates.count(); ++i) {
+        CandidateInfo &candidateInfo = touchInfo->candidates[i];
+        if (candidateInfo.item == candidate) {
+            candidateInfo.undecided = false;
+            delete candidateInfo.inactivityTimer;
+            candidateInfo.inactivityTimer = nullptr;
+            candidateIndex = i;
+            break;
+        }
+    }
+
+    // add it as a candidate if not present yet
+    if (candidateIndex < 0) {
+        CandidateInfo candidateInfo;
+        candidateInfo.undecided = false;
+        candidateInfo.item = candidate;
+        candidateInfo.inactivityTimer = nullptr;
+        touchInfo->candidates.append(candidateInfo);
+        // it's the last one
+        candidateIndex = touchInfo->candidates.count() - 1;
+    }
+
+    // If it's the top candidate it means it's now the owner. Let
+    // it know about it.
+    if (candidateIndex == 0) {
+        touchInfo->notifyCandidatesOfOwnershipResolution();
+    }
+}
+
+Pool<TouchRegistry::TouchInfo>::Iterator TouchRegistry::findTouchInfo(int id)
+{
+    Pool<TouchInfo>::Iterator touchInfo;
+
+    m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &someTouchInfo) -> bool {
+        if (someTouchInfo->id == id) {
+            touchInfo = someTouchInfo;
+            return false;
+        } else {
+            return true;
+        }
+    });
+
+    return touchInfo;
+}
+
+
+void TouchRegistry::rejectCandidateOwnerForTouch(int id, QQuickItem *candidate)
+{
+    // NB: It's technically possible that candidate is a dangling pointer at this point.
+    // Although that would most likely be due to a bug in our code.
+    // In any case, only dereference it after it's confirmed that it indeed exists.
+
+    #if TOUCHREGISTRY_DEBUG
+    UG_DEBUG << "rejectCandidateOwnerForTouch id" << id << "candidate" << (void*)candidate;
+    #endif
+
+    Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);
+    if (!touchInfo) {
+        #if TOUCHREGISTRY_DEBUG
+        UG_DEBUG << "Failed to find TouchInfo for id" << id;
+        #endif
+        return;
+    }
+
+    int rejectedCandidateIndex = -1;
+
+    // Check if the given candidate is valid and still undecided
+    for (int i = 0; i < touchInfo->candidates.count() && rejectedCandidateIndex == -1; ++i) {
+        CandidateInfo &candidateInfo = touchInfo->candidates[i];
+        if (candidateInfo.item == candidate) {
+            Q_ASSERT(i > 0 || candidateInfo.undecided);
+            if (i == 0 && !candidateInfo.undecided) {
+                qCritical() << "TouchRegistry: Can't reject item (" << (void*)candidate
+                    << ") as it already owns touch" << id;
+                return;
+            } else {
+                // we found the guy and it's all fine.
+                rejectedCandidateIndex = i;
+            }
+        }
+    }
+
+    // If we reached this point it's because the given candidate exists and is indeed undecided.
+
+    Q_ASSERT(rejectedCandidateIndex >= 0 && rejectedCandidateIndex < touchInfo->candidates.size());
+
+    {
+        TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);
+        QCoreApplication::sendEvent(candidate, &lostOwnershipEvent);
+    }
+
+    touchInfo->candidates.removeAt(rejectedCandidateIndex);
+
+    if (rejectedCandidateIndex == 0) {
+        // the top candidate has been removed. if the new top candidate
+        // wants the touch let him know he's now the owner.
+        if (touchInfo->isOwned()) {
+            touchInfo->notifyCandidatesOfOwnershipResolution();
+        }
+    }
+}
+
+////////////////////////////////////// TouchRegistry::TouchInfo ////////////////////////////////////
+
+TouchRegistry::TouchInfo::TouchInfo(int id)
+{
+    init(id);
+}
+
+void TouchRegistry::TouchInfo::reset()
+{
+    id = -1;
+
+    for (int i = 0; i < candidates.count(); ++i) {
+        CandidateInfo &candidate = candidates[i];
+        delete candidate.inactivityTimer;
+        candidate.inactivityTimer.clear(); // shoundn't be needed but anyway...
+    }
+}
+
+void TouchRegistry::TouchInfo::init(int id)
+{
+    this->id = id;
+    physicallyEnded = false;
+    candidates.clear();
+    watchers.clear();
+}
+
+bool TouchRegistry::TouchInfo::isOwned() const
+{
+    return !candidates.isEmpty() && !candidates.first().undecided;
+}
+
+bool TouchRegistry::TouchInfo::ended() const
+{
+    Q_ASSERT(isValid());
+    return physicallyEnded && (isOwned() || candidates.isEmpty());
+}
+
+void TouchRegistry::TouchInfo::notifyCandidatesOfOwnershipResolution()
+{
+    Q_ASSERT(isOwned());
+
+    #if TOUCHREGISTRY_DEBUG
+    UG_DEBUG << "sending TouchOwnershipEvent(id =" << id
+        << " gained) to candidate" << candidates[0].item;
+    #endif
+
+    TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);
+    QCoreApplication::sendEvent(candidates[0].item, &gainedOwnershipEvent);
+
+
+    TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);
+    for (int i = 1; i < candidates.count(); ++i) {
+        #if TOUCHREGISTRY_DEBUG
+        UG_DEBUG << "sending TouchWonershipEvent(id =" << id << " lost) to candidate"
+            << candidates[i].item;
+        #endif
+        QCoreApplication::sendEvent(candidates[i].item, &lostOwnershipEvent);
+    }
+}

=== added file 'libs/UbuntuGestures/TouchRegistry.h'
--- libs/UbuntuGestures/TouchRegistry.h	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/TouchRegistry.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#ifndef UNITY_TOUCHREGISTRY_H
+#define UNITY_TOUCHREGISTRY_H
+
+#include <QQuickItem>
+#include <QObject>
+#include <QPointer>
+#include <QTouchEvent>
+#include <QVector>
+
+#include "UbuntuGesturesGlobal.h"
+#include "CandidateInactivityTimer.h"
+#include "Pool.h"
+
+namespace UbuntuGestures {
+    class AbstractTimerFactory;
+}
+
+/*
+  Where the ownership of touches is registered.
+
+  Singleton used for adding a touch point ownership model analogous to the one
+  described in the XInput 2.2 protocol[1] on top of the existing input dispatch logic in QQuickWindow.
+
+  It provides a much more flexible and powerful way of dealing with pointer ownership than the existing
+  mechanisms in Qt. Namely QQuickItem::grabTouchPoints, QuickItem::keepTouchGrab,
+  QQuickItem::setFiltersChildMouseEvents, QQuickItem::ungrabTouchPoints and QQuickItem::touchUngrabEvent.
+
+  Usage:
+
+  1- An item receives a a new touch point. If he's not sure whether he wants it yet, he calls:
+        TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, this);
+        touchEvent->ignore();
+     Ignoring the event is crucial so that it can be seen by other interested parties, which will
+     behave similarly.
+
+  2- That item will then start receiving UnownedTouchEvents for that touch from step 1. Once he's
+     made a decision he calls either:
+        TouchRegistry::instance()->requestTouchOwnership(touchId, this);
+     If he wants the touch point or:
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);
+     if he does not want it.
+
+  Candidates are put in a priority queue. The first one to call addCandidateOwnerForTouch() will
+  take precedence over the others for receiving ownership over the touch point (from now on called
+  simply top-candidate).
+
+  If the top-candidate calls requestTouchOwnership() he will immediately receive a
+  TouchOwnershipEvent(gained=true) for that touch point. He can then safely call
+  QQuickItem::grabTouchPoints to actually get the owned touch points. The other candidates
+  will receive TouchOwnershipEvent(gained=false) and will no longer receive UnownedTouchEvents
+  for that touch point. They will have to undo whatever action they were performing with that
+  touch point.
+
+  But if the top-candidate calls removeCandidateOwnerForTouch() instead, he's popped from the
+  candidacy queue and ownership is given to the new top-most candidate if he has already
+  made his decision, that is.
+
+  The TouchRegistry cannot enforce the results of this pointer ownership negotiation (i.e.,
+  who gets to grab the touch points) as that would clash with QQuickWindow's input event
+  dispatching logic. The candidates have to respect the decision and grab the touch points
+  themselves.
+
+  If an item wants ownership over touches as soon as he receives the TouchBegin for them, his step 1
+  would be instead:
+        TouchRegistry::instance()->requestTouchOwnership(touchId, this);
+        return true;
+  He would then be notified once ownership has been granted to him, from which point onwards he could
+  safely assume other TouchRegistry users wouldn't snatch this touch away from him.
+
+  Items oblivious to TouchRegistry will lose their touch points without warning, just like in plain Qt.
+
+  [1] - http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt (see multitouch-ownership)
+ */
+class UBUNTUGESTURES_EXPORT TouchRegistry : public QObject
+{
+    Q_OBJECT
+public:
+    TouchRegistry(QObject *parent = nullptr);
+    // Useful for tests, where you should feed a fake timer
+    TouchRegistry(QObject *parent, UbuntuGestures::AbstractTimerFactory *timerFactory);
+
+    virtual ~TouchRegistry();
+
+    // Returns a pointer to the application's TouchRegistry instance.
+    // If no instance has been allocated, null is returned.
+    static TouchRegistry *instance() { return m_instance; }
+
+    void update(const QTouchEvent *event);
+
+    // Calls update() if the given event is a QTouchEvent
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
+    // An item that might later request ownership over the given touch point.
+    // He will be kept informed about that touch point through UnownedTouchEvents
+    // All candidates must eventually decide whether they want to own the touch point
+    // or not. That decision is informed through requestTouchOwnership() or
+    // removeCandidateOwnerForTouch()
+    void addCandidateOwnerForTouch(int id, QQuickItem *candidate);
+
+    // The same as rejecting ownership of a touch
+    void removeCandidateOwnerForTouch(int id, QQuickItem *candidate);
+
+    // The candidate object wants to be the owner of the touch with the given id.
+    // If he's currently the oldest/top-most candidate, he will get an ownership
+    // event immediately. If not, he will get ownership if (or once) he becomes the
+    // top-most candidate.
+    void requestTouchOwnership(int id, QQuickItem *candidate);
+
+    // An item that has no interest (effective or potential) in owning a touch point
+    // but would nonetheless like to be kept up-to-date on its state.
+    void addTouchWatcher(int touchId, QQuickItem *watcherItem);
+
+private Q_SLOTS:
+    void rejectCandidateOwnerForTouch(int id, QQuickItem *candidate);
+
+private:
+    class CandidateInfo {
+    public:
+        bool undecided;
+        // TODO: Prune candidates that become null and resolve ownership accordingly.
+        QPointer<QQuickItem> item;
+        QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;
+    };
+
+    class TouchInfo {
+    public:
+        TouchInfo() : id(-1) {}
+        TouchInfo(int id);
+        bool isValid() const { return id >= 0; }
+        void reset();
+        void init(int id);
+        int id;
+        bool physicallyEnded;
+        bool isOwned() const;
+        bool ended() const;
+        void notifyCandidatesOfOwnershipResolution();
+
+        // TODO optimize storage (s/QList/Pool)
+        QList<CandidateInfo> candidates;
+        QList<QPointer<QQuickItem>> watchers;
+    };
+
+    Pool<TouchInfo>::Iterator findTouchInfo(int id);
+
+    void deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event);
+
+    static void translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint);
+
+    static void dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,
+                                     QQuickItem *item);
+    void freeEndedTouchInfos();
+
+    Pool<TouchInfo> m_touchInfoPool;
+
+    // the singleton instance
+    static TouchRegistry *m_instance;
+
+    bool m_inDispatchLoop;
+
+    UbuntuGestures::AbstractTimerFactory *m_timerFactory;
+
+    friend class tst_TouchRegistry;
+    friend class tst_DirectionalDragArea;
+};
+
+#endif // UNITY_TOUCHREGISTRY_H

=== added file 'libs/UbuntuGestures/UbuntuGesturesGlobal.h'
--- libs/UbuntuGestures/UbuntuGesturesGlobal.h	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/UbuntuGesturesGlobal.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include <QtCore/QtGlobal>
+
+#if defined(UBUNTUGESTURES_LIBRARY)
+#  define UBUNTUGESTURES_EXPORT Q_DECL_EXPORT
+#else
+#  define UBUNTUGESTURES_EXPORT Q_DECL_IMPORT
+#endif

=== added file 'libs/UbuntuGestures/UnownedTouchEvent.cpp'
--- libs/UbuntuGestures/UnownedTouchEvent.cpp	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/UnownedTouchEvent.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include "UnownedTouchEvent.h"
+
+QEvent::Type UnownedTouchEvent::m_unownedTouchEventType = (QEvent::Type)-1;
+
+UnownedTouchEvent::UnownedTouchEvent(QTouchEvent *touchEvent)
+    : QEvent(unownedTouchEventType())
+    , m_touchEvent(touchEvent)
+{
+}
+
+QEvent::Type UnownedTouchEvent::unownedTouchEventType()
+{
+    if (m_unownedTouchEventType == (QEvent::Type)-1) {
+        m_unownedTouchEventType = (QEvent::Type)registerEventType();
+    }
+
+    return m_unownedTouchEventType;
+}
+
+QTouchEvent *UnownedTouchEvent::touchEvent()
+{
+    return m_touchEvent.data();
+}

=== added file 'libs/UbuntuGestures/UnownedTouchEvent.h'
--- libs/UbuntuGestures/UnownedTouchEvent.h	1970-01-01 00:00:00 +0000
+++ libs/UbuntuGestures/UnownedTouchEvent.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#ifndef UBUNTU_UNOWNEDTOUCHEVENT_H
+#define UBUNTU_UNOWNEDTOUCHEVENT_H
+
+#include <QTouchEvent>
+#include <QScopedPointer>
+#include "UbuntuGesturesGlobal.h"
+
+/*
+ A touch event with touch points that do not belong the item receiving it.
+
+ See TouchRegistry::addCandidateOwnerForTouch and TouchRegistry::addTouchWatcher
+ */
+class UBUNTUGESTURES_EXPORT UnownedTouchEvent : public QEvent
+{
+public:
+    UnownedTouchEvent(QTouchEvent *touchEvent);
+    static Type unownedTouchEventType();
+
+    // TODO: It might be cleaner to store the information directly in UnownedTouchEvent
+    //       instead of carrying around a synthesized QTouchEvent. But the latter option
+    //       is very convenient.
+    QTouchEvent *touchEvent();
+
+private:
+    static Type m_unownedTouchEventType;
+    QScopedPointer<QTouchEvent> m_touchEvent;
+};
+
+#endif // UBUNTU_UNOWNEDTOUCHEVENT_H

=== modified file 'plugins/Ubuntu/Gestures/AxisVelocityCalculator.h'
--- plugins/Ubuntu/Gestures/AxisVelocityCalculator.h	2013-10-23 12:25:40 +0000
+++ plugins/Ubuntu/Gestures/AxisVelocityCalculator.h	2014-10-10 15:05:15 +0000
@@ -21,7 +21,7 @@
 #ifndef VELOCITY_CALCULATOR_H
 #define VELOCITY_CALCULATOR_H
 
-#include "UbuntuGesturesGlobal.h"
+#include "UbuntuGesturesQmlGlobal.h"
 #include <stdint.h>
 #include <QtCore/QObject>
 #include "TimeSource.h"
@@ -49,7 +49,7 @@
         }
     }
  */
-class UBUNTUGESTURES_EXPORT AxisVelocityCalculator : public QObject
+class UBUNTUGESTURESQML_EXPORT AxisVelocityCalculator : public QObject
 {
     Q_OBJECT
 

=== modified file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
--- plugins/Ubuntu/Gestures/CMakeLists.txt	2014-05-02 22:57:00 +0000
+++ plugins/Ubuntu/Gestures/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -1,19 +1,38 @@
-set(UbuntuGestureQml_SOURCES
+# in order to include Qt's private headers
+remove_definitions(-DQT_NO_KEYWORDS)
+
+set(UbuntuGesturesQml_SOURCES
     plugin.cpp
     AxisVelocityCalculator.cpp
     Direction.cpp
     DirectionalDragArea.cpp
     PressedOutsideNotifier.cpp
     TimeSource.cpp
+    TouchGate.cpp
 )
 
-add_definitions(-DUBUNTUGESTURES_LIBRARY)
-
-add_library(UbuntuGestureQml MODULE ${UbuntuGestureQml_SOURCES})
-
-qt5_use_modules(UbuntuGestureQml Core Quick)
+add_definitions(-DUBUNTUGESTURESQML_LIBRARY)
+
+add_library(UbuntuGesturesQml MODULE ${UbuntuGesturesQml_SOURCES})
+target_link_libraries(UbuntuGesturesQml UbuntuGestures)
+
+qt5_use_modules(UbuntuGesturesQml Core Quick)
 
 # So that Foo.cpp can #include "Foo.moc"
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-add_unity8_plugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGestureQml)
+include_directories(${CMAKE_SOURCE_DIR}/libs/UbuntuGestures)
+
+# There's no cmake var for v8 include path :-/ so create one
+LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)
+SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)
+
+# DANGER! DANGER! Using Qt's private API!
+include_directories(
+    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
+    ${Qt5Quick_INCLUDE_DIRS}
+    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+    ${Qt5V8_PRIVATE_INCLUDE_DIR}
+)
+
+add_unity8_plugin(Ubuntu.Gestures 0.1 Ubuntu/Gestures TARGETS UbuntuGesturesQml)

=== modified file 'plugins/Ubuntu/Gestures/Direction.h'
--- plugins/Ubuntu/Gestures/Direction.h	2013-06-19 08:29:34 +0000
+++ plugins/Ubuntu/Gestures/Direction.h	2014-10-10 15:05:15 +0000
@@ -17,14 +17,14 @@
 #ifndef DIRECTION_H
 #define DIRECTION_H
 
-#include "UbuntuGesturesGlobal.h"
+#include "UbuntuGesturesQmlGlobal.h"
 #include <QObject>
 
 /*
     A Direction enum wrapper so that we can do things like "direction: Direction.Righwards"
     from QML.
  */
-class UBUNTUGESTURES_EXPORT Direction : public QObject {
+class UBUNTUGESTURESQML_EXPORT Direction : public QObject {
     Q_OBJECT
     Q_ENUMS(Type)
 

=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2014-05-02 08:29:26 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2014-10-10 15:05:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,64 +14,32 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define ACTIVETOUCHESINFO_DEBUG 0
+#define DIRECTIONALDRAGAREA_DEBUG 0
+
 #include "DirectionalDragArea.h"
 
+#include <QQuickWindow>
 #include <QtCore/qmath.h>
-#include <QtCore/QTimer>
 #include <QDebug>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-pedantic"
+#include <private/qquickwindow_p.h>
+#pragma GCC diagnostic pop
+
+// local
+#include "TouchOwnershipEvent.h"
+#include "TouchRegistry.h"
+#include "UnownedTouchEvent.h"
+
 using namespace UbuntuGestures;
 
-#define DIRECTIONALDRAGAREA_DEBUG 0
-
 #if DIRECTIONALDRAGAREA_DEBUG
 #define DDA_DEBUG(msg) qDebug("[DDA] " msg)
+#include "DebugHelpers.h"
+
 namespace {
-QString touchPointStateToString(Qt::TouchPointState state) {
-    switch (state) {
-    case Qt::TouchPointPressed:
-        return QString("pressed");
-    case Qt::TouchPointMoved:
-        return QString("moved");
-    case Qt::TouchPointStationary:
-        return QString("stationary");
-    default: // Qt::TouchPointReleased:
-        return QString("released");
-    }
-}
-QString touchEventToString(QTouchEvent *ev)
-{
-    QString message;
-
-    switch (ev->type()) {
-    case QEvent::TouchBegin:
-        message.append("TouchBegin ");
-        break;
-    case QEvent::TouchUpdate:
-        message.append("TouchUpdate ");
-        break;
-    case QEvent::TouchEnd:
-        message.append("TouchEnd ");
-        break;
-    default: //QEvent::TouchCancel
-        message.append("TouchCancel ");
-    }
-
-    for (int i=0; i < ev->touchPoints().size(); ++i) {
-
-        const QTouchEvent::TouchPoint& touchPoint = ev->touchPoints().at(i);
-        message.append(
-            QString("(id:%1, state:%2, scenePos:(%3,%4)) ")
-                .arg(touchPoint.id())
-                .arg(touchPointStateToString(touchPoint.state()))
-                .arg(touchPoint.scenePos().x())
-                .arg(touchPoint.scenePos().y())
-            );
-    }
-
-    return message;
-}
-
 const char *statusToString(DirectionalDragArea::Status status)
 {
     if (status == DirectionalDragArea::WaitingForTouch) {
@@ -88,23 +56,6 @@
 #define DDA_DEBUG(msg) do{}while(0)
 #endif // DIRECTIONALDRAGAREA_DEBUG
 
-// Essentially a QTimer wrapper
-class RecognitionTimer : public UbuntuGestures::AbstractTimer
-{
-    Q_OBJECT
-public:
-    RecognitionTimer(QObject *parent) : UbuntuGestures::AbstractTimer(parent) {
-        m_timer.setSingleShot(false);
-        connect(&m_timer, &QTimer::timeout,
-                this, &UbuntuGestures::AbstractTimer::timeout);
-    }
-    virtual int interval() const { return m_timer.interval(); }
-    virtual void setInterval(int msecs) { m_timer.setInterval(msecs); }
-    virtual void start() { m_timer.start(); UbuntuGestures::AbstractTimer::start(); }
-    virtual void stop() { m_timer.stop(); UbuntuGestures::AbstractTimer::stop(); }
-private:
-    QTimer m_timer;
-};
 
 DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)
     : QQuickItem(parent)
@@ -126,12 +77,14 @@
     , m_timeSource(new RealTimeSource)
     , m_activeTouches(m_timeSource)
 {
-    setRecognitionTimer(new RecognitionTimer(this));
+    setRecognitionTimer(new Timer(this));
     m_recognitionTimer->setInterval(60);
+    m_recognitionTimer->setSingleShot(false);
 
     m_velocityCalculator = new AxisVelocityCalculator(this);
 
-    connect(this, &QQuickItem::enabledChanged, this, &DirectionalDragArea::onEnabledChanged);
+    connect(this, &QQuickItem::enabledChanged, this, &DirectionalDragArea::giveUpIfDisabledOrInvisible);
+    connect(this, &QQuickItem::visibleChanged, this, &DirectionalDragArea::giveUpIfDisabledOrInvisible);
 }
 
 Direction::Type DirectionalDragArea::direction() const
@@ -214,6 +167,7 @@
 {
     int interval = 0;
     bool timerWasRunning = false;
+    bool wasSingleShot = false;
 
     // can be null when called from the constructor
     if (m_recognitionTimer) {
@@ -226,6 +180,7 @@
 
     m_recognitionTimer = timer;
     timer->setInterval(interval);
+    timer->setSingleShot(wasSingleShot);
     connect(timer, &UbuntuGestures::AbstractTimer::timeout,
             this, &DirectionalDragArea::checkSpeed);
     if (timerWasRunning) {
@@ -280,8 +235,144 @@
     return m_previousScenePos.y();
 }
 
+bool DirectionalDragArea::event(QEvent *event)
+{
+    if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
+        touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));
+        return true;
+    } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {
+        unownedTouchEvent(static_cast<UnownedTouchEvent *>(event));
+        return true;
+    } else {
+        return QQuickItem::event(event);
+    }
+}
+
+void DirectionalDragArea::touchOwnershipEvent(TouchOwnershipEvent *event)
+{
+    if (event->gained()) {
+        QVector<int> ids;
+        ids.append(event->touchId());
+        DDA_DEBUG("grabbing touch");
+        grabTouchPoints(ids);
+
+        // Work around for Qt bug. If we grab a touch that is being used for mouse pointer
+        // emulation it will cause the emulation logic to go nuts.
+        // Thus we have to also grab the mouse in this case.
+        // TODO: Report bug to Qt
+        if (window()) {
+            QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(window());
+            if (windowPrivate->touchMouseId == event->touchId() && window()->mouseGrabberItem()) {
+                DDA_DEBUG("removing mouse grabber");
+                window()->mouseGrabberItem()->ungrabMouse();
+            }
+        }
+    } else {
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
+
+        setStatus(WaitingForTouch);
+    }
+}
+
+void DirectionalDragArea::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent)
+{
+    QTouchEvent *event = unownedTouchEvent->touchEvent();
+
+    Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));
+
+    #if DIRECTIONALDRAGAREA_DEBUG
+    // TODO Consider using qCDebug() when available (Qt 5.2)
+    qDebug() << "[DDA] Unowned" << m_timeSource->msecsSinceReference()
+        << qPrintable(touchEventToString(event));
+    #endif
+
+    switch (m_status) {
+        case WaitingForTouch:
+            // do nothing
+            break;
+        case Undecided:
+            Q_ASSERT(isEnabled() && isVisible());
+            unownedTouchEvent_undecided(unownedTouchEvent);
+            break;
+        default: // Recognized:
+            // do nothing
+            break;
+    }
+
+    m_activeTouches.update(event);
+}
+
+void DirectionalDragArea::unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent)
+{
+    const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(unownedTouchEvent->touchEvent());
+    if (!touchPoint) {
+        qCritical() << "DirectionalDragArea[status=Undecided]: touch " << m_touchId
+            << "missing from UnownedTouchEvent without first reaching state Qt::TouchPointReleased. "
+               "Considering it as released.";
+
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
+        setStatus(WaitingForTouch);
+        return;
+    }
+
+    const QPointF &touchScenePos = touchPoint->scenePos();
+
+    if (touchPoint->state() == Qt::TouchPointReleased) {
+        // touch has ended before recognition concluded
+        DDA_DEBUG("Touch has ended before recognition concluded");
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
+        emitSignalIfTapped();
+        setStatus(WaitingForTouch);
+        return;
+    }
+
+    m_previousDampedScenePos.setX(m_dampedScenePos.x());
+    m_previousDampedScenePos.setY(m_dampedScenePos.y());
+    m_dampedScenePos.update(touchScenePos);
+    updateVelocityCalculator(touchScenePos);
+
+    if (!pointInsideAllowedArea()) {
+        DDA_DEBUG("Rejecting gesture because touch point is outside allowed area.");
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
+        setStatus(WaitingForTouch);
+        return;
+    }
+
+    if (!movingInRightDirection()) {
+        DDA_DEBUG("Rejecting gesture because touch point is moving in the wrong direction.");
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
+        setStatus(WaitingForTouch);
+        return;
+    }
+
+    setPreviousPos(touchPoint->pos());
+    setPreviousScenePos(touchScenePos);
+
+    if (isWithinTouchCompositionWindow()) {
+        // There's still time for some new touch to appear and ruin our party as it would be combined
+        // with our m_touchId one and therefore deny the possibility of a single-finger gesture.
+        DDA_DEBUG("Sill within composition window. Let's wait more.");
+        return;
+    }
+
+    if (movedFarEnough(touchScenePos)) {
+        TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
+        setStatus(Recognized);
+    } else {
+        DDA_DEBUG("Didn't move far enough yet. Let's wait more.");
+    }
+}
+
 void DirectionalDragArea::touchEvent(QTouchEvent *event)
 {
+    // TODO: Consider when more than one touch starts in the same event (although it's not possible
+    //       with Mir's android-input). Have to track them all. Consider it a plus/bonus.
+
     #if DIRECTIONALDRAGAREA_DEBUG
     // TODO Consider using qCDebug() when available (Qt 5.2)
     qDebug() << "[DDA]" << m_timeSource->msecsSinceReference()
@@ -310,29 +401,34 @@
 
 void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
 {
+    // TODO: accept/reject is for the whole event, not per touch id. See how that affects us.
+
     if (!event->touchPointStates().testFlag(Qt::TouchPointPressed)) {
         // Nothing to see here. No touch starting in this event.
         return;
     }
 
+    // to be proven wrong, if that's the case
+    bool allGood = true;
+
     if (isWithinTouchCompositionWindow()) {
         // too close to the last touch start. So we consider them as starting roughly at the same time.
         // Can't be a single-touch gesture.
         #if DIRECTIONALDRAGAREA_DEBUG
         qDebug("[DDA] A new touch point came in but we're still within time composition window. Ignoring it.");
         #endif
-        return;
+        allGood = false;
     }
 
     const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
 
     const QTouchEvent::TouchPoint *newTouchPoint = nullptr;
-    for (int i = 0; i < touchPoints.count(); ++i) {
+    for (int i = 0; i < touchPoints.count() && allGood; ++i) {
         const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
         if (touchPoint.state() == Qt::TouchPointPressed) {
             if (newTouchPoint) {
                 // more than one touch starting in this QTouchEvent. Can't be a single-touch gesture
-                return;
+                allGood = false;
             } else {
                 // that's our candidate
                 m_touchId = touchPoint.id();
@@ -341,85 +437,61 @@
         }
     }
 
-    Q_ASSERT(newTouchPoint);
-
-    // If we have made this far, we are good to go to the next status.
-
-    m_startPos = newTouchPoint->pos();
-    m_startScenePos = newTouchPoint->scenePos();
-    m_touchId = newTouchPoint->id();
-    m_dampedScenePos.reset(m_startScenePos);
-    m_velocityCalculator->setTrackedPosition(0.);
-    m_velocityCalculator->reset();
-    m_numSamplesOnLastSpeedCheck = 0;
-    m_silenceTime = 0;
-    setPreviousPos(m_startPos);
-    setPreviousScenePos(m_startScenePos);
-    updateSceneDirectionVector();
-
-    setStatus(Undecided);
+    if (allGood) {
+        Q_ASSERT(newTouchPoint);
+
+        m_startPos = newTouchPoint->pos();
+        m_startScenePos = newTouchPoint->scenePos();
+        m_touchId = newTouchPoint->id();
+        m_dampedScenePos.reset(m_startScenePos);
+        m_velocityCalculator->setTrackedPosition(0.);
+        m_velocityCalculator->reset();
+        m_numSamplesOnLastSpeedCheck = 0;
+        m_silenceTime = 0;
+        setPreviousPos(m_startPos);
+        setPreviousScenePos(m_startScenePos);
+        updateSceneDirectionVector();
+
+        if (recognitionIsDisabled()) {
+            // Behave like a dumb TouchArea
+            TouchRegistry::instance()->requestTouchOwnership(m_touchId, this);
+            setStatus(Recognized);
+            event->accept();
+        } else {
+            // just monitor the touch points for now.
+            TouchRegistry::instance()->addCandidateOwnerForTouch(m_touchId, this);
+
+            setStatus(Undecided);
+            // Let the item below have it. We will monitor it and grab it later if a gesture
+            // gets recognized.
+            event->ignore();
+        }
+    } else {
+        watchPressedTouchPoints(touchPoints);
+        event->ignore();
+    }
 }
 
 void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)
 {
-    const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);
-
-    if (!touchPoint) {
-        qCritical() << "DirectionalDragArea[status=Undecided]: touch " << m_touchId
-            << "missing from QTouchEvent without first reaching state Qt::TouchPointReleased. "
-               "Considering it as released.";
-        setStatus(WaitingForTouch);
-        return;
-    }
-
-    const QPointF &touchScenePos = touchPoint->scenePos();
-
-    if (touchPoint->state() == Qt::TouchPointReleased) {
-        // touch has ended before recognition concluded
-        DDA_DEBUG("Touch has ended before recognition concluded");
-        setStatus(WaitingForTouch);
-        Q_EMIT tapped();
-        return;
-    }
+    Q_ASSERT(event->type() == QEvent::TouchBegin);
+    Q_ASSERT(fetchTargetTouchPoint(event) == nullptr);
+
+    // We're not interested in new touch points. We already have our candidate (m_touchId).
+    // But we do want to know when those new touches end for keeping the composition time
+    // window up-to-date
+    event->ignore();
+    watchPressedTouchPoints(event->touchPoints());
 
     if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {
         // multi-finger drags are not accepted
         DDA_DEBUG("Multi-finger drags are not accepted");
-        setStatus(WaitingForTouch);
-        return;
-    }
-
-    m_previousDampedScenePos.setX(m_dampedScenePos.x());
-    m_previousDampedScenePos.setY(m_dampedScenePos.y());
-    m_dampedScenePos.update(touchScenePos);
-    updateVelocityCalculator(touchScenePos);
-
-    if (!pointInsideAllowedArea()) {
-        DDA_DEBUG("Rejecting gesture because touch point is outside allowed area.");
-        setStatus(WaitingForTouch);
-        return;
-    }
-
-    if (!movingInRightDirection()) {
-        DDA_DEBUG("Rejecting gesture becauuse touch point is moving in the wrong direction.");
-        setStatus(WaitingForTouch);
-        return;
-    }
-
-    setPreviousPos(touchPoint->pos());
-    setPreviousScenePos(touchScenePos);
-
-    if (isWithinTouchCompositionWindow()) {
-        // There's still time for some new touch to appear and ruin our party as it would be combined
-        // with our m_touchId one and therefore deny the possibility of a single-finger gesture.
-        DDA_DEBUG("Sill within composition window. Let's wait more.");
-        return;
-    }
-
-    if (movedFarEnough(touchScenePos)) {
-        setStatus(Recognized);
-    } else {
-        DDA_DEBUG("Didn't move far enough yet. Let's wait more.");
+
+        TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
+        // We still wanna know when it ends for keeping the composition time window up-to-date
+        TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
+
+        setStatus(WaitingForTouch);
     }
 }
 
@@ -437,11 +509,35 @@
         setPreviousScenePos(touchPoint->scenePos());
 
         if (touchPoint->state() == Qt::TouchPointReleased) {
+            emitSignalIfTapped();
             setStatus(WaitingForTouch);
         }
     }
 }
 
+void DirectionalDragArea::watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints)
+{
+    for (int i = 0; i < touchPoints.count(); ++i) {
+        const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
+        if (touchPoint.state() == Qt::TouchPointPressed) {
+            TouchRegistry::instance()->addTouchWatcher(touchPoint.id(), this);
+        }
+    }
+}
+
+bool DirectionalDragArea::recognitionIsDisabled() const
+{
+    return distanceThreshold() <= 0 && compositionTime() <= 0;
+}
+
+void DirectionalDragArea::emitSignalIfTapped()
+{
+    qint64 touchDuration = m_timeSource->msecsSinceReference() - m_activeTouches.touchStartTime(m_touchId);
+    if (touchDuration <= maxTapDuration()) {
+        Q_EMIT tapped();
+    }
+}
+
 const QTouchEvent::TouchPoint *DirectionalDragArea::fetchTargetTouchPoint(QTouchEvent *event)
 {
     const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
@@ -509,12 +605,16 @@
 
 void DirectionalDragArea::checkSpeed()
 {
+    Q_ASSERT(m_status == Undecided);
+
     if (m_velocityCalculator->numSamples() >= AxisVelocityCalculator::MIN_SAMPLES_NEEDED) {
         qreal speed = qFabs(m_velocityCalculator->calculate());
         qreal minSpeedMsecs = m_minSpeed / 1000.0;
 
         if (speed < minSpeedMsecs) {
             DDA_DEBUG("Rejecting gesture because it's below minimum speed.");
+            TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
+            TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
             setStatus(WaitingForTouch);
         }
     }
@@ -523,7 +623,9 @@
         m_silenceTime += m_recognitionTimer->interval();
 
         if (m_silenceTime > m_maxSilenceTime) {
-            DDA_DEBUG("Rejecting gesture because it's silence time has been exceeded.");
+            DDA_DEBUG("Rejecting gesture because its silence time has been exceeded.");
+            TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
+            TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
             setStatus(WaitingForTouch);
         }
     } else {
@@ -532,10 +634,19 @@
     m_numSamplesOnLastSpeedCheck = m_velocityCalculator->numSamples();
 }
 
-void DirectionalDragArea::onEnabledChanged()
+void DirectionalDragArea::giveUpIfDisabledOrInvisible()
 {
-    if (!isEnabled() && m_status != WaitingForTouch) {
-        setStatus(WaitingForTouch);
+    if (!isEnabled() || !isVisible()) {
+        if (m_status == Undecided) {
+            TouchRegistry::instance()->removeCandidateOwnerForTouch(m_touchId, this);
+            // We still wanna know when it ends for keeping the composition time window up-to-date
+            TouchRegistry::instance()->addTouchWatcher(m_touchId, this);
+        }
+
+        if (m_status != WaitingForTouch) {
+            DDA_DEBUG("Resetting status because got disabled or made invisible");
+            setStatus(WaitingForTouch);
+        }
     }
 }
 
@@ -631,7 +742,9 @@
 
 bool DirectionalDragArea::isWithinTouchCompositionWindow()
 {
-    return !m_activeTouches.isEmpty() &&
+    return
+        compositionTime() > 0 &&
+        !m_activeTouches.isEmpty() &&
         m_timeSource->msecsSinceReference() <=
             m_activeTouches.mostRecentStartTime() + (qint64)compositionTime();
 }
@@ -639,18 +752,17 @@
 //**************************  ActiveTouchesInfo **************************
 
 DirectionalDragArea::ActiveTouchesInfo::ActiveTouchesInfo(const SharedTimeSource &timeSource)
-    : m_timeSource(timeSource), m_lastUsedIndex(-1)
+    : m_timeSource(timeSource)
 {
-    // Estimate of the maximum number of active touches we might reach.
-    // Not a problem if it ends up being an underestimate as this is just
-    // an optimization.
-    m_vector.resize(3);
 }
 
 void DirectionalDragArea::ActiveTouchesInfo::update(QTouchEvent *event)
 {
     if (!(event->touchPointStates() & (Qt::TouchPointPressed | Qt::TouchPointReleased))) {
         // nothing to update
+        #if ACTIVETOUCHESINFO_DEBUG
+        qDebug("[DDA::ActiveTouchesInfo] Nothing to Update");
+        #endif
         return;
     }
 
@@ -658,74 +770,88 @@
     for (int i = 0; i < touchPoints.count(); ++i) {
         const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
         if (touchPoint.state() == Qt::TouchPointPressed) {
-            addTouchPoint(touchPoint);
+            addTouchPoint(touchPoint.id());
         } else if (touchPoint.state() == Qt::TouchPointReleased) {
-            removeTouchPoint(touchPoint);
+            removeTouchPoint(touchPoint.id());
         }
     }
 }
 
-void DirectionalDragArea::ActiveTouchesInfo::addTouchPoint(const QTouchEvent::TouchPoint &touchPoint)
-{
-    ActiveTouchInfo &activeTouchInfo = getEmptySlot();
-    activeTouchInfo.id = touchPoint.id();
+#if ACTIVETOUCHESINFO_DEBUG
+QString DirectionalDragArea::ActiveTouchesInfo::toString()
+{
+    QString string = "(";
+
+    {
+        QTextStream stream(&string);
+        m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
+            stream << "(id=" << touchInfo->id << ",startTime=" << touchInfo->startTime << ")";
+            return true;
+        });
+    }
+
+    string.append(")");
+
+    return string;
+}
+#endif // ACTIVETOUCHESINFO_DEBUG
+
+void DirectionalDragArea::ActiveTouchesInfo::addTouchPoint(int touchId)
+{
+    ActiveTouchInfo &activeTouchInfo = m_touchInfoPool.getEmptySlot();
+    activeTouchInfo.id = touchId;
     activeTouchInfo.startTime = m_timeSource->msecsSinceReference();
-}
-
-void DirectionalDragArea::ActiveTouchesInfo::removeTouchPoint(const QTouchEvent::TouchPoint &touchPoint)
-{
-    for (int i = 0; i <= m_lastUsedIndex; ++i) {
-        if (touchPoint.id() == m_vector.at(i).id) {
-            freeSlot(i);
-            return;
-        }
-    }
-    Q_ASSERT(false); // shouldn't reach this point
-}
-
-DirectionalDragArea::ActiveTouchInfo &DirectionalDragArea::ActiveTouchesInfo::getEmptySlot()
-{
-    Q_ASSERT(m_lastUsedIndex < m_vector.size());
-
-    // Look for an in-between vacancy first
-    for (int i = 0; i < m_lastUsedIndex; ++i) {
-        ActiveTouchInfo &activeTouchInfo = m_vector[i];
-        if (!activeTouchInfo.isValid()) {
-            return activeTouchInfo;
-        }
-    }
-
-    ++m_lastUsedIndex;
-    if (m_lastUsedIndex >= m_vector.size()) {
-        m_vector.resize(m_lastUsedIndex + 1);
-    }
-
-    return m_vector[m_lastUsedIndex];
-}
-
-void DirectionalDragArea::ActiveTouchesInfo::freeSlot(int index)
-{
-    m_vector[index].reset();
-    if (index == m_lastUsedIndex) {
-        do {
-            --m_lastUsedIndex;
-        } while (m_lastUsedIndex >= 0 && !m_vector.at(m_lastUsedIndex).isValid());
-    }
+
+    #if ACTIVETOUCHESINFO_DEBUG
+    qDebug() << "[DDA::ActiveTouchesInfo]" << qPrintable(toString());
+    #endif
+}
+
+qint64 DirectionalDragArea::ActiveTouchesInfo::touchStartTime(int touchId)
+{
+    qint64 result = -1;
+
+    m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
+        if (touchId == touchInfo->id) {
+            result = touchInfo->startTime;
+            return false;
+        } else {
+            return true;
+        }
+    });
+
+    Q_ASSERT(result != -1);
+    return result;
+}
+
+void DirectionalDragArea::ActiveTouchesInfo::removeTouchPoint(int touchId)
+{
+    m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {
+        if (touchId == touchInfo->id) {
+            m_touchInfoPool.freeSlot(touchInfo);
+            return false;
+        } else {
+            return true;
+        }
+    });
+
+    #if ACTIVETOUCHESINFO_DEBUG
+    qDebug() << "[DDA::ActiveTouchesInfo]" << qPrintable(toString());
+    #endif
 }
 
 qint64 DirectionalDragArea::ActiveTouchesInfo::mostRecentStartTime()
 {
-    Q_ASSERT(m_lastUsedIndex >= 0);
-
-    qint64 highestStartTime = m_vector.at(0).startTime;
-    int i = 1;
-    do {
-        const ActiveTouchInfo &activeTouchInfo = m_vector.at(i);
-        if (activeTouchInfo.isValid() && activeTouchInfo.startTime > highestStartTime) {
-            highestStartTime = activeTouchInfo.startTime;
+    Q_ASSERT(!m_touchInfoPool.isEmpty());
+
+    qint64 highestStartTime = -1;
+
+    m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &activeTouchInfo) {
+        if (activeTouchInfo->startTime > highestStartTime) {
+            highestStartTime = activeTouchInfo->startTime;
         }
-        ++i;
-    } while (i < m_lastUsedIndex);
+        return true;
+    });
 
     return highestStartTime;
 }

=== modified file 'plugins/Ubuntu/Gestures/DirectionalDragArea.h'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.h	2014-05-02 08:29:26 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.h	2014-10-10 15:05:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013,2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,27 +19,16 @@
 
 #include <QtQuick/QQuickItem>
 #include "AxisVelocityCalculator.h"
-#include "UbuntuGesturesGlobal.h"
+#include "UbuntuGesturesQmlGlobal.h"
 #include "Damper.h"
 #include "Direction.h"
 
-namespace UbuntuGestures {
-/* Defines an interface for a Timer. */
-class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject {
-    Q_OBJECT
-public:
-    AbstractTimer(QObject *parent) : QObject(parent), m_isRunning(false) {}
-    virtual int interval() const = 0;
-    virtual void setInterval(int msecs) = 0;
-    virtual void start() { m_isRunning = true; };
-    virtual void stop() { m_isRunning = false; }
-    bool isRunning() const { return m_isRunning; }
-Q_SIGNALS:
-    void timeout();
-private:
-    bool m_isRunning;
-};
-}
+// lib UbuntuGestures
+#include <Pool.h>
+#include <Timer.h>
+
+class TouchOwnershipEvent;
+class UnownedTouchEvent;
 
 /*
  An area that detects axis-aligned single-finger drag gestures
@@ -50,7 +39,7 @@
 
  See doc/DirectionalDragArea.svg
  */
-class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {
+class UBUNTUGESTURESQML_EXPORT DirectionalDragArea : public QQuickItem {
     Q_OBJECT
 
     // The direction in which the gesture should move in order to be recognized.
@@ -196,6 +185,12 @@
     // Useful for testing, where a fake time source can be supplied
     void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);
 
+    bool event(QEvent *e) override;
+
+    // Maximum time, in milliseconds, between a press and a release, for a touch
+    // sequence to be considered a tap.
+    int maxTapDuration() const { return 300; }
+
 Q_SIGNALS:
     void directionChanged(Direction::Type direction);
     void statusChanged(Status value);
@@ -212,6 +207,10 @@
     void touchYChanged(qreal value);
     void touchSceneXChanged(qreal value);
     void touchSceneYChanged(qreal value);
+
+    // TODO: I would rather not have such signal as it has nothing to do with drag gestures.
+    // Remove when no longer used or move its implementation to the QML code that uses it
+    // See maxTapDuration()
     void tapped();
 
 protected:
@@ -219,7 +218,7 @@
 
 private Q_SLOTS:
     void checkSpeed();
-    void onEnabledChanged();
+    void giveUpIfDisabledOrInvisible();
 
 private:
     void touchEvent_absent(QTouchEvent *event);
@@ -238,6 +237,12 @@
     // returns the scalar projection between the given vector (in scene coordinates)
     // and m_sceneDirectionVector
     qreal projectOntoDirectionVector(const QPointF &sceneVector) const;
+    void touchOwnershipEvent(TouchOwnershipEvent *event);
+    void unownedTouchEvent(UnownedTouchEvent *event);
+    void unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent);
+    void watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints);
+    bool recognitionIsDisabled() const;
+    void emitSignalIfTapped();
 
     Status m_status;
 
@@ -283,18 +288,21 @@
     public:
         ActiveTouchesInfo(const UbuntuGestures::SharedTimeSource &timeSource);
         void update(QTouchEvent *event);
-        ActiveTouchInfo &touchInfo(int id);
+        qint64 touchStartTime(int id);
+        bool isEmpty() const { return m_touchInfoPool.isEmpty(); }
         qint64 mostRecentStartTime();
         UbuntuGestures::SharedTimeSource m_timeSource;
-        bool isEmpty() const { return m_lastUsedIndex == -1; }
     private:
-        void addTouchPoint(const QTouchEvent::TouchPoint &touchPoint);
-        ActiveTouchInfo &getEmptySlot();
-        void freeSlot(int index);
-        void removeTouchPoint(const QTouchEvent::TouchPoint &touchPoint);
-        QVector<struct ActiveTouchInfo> m_vector;
-        int m_lastUsedIndex;
+        void addTouchPoint(int touchId);
+        void removeTouchPoint(int touchId);
+        #if ACTIVETOUCHESINFO_DEBUG
+        QString toString();
+        #endif
+
+        Pool<ActiveTouchInfo> m_touchInfoPool;
     } m_activeTouches;
+
+    friend class tst_DirectionalDragArea;
 };
 
 #endif // DIRECTIONAL_DRAG_AREA_H

=== modified file 'plugins/Ubuntu/Gestures/TimeSource.h'
--- plugins/Ubuntu/Gestures/TimeSource.h	2013-10-22 15:56:37 +0000
+++ plugins/Ubuntu/Gestures/TimeSource.h	2014-10-10 15:05:15 +0000
@@ -21,14 +21,14 @@
 #ifndef UBUNTUGESTURES_TIMESOURCE_H
 #define UBUNTUGESTURES_TIMESOURCE_H
 
-#include "UbuntuGesturesGlobal.h"
+#include "UbuntuGesturesQmlGlobal.h"
 #include <QSharedPointer>
 
 namespace UbuntuGestures {
 /*
     Interface for a time source.
  */
-class UBUNTUGESTURES_EXPORT TimeSource {
+class UBUNTUGESTURESQML_EXPORT TimeSource {
 public:
     virtual ~TimeSource() {}
     /* Returns the current time in milliseconds since some reference time in the past. */

=== added file 'plugins/Ubuntu/Gestures/TouchGate.cpp'
--- plugins/Ubuntu/Gestures/TouchGate.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/TouchGate.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,347 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include "TouchGate.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+
+#include <TouchOwnershipEvent.h>
+#include <TouchRegistry.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-pedantic"
+#include <private/qquickitem_p.h>
+#pragma GCC diagnostic pop
+
+#if TOUCHGATE_DEBUG
+#include <DebugHelpers.h>
+#endif
+
+
+bool TouchGate::event(QEvent *e)
+{
+    if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
+        touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(e));
+        return true;
+    } else {
+        return QQuickItem::event(e);
+    }
+}
+
+void TouchGate::touchEvent(QTouchEvent *event)
+{
+    #if TOUCHGATE_DEBUG
+    qDebug() << "[TouchGate] got touch event" << qPrintable(touchEventToString(event));
+    #endif
+    event->accept();
+
+    const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
+    bool goodToGo = true;
+    for (int i = 0; i < touchPoints.count(); ++i) {
+        const QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
+
+        if (touchPoint.state() == Qt::TouchPointPressed) {
+            Q_ASSERT(!m_touchInfoMap.contains(touchPoint.id()));
+            m_touchInfoMap[touchPoint.id()].ownership = OwnershipRequested;
+            m_touchInfoMap[touchPoint.id()].ended = false;
+            TouchRegistry::instance()->requestTouchOwnership(touchPoint.id(), this);
+        }
+
+        goodToGo &= m_touchInfoMap.contains(touchPoint.id())
+            && m_touchInfoMap[touchPoint.id()].ownership == OwnershipGranted;
+
+        if (touchPoint.state() == Qt::TouchPointReleased && m_touchInfoMap.contains(touchPoint.id())) {
+            m_touchInfoMap[touchPoint.id()].ended = true;
+        }
+
+    }
+
+    if (goodToGo) {
+        if (m_storedEvents.isEmpty()) {
+            // let it pass through
+            dispatchTouchEventToTarget(event);
+        } else {
+            // Retain the event to ensure TouchGate dispatches them in order.
+            // Otherwise the current event would come before the stored ones, which are older.
+            #if TOUCHGATE_DEBUG
+            qDebug("[TouchGate] Storing event because thouches %s are still pending ownership.",
+                qPrintable(oldestPendingTouchIdsString()));
+            #endif
+            storeTouchEvent(event);
+        }
+    } else {
+        // Retain events that have unowned touches
+        storeTouchEvent(event);
+    }
+}
+
+void TouchGate::touchOwnershipEvent(TouchOwnershipEvent *event)
+{
+    // TODO: Optimization: batch those actions as TouchOwnershipEvents
+    //       might come one right after the other.
+
+    Q_ASSERT(m_touchInfoMap.contains(event->touchId()));
+
+    TouchInfo &touchInfo = m_touchInfoMap[event->touchId()];
+
+    if (event->gained()) {
+        #if TOUCHGATE_DEBUG
+        qDebug() << "[TouchGate] Got ownership of touch " << event->touchId();
+        #endif
+        touchInfo.ownership = OwnershipGranted;
+    } else {
+        #if TOUCHGATE_DEBUG
+        qDebug() << "[TouchGate] Lost ownership of touch " << event->touchId();
+        #endif
+        m_touchInfoMap.remove(event->touchId());
+        removeTouchFromStoredEvents(event->touchId());
+    }
+
+    dispatchFullyOwnedEvents();
+}
+
+bool TouchGate::isTouchPointOwned(int touchId) const
+{
+    return m_touchInfoMap[touchId].ownership == OwnershipGranted;
+}
+
+void TouchGate::storeTouchEvent(const QTouchEvent *event)
+{
+    #if TOUCHGATE_DEBUG
+    qDebug() << "[TouchGate] Storing" << qPrintable(touchEventToString(event));
+    #endif
+
+    TouchEvent clonedEvent(event);
+    m_storedEvents.append(std::move(clonedEvent));
+}
+
+void TouchGate::removeTouchFromStoredEvents(int touchId)
+{
+    int i = 0;
+    while (i < m_storedEvents.count()) {
+        TouchEvent &event = m_storedEvents[i];
+        bool removed = event.removeTouch(touchId);
+
+        if (removed && event.touchPoints.isEmpty()) {
+            m_storedEvents.removeAt(i);
+        } else {
+            ++i;
+        }
+    }
+}
+
+void TouchGate::dispatchFullyOwnedEvents()
+{
+    while (!m_storedEvents.isEmpty() && eventIsFullyOwned(m_storedEvents.first())) {
+        TouchEvent event = m_storedEvents.takeFirst();
+        dispatchTouchEventToTarget(event);
+    }
+}
+
+#if TOUCHGATE_DEBUG
+QString TouchGate::oldestPendingTouchIdsString()
+{
+    Q_ASSERT(!m_storedEvents.isEmpty());
+
+    QString str;
+
+    const auto &touchPoints = m_storedEvents.first().touchPoints;
+    for (int i = 0; i < touchPoints.count(); ++i) {
+        if (!isTouchPointOwned(touchPoints[i].id())) {
+            if (!str.isEmpty()) {
+                str.append(", ");
+            }
+            str.append(QString::number(touchPoints[i].id()));
+        }
+    }
+
+    return str;
+}
+#endif
+
+bool TouchGate::eventIsFullyOwned(const TouchGate::TouchEvent &event) const
+{
+    for (int i = 0; i < event.touchPoints.count(); ++i) {
+        if (!isTouchPointOwned(event.touchPoints[i].id())) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void TouchGate::setTargetItem(QQuickItem *item)
+{
+    // TODO: changing the target item while dispatch of touch events is taking place will
+    //       create a mess
+
+    if (item == m_targetItem.data())
+        return;
+
+    m_targetItem = item;
+    Q_EMIT targetItemChanged(item);
+}
+
+void TouchGate::dispatchTouchEventToTarget(const TouchEvent &event)
+{
+    dispatchTouchEventToTarget(event.eventType,
+            event.device,
+            event.modifiers,
+            event.touchPoints,
+            event.target,
+            event.window,
+            event.timestamp);
+}
+
+void TouchGate::dispatchTouchEventToTarget(QTouchEvent* event)
+{
+    dispatchTouchEventToTarget(event->type(),
+            event->device(),
+            event->modifiers(),
+            event->touchPoints(),
+            event->target(),
+            event->window(),
+            event->timestamp());
+}
+
+void TouchGate::dispatchTouchEventToTarget(QEvent::Type eventType,
+        QTouchDevice *device,
+        Qt::KeyboardModifiers modifiers,
+        const QList<QTouchEvent::TouchPoint> &touchPoints,
+        QObject *target,
+        QWindow *window,
+        ulong timestamp)
+{
+    removeTouchInfoForEndedTouches(touchPoints);
+
+    if (m_targetItem.isNull()) {
+        qWarning("[TouchGate] Cannot dispatch touch event because target item is null");
+        return;
+    }
+
+    QQuickItem *targetItem = m_targetItem.data();
+
+    if (!targetItem->isEnabled() || !targetItem->isVisible()) {
+        #if TOUCHGATE_DEBUG
+        qDebug() << "[TouchGate] Cannot dispatch touch event to" << targetItem
+            << "because it's disabled or invisible.";
+        #endif
+        return;
+    }
+
+    // Map touch points to targetItem coordinates
+    QList<QTouchEvent::TouchPoint> targetTouchPoints = touchPoints;
+    transformTouchPoints(targetTouchPoints, QQuickItemPrivate::get(targetItem)->windowToItemTransform());
+    QTouchEvent *eventForTargetItem = createQTouchEvent(eventType, device, modifiers, targetTouchPoints,
+            target, window, timestamp);
+
+    #if TOUCHGATE_DEBUG
+    qDebug() << "[TouchGate] dispatching" << qPrintable(touchEventToString(eventForTargetItem))
+            << "to" << targetItem;
+    #endif
+
+    QCoreApplication::sendEvent(targetItem, eventForTargetItem);
+
+    delete eventForTargetItem;
+}
+
+// NB: From QQuickWindow
+void TouchGate::transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform)
+{
+    QMatrix4x4 transformMatrix(transform);
+    for (int i=0; i<touchPoints.count(); i++) {
+        QTouchEvent::TouchPoint &touchPoint = touchPoints[i];
+        touchPoint.setRect(transform.mapRect(touchPoint.sceneRect()));
+        touchPoint.setStartPos(transform.map(touchPoint.startScenePos()));
+        touchPoint.setLastPos(transform.map(touchPoint.lastScenePos()));
+        touchPoint.setVelocity(transformMatrix.mapVector(touchPoint.velocity()).toVector2D());
+    }
+}
+
+QTouchEvent *TouchGate::createQTouchEvent(QEvent::Type eventType,
+        QTouchDevice *device,
+        Qt::KeyboardModifiers modifiers,
+        const QList<QTouchEvent::TouchPoint> &touchPoints,
+        QObject *target,
+        QWindow *window,
+        ulong timestamp)
+{
+    Qt::TouchPointStates eventStates = 0;
+    for (int i = 0; i < touchPoints.count(); i++)
+        eventStates |= touchPoints[i].state();
+    // if all points have the same state, set the event type accordingly
+    switch (eventStates) {
+        case Qt::TouchPointPressed:
+            eventType = QEvent::TouchBegin;
+            break;
+        case Qt::TouchPointReleased:
+            eventType = QEvent::TouchEnd;
+            break;
+        default:
+            eventType = QEvent::TouchUpdate;
+            break;
+    }
+
+    QTouchEvent *touchEvent = new QTouchEvent(eventType);
+    touchEvent->setWindow(window);
+    touchEvent->setTarget(target);
+    touchEvent->setDevice(device);
+    touchEvent->setModifiers(modifiers);
+    touchEvent->setTouchPoints(touchPoints);
+    touchEvent->setTouchPointStates(eventStates);
+    touchEvent->setTimestamp(timestamp);
+    touchEvent->accept();
+    return touchEvent;
+}
+
+void TouchGate::removeTouchInfoForEndedTouches(const QList<QTouchEvent::TouchPoint> &touchPoints)
+{
+    for (int i = 0; i < touchPoints.size(); ++i) {\
+        const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);
+
+        if (touchPoint.state() == Qt::TouchPointReleased) {
+            Q_ASSERT(m_touchInfoMap.contains(touchPoint.id()));
+            Q_ASSERT(m_touchInfoMap[touchPoint.id()].ended);
+            Q_ASSERT(m_touchInfoMap[touchPoint.id()].ownership == OwnershipGranted);
+            m_touchInfoMap.remove(touchPoint.id());
+        }
+    }
+}
+
+TouchGate::TouchEvent::TouchEvent(const QTouchEvent *event)
+    : eventType(event->type())
+    , device(event->device())
+    , modifiers(event->modifiers())
+    , touchPoints(event->touchPoints())
+    , target(event->target())
+    , window(event->window())
+    , timestamp(event->timestamp())
+{
+}
+
+bool TouchGate::TouchEvent::removeTouch(int touchId)
+{
+    bool removed = false;
+    for (int i = 0; i < touchPoints.count() && !removed; ++i) {
+        if (touchPoints[i].id() == touchId) {
+            touchPoints.removeAt(i);
+            removed = true;
+        }
+    }
+
+    return removed;
+}

=== added file 'plugins/Ubuntu/Gestures/TouchGate.h'
--- plugins/Ubuntu/Gestures/TouchGate.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/TouchGate.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#ifndef UBUNTU_TOUCH_GATE_H
+#define UBUNTU_TOUCH_GATE_H
+
+#include "UbuntuGesturesQmlGlobal.h"
+
+#include <QQuickItem>
+#include <QList>
+#include <QPointer>
+#include <QMap>
+
+#define TOUCHGATE_DEBUG 0
+
+class TouchOwnershipEvent;
+
+/*
+  Blocks the passage of events until ownership over the related touch points is granted.
+
+  Blocked touch events won't be discarded. Instead they will be buffered until ownership
+  is granted. If ownership is given to another item, the event buffer is cleared.
+
+  A TouchGate is useful as a mediator for items that do not understand, or gracefully handle,
+  touch canceling. By having a TouchGate in front of them you guarantee that only owned touches (i.e.,
+  touches that won't be canceled later) reaches them.
+ */
+class UBUNTUGESTURESQML_EXPORT TouchGate : public QQuickItem {
+    Q_OBJECT
+
+    // Item that's going to receive the touch events that make it through the gate.
+    Q_PROPERTY(QQuickItem* targetItem READ targetItem WRITE setTargetItem NOTIFY targetItemChanged)
+
+public:
+    bool event(QEvent *e) override;
+
+    QQuickItem *targetItem() { return m_targetItem; }
+    void setTargetItem(QQuickItem *item);
+
+Q_SIGNALS:
+    void targetItemChanged(QQuickItem *item);
+
+protected:
+    void touchEvent(QTouchEvent *event) override;
+private:
+    class TouchEvent {
+    public:
+        TouchEvent(const QTouchEvent *event);
+
+        bool removeTouch(int touchId);
+
+        QEvent::Type eventType;
+        QTouchDevice *device;
+        Qt::KeyboardModifiers modifiers;
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        QObject *target;
+        QWindow *window;
+        ulong timestamp;
+    };
+
+    void touchOwnershipEvent(TouchOwnershipEvent *event);
+    bool isTouchPointOwned(int touchId) const;
+    void storeTouchEvent(const QTouchEvent *event);
+    void removeTouchFromStoredEvents(int touchId);
+    void dispatchFullyOwnedEvents();
+    bool eventIsFullyOwned(const TouchEvent &event) const;
+
+    void dispatchTouchEventToTarget(const TouchEvent &event);
+    void dispatchTouchEventToTarget(QTouchEvent* event);
+    void dispatchTouchEventToTarget(
+        QEvent::Type eventType,
+        QTouchDevice *device,
+        Qt::KeyboardModifiers modifiers,
+        const QList<QTouchEvent::TouchPoint> &touchPoints,
+        QObject *target,
+        QWindow *window,
+        ulong timestamp);
+
+    void transformTouchPoints(QList<QTouchEvent::TouchPoint> &touchPoints, const QTransform &transform);
+    static QTouchEvent *createQTouchEvent(QEvent::Type eventType,
+            QTouchDevice *device,
+            Qt::KeyboardModifiers modifiers,
+            const QList<QTouchEvent::TouchPoint> &touchPoints,
+            QObject *target,
+            QWindow *window,
+            ulong timestamp);
+    void removeTouchInfoForEndedTouches(const QList<QTouchEvent::TouchPoint> &touchPoints);
+
+    #if TOUCHGATE_DEBUG
+    QString oldestPendingTouchIdsString();
+    #endif
+
+    QList<TouchEvent> m_storedEvents;
+
+    enum {
+        OwnershipUndefined,
+        OwnershipRequested,
+        OwnershipGranted,
+    };
+    class TouchInfo {
+    public:
+        TouchInfo() {ownership = OwnershipUndefined; ended = false;}
+        int ownership;
+        bool ended;
+    };
+    QMap<int, TouchInfo> m_touchInfoMap;
+
+    QPointer<QQuickItem> m_targetItem;
+
+    friend class tst_TouchGate;
+};
+
+#endif // UBUNTU_TOUCH_GATE_H

=== renamed file 'plugins/Ubuntu/Gestures/UbuntuGesturesGlobal.h' => 'plugins/Ubuntu/Gestures/UbuntuGesturesQmlGlobal.h'
--- plugins/Ubuntu/Gestures/UbuntuGesturesGlobal.h	2013-06-05 22:03:08 +0000
+++ plugins/Ubuntu/Gestures/UbuntuGesturesQmlGlobal.h	2014-10-10 15:05:15 +0000
@@ -16,8 +16,8 @@
 
 #include <QtCore/QtGlobal>
 
-#if defined(UBUNTUGESTURES_LIBRARY)
-#  define UBUNTUGESTURES_EXPORT Q_DECL_EXPORT
+#if defined(UBUNTUGESTURESQML_LIBRARY)
+#  define UBUNTUGESTURESQML_EXPORT Q_DECL_EXPORT
 #else
-#  define UBUNTUGESTURES_EXPORT Q_DECL_IMPORT
+#  define UBUNTUGESTURESQML_EXPORT Q_DECL_IMPORT
 #endif

=== modified file 'plugins/Ubuntu/Gestures/plugin.cpp'
--- plugins/Ubuntu/Gestures/plugin.cpp	2013-11-22 13:43:40 +0000
+++ plugins/Ubuntu/Gestures/plugin.cpp	2014-10-10 15:05:15 +0000
@@ -19,6 +19,7 @@
 #include "Direction.h"
 #include "DirectionalDragArea.h"
 #include "PressedOutsideNotifier.h"
+#include "TouchGate.h"
 
 #include <qqml.h>
 
@@ -28,10 +29,11 @@
   return new Direction;
 }
 
-void UbuntuGestureQmlPlugin::registerTypes(const char *uri)
+void UbuntuGesturesQmlPlugin::registerTypes(const char *uri)
 {
     qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);
     qmlRegisterType<DirectionalDragArea>(uri, 0, 1, "DirectionalDragArea");
     qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");
     qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");
+    qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");
 }

=== modified file 'plugins/Ubuntu/Gestures/plugin.h'
--- plugins/Ubuntu/Gestures/plugin.h	2013-06-05 22:03:08 +0000
+++ plugins/Ubuntu/Gestures/plugin.h	2014-10-10 15:05:15 +0000
@@ -19,7 +19,7 @@
 
 #include <QtQml/QQmlExtensionPlugin>
 
-class UbuntuGestureQmlPlugin : public QQmlExtensionPlugin
+class UbuntuGesturesQmlPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

=== modified file 'plugins/Ubuntu/Gestures/qmldir'
--- plugins/Ubuntu/Gestures/qmldir	2014-05-02 22:57:00 +0000
+++ plugins/Ubuntu/Gestures/qmldir	2014-10-10 15:05:15 +0000
@@ -1,3 +1,3 @@
 module Ubuntu.Gestures
-plugin UbuntuGestureQml
+plugin UbuntuGesturesQml
 typeinfo Gestures.qmltypes

=== modified file 'qml/Components/DragHandle.qml'
--- qml/Components/DragHandle.qml	2014-02-12 18:51:36 +0000
+++ qml/Components/DragHandle.qml	2014-10-10 15:05:15 +0000
@@ -47,12 +47,12 @@
     id: dragArea
     objectName: "dragHandle"
 
-    // Disable most of the gesture recognition parameters by default when hinting is used as
+    // Disable gesture recognition by default when hinting is used as
     // it conflicts with the hinting idea.
-    // The only part we keep in this situation is that it must be a single-finger gesture.
     distanceThreshold: hintDisplacement > 0 ? 0 : defaultDistanceThreshold
     maxSilenceTime: hintDisplacement > 0 ? 60*60*1000 : defaultMaxSilenceTime
     maxDeviation: hintDisplacement > 0 ? 999999 : defaultMaxDeviation
+    compositionTime: hintDisplacement > 0 ? 0 : defaultCompositionTime
 
     property bool stretch: false
 

=== modified file 'qml/Components/EdgeDragArea.qml'
--- qml/Components/EdgeDragArea.qml	2013-10-22 15:56:37 +0000
+++ qml/Components/EdgeDragArea.qml	2014-10-10 15:05:15 +0000
@@ -34,6 +34,7 @@
     distanceThreshold: defaultDistanceThreshold
     minSpeed: defaultMinSpeed
     maxSilenceTime: defaultMaxSilenceTime
+    compositionTime: defaultCompositionTime
 
     readonly property real defaultMaxDeviation: units.gu(3)
     readonly property real defaultWideningAngle: 50
@@ -41,4 +42,5 @@
     // some people were getting false negatives with it enabled.
     readonly property real defaultMinSpeed: units.gu(0)
     readonly property int defaultMaxSilenceTime: 200
+    readonly property int defaultCompositionTime: 60
 }

=== modified file 'qml/Components/InputMethod.qml'
--- qml/Components/InputMethod.qml	2014-07-23 18:25:53 +0000
+++ qml/Components/InputMethod.qml	2014-10-10 15:05:15 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import Unity.Application 0.1
 import Ubuntu.Components 0.1
+import Ubuntu.Gestures 0.1
 
 Item {
     id: root
@@ -25,6 +26,18 @@
 
     property int transitionDuration: UbuntuAnimation.FastDuration
 
+    Binding { target: surface; property: "z"; value: 0 }
+
+    TouchGate {
+        x: UbuntuKeyboardInfo.x
+        y: UbuntuKeyboardInfo.y
+        z: 1
+        width: UbuntuKeyboardInfo.width
+        height: UbuntuKeyboardInfo.height
+
+        targetItem: root.surface
+    }
+
     state: {
         if (surface && surface.state != MirSurfaceItem.Minimized) {
             return "shown";

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-10-09 14:04:53 +0000
+++ qml/Dash/Dash.qml	2014-10-10 15:05:15 +0000
@@ -207,6 +207,12 @@
             }
         }
 
+        // This is to avoid the situation where a bottom-edge swipe would bring up the dash overview
+        // (as expected) but would also cause the dash content flickable to move a bit, because
+        // that flickable was getting the touch events while overviewDragHandle was still undecided
+        // about whether that touch was indeed performing a directional drag gesture.
+        forceNonInteractive: overviewDragHandle.status != DirectionalDragArea.WaitingForTouch
+
         enabled: overviewController.progress == 0
         opacity: enabled ? 1 : 0
     }
@@ -363,16 +369,32 @@
         height: units.gu(2)
 
         onSceneDistanceChanged: {
-            if (overviewController.enableAnimation) {
-                dashContentCache.scheduleUpdate();
+            if (status == DirectionalDragArea.Recognized && initialSceneDistance != -1) {
+                if (overviewController.enableAnimation) {
+                    dashContentCache.scheduleUpdate();
+                }
+                overviewController.enableAnimation = false;
+                var deltaDistance = sceneDistance - initialSceneDistance;
+                overviewController.progress = Math.max(0, Math.min(1, deltaDistance / fullMovement));
             }
-            overviewController.enableAnimation = false;
-            overviewController.progress = Math.max(0, Math.min(1, sceneDistance / fullMovement));
         }
 
-        onDraggingChanged: {
-            overviewController.enableAnimation = true;
-            overviewController.progress = (overviewController.progress > 0.7)  ? 1 : 0;
+        property int previousStatus: -1
+        property int currentStatus: DirectionalDragArea.WaitingForTouch
+        property real initialSceneDistance: -1
+
+        onStatusChanged: {
+            previousStatus = currentStatus;
+            currentStatus = status;
+
+            if (status == DirectionalDragArea.Recognized) {
+                initialSceneDistance = sceneDistance;
+            } else if (status == DirectionalDragArea.WaitingForTouch &&
+                    previousStatus == DirectionalDragArea.Recognized) {
+                overviewController.enableAnimation = true;
+                overviewController.progress = (overviewController.progress > 0.7)  ? 1 : 0;
+                initialSceneDistance = -1;
+            }
         }
     }
 

=== modified file 'qml/Dash/DashContent.qml'
--- qml/Dash/DashContent.qml	2014-09-22 14:24:34 +0000
+++ qml/Dash/DashContent.qml	2014-10-10 15:05:15 +0000
@@ -23,6 +23,7 @@
 Item {
     id: dashContent
 
+    property bool forceNonInteractive: false
     property alias scopes: dashContentList.model
     readonly property alias currentIndex: dashContentList.currentIndex
     readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
@@ -101,7 +102,8 @@
             id: dashContentList
             objectName: "dashContentList"
 
-            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.navigationShown && !currentItem.subPageShown
+            interactive: !dashContent.forceNonInteractive && dashContent.scopes.loaded && currentItem
+                      && !currentItem.moving && !currentItem.navigationShown && !currentItem.subPageShown
             anchors.fill: parent
             orientation: ListView.Horizontal
             boundsBehavior: Flickable.DragAndOvershootBounds
@@ -180,6 +182,7 @@
                         item.paginationCount = Qt.binding(function() { return dashContentList.count } )
                         item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
                         item.holdingList = dashContentList;
+                        item.forceNonInteractive = Qt.binding(function() { return dashContent.forceNonInteractive } )
                     }
                     Connections {
                         target: isCurrent ? scope : null

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-10-06 15:54:18 +0000
+++ qml/Dash/GenericScopeView.qml	2014-10-10 15:05:15 +0000
@@ -26,6 +26,7 @@
     id: scopeView
 
     readonly property bool navigationShown: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].openList : false
+    property bool forceNonInteractive: false
     property var scope: null
     property SortFilterProxyModel categories: categoryFilter
     property bool isCurrent: false
@@ -149,6 +150,7 @@
     ScopeListView {
         id: categoryView
         objectName: "categoryListView"
+        interactive: !forceNonInteractive
 
         x: subPageLoader.open ? -width : 0
         visible: x != -width

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2014-10-06 16:39:10 +0000
+++ qml/Launcher/Launcher.qml	2014-10-10 15:05:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -76,6 +76,7 @@
 
     Timer {
         id: dismissTimer
+        objectName: "dismissTimer"
         interval: 5000
         onTriggered: {
             if (!panel.preventHiding) {
@@ -218,6 +219,7 @@
 
     EdgeDragArea {
         id: dragArea
+        objectName: "launcherDragArea"
 
         direction: Direction.Rightwards
 

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-10-07 08:25:59 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-10-10 15:05:15 +0000
@@ -45,6 +45,7 @@
         }
 
         Rectangle {
+            objectName: "buttonShowDashHome"
             width: parent.width
             height: units.gu(7)
             color: UbuntuColors.orange

=== modified file 'qml/Stages/ApplicationWindow.qml'
--- qml/Stages/ApplicationWindow.qml	2014-09-19 11:20:07 +0000
+++ qml/Stages/ApplicationWindow.qml	2014-10-10 15:05:15 +0000
@@ -61,14 +61,6 @@
         // Remove this when possible
         property bool surfaceInitialized: false
 
-        function forceSurfaceActiveFocusIfReady() {
-            if (sessionContainer.surface !== null &&
-                    sessionContainer.surface.focus &&
-                    sessionContainer.surface.parent === sessionContainer.surfaceContainer &&
-                    sessionContainer.surface.enabled) {
-                sessionContainer.surface.forceActiveFocus();
-            }
-        }
     }
 
     Timer {
@@ -77,15 +69,6 @@
         onTriggered: { if (sessionContainer.surface) {d.surfaceInitialized = true;} }
     }
 
-    Connections {
-        target: sessionContainer.surface
-        // FIXME: I would rather not need to do this, but currently it doesn't get
-        // active focus without it and I don't know why.
-        onFocusChanged: d.forceSurfaceActiveFocusIfReady();
-        onParentChanged: d.forceSurfaceActiveFocusIfReady();
-        onEnabledChanged: d.forceSurfaceActiveFocusIfReady();
-    }
-
     Image {
         id: screenshotImage
         objectName: "screenshotImage"
@@ -132,7 +115,6 @@
         onSurfaceChanged: {
             if (sessionContainer.surface) {
                 surfaceInitTimer.start();
-                d.forceSurfaceActiveFocusIfReady();
             } else {
                 d.surfaceInitialized = false;
             }

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2014-10-07 18:18:44 +0000
+++ qml/Stages/PhoneStage.qml	2014-10-10 15:05:15 +0000
@@ -131,7 +131,7 @@
 
         // This indicates when the spreadView is active. That means, all the animations
         // are activated and tiles need to line up for the spread.
-        readonly property bool active: shiftedContentX > 0 || spreadDragArea.dragging
+        readonly property bool active: shiftedContentX > 0 || spreadDragArea.status === DirectionalDragArea.Recognized
 
         // The flickable needs to fill the screen in order to get touch events all over.
         // However, we don't want to the user to be able to scroll back all the way. For
@@ -418,6 +418,7 @@
 
     EdgeDragArea {
         id: spreadDragArea
+        objectName: "spreadDragArea"
         direction: Direction.Leftwards
         enabled: spreadView.phase != 2 && root.spreadEnabled
 
@@ -437,9 +438,10 @@
                 spreadView.phase = 0;
                 spreadView.contentX = -spreadView.shift;
             }
-            if (dragging && attachedToView) {
+            if (dragging && status == DirectionalDragArea.Recognized && attachedToView) {
                 // Gesture recognized. Let's move the spreadView with the finger
-                spreadView.contentX = -touchX + spreadDragArea.width - spreadView.shift;
+                var finalX = Math.min(touchX + width, width);
+                spreadView.contentX = -finalX + spreadDragArea.width - spreadView.shift;
             }
             if (attachedToView && spreadView.shiftedContentX >= spreadView.width * spreadView.positionMarker3) {
                 // We passed positionMarker3. Detach from spreadView and snap it.
@@ -449,7 +451,13 @@
             gesturePoints.push(touchX);
         }
 
+        property int previousStatus: -1
+        property int currentStatus: DirectionalDragArea.WaitingForTouch
+
         onStatusChanged: {
+            previousStatus = currentStatus;
+            currentStatus = status;
+
             if (status == DirectionalDragArea.Recognized) {
                 attachedToView = true;
             }
@@ -457,7 +465,7 @@
 
         onDraggingChanged: {
             if (dragging) {
-                // Gesture recognized. Start recording this gesture
+                // A potential edge-drag gesture has started. Start recording it
                 gesturePoints = [];
                 return;
             }
@@ -474,7 +482,8 @@
             }
             gesturePoints = [];
 
-            if (oneWayFlick && spreadView.shiftedContentX > units.gu(2) &&
+            if (previousStatus == DirectionalDragArea.Recognized &&
+                oneWayFlick && spreadView.shiftedContentX > units.gu(2) &&
                     spreadView.shiftedContentX < spreadView.positionMarker1 * spreadView.width) {
                 // If it was a short one-way movement, do the Alt+Tab switch
                 // no matter if we didn't cross positionMarker1 yet.

=== modified file 'qml/Stages/SessionContainer.qml'
--- qml/Stages/SessionContainer.qml	2014-09-11 10:41:11 +0000
+++ qml/Stages/SessionContainer.qml	2014-10-10 15:05:15 +0000
@@ -23,7 +23,7 @@
     property QtObject session
     readonly property var childSessions: session ? session.childSessions : null
     readonly property alias surface: _surfaceContainer.surface
-    property bool interactive: true
+    property alias interactive: _surfaceContainer.interactive
     property int orientation
 
     readonly property alias surfaceContainer: _surfaceContainer
@@ -34,18 +34,6 @@
         orientation: root.orientation
     }
 
-    Binding {
-        target: surfaceContainer.surface
-        when: surfaceContainer.surface
-        property: "enabled"
-        value: root.interactive
-    }
-    Binding {
-        target: surfaceContainer.surface
-        when: surfaceContainer.surface
-        property: "focus"
-        value: root.interactive
-    }
 
     Repeater {
         model: root.childSessions

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2014-09-11 10:41:11 +0000
+++ qml/Stages/SurfaceContainer.qml	2014-10-10 15:05:15 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 1.1
+import Ubuntu.Gestures 0.1 // For TouchGate
 
 Item {
     id: root
@@ -23,21 +24,51 @@
     property Item surface: null
     property bool hadSurface: false
     property int orientation
+    property bool interactive
 
     onSurfaceChanged: {
         if (surface) {
             surface.parent = root;
+            d.forceSurfaceActiveFocusIfReady();
         } else {
             hadSurface = true;
         }
     }
-    Binding {
-        target: surface
-        property: "anchors.fill"; value: root
-    }
-    Binding {
-        target: surface
-        property: "orientation"; value: root.orientation
+    Binding { target: surface; property: "anchors.fill"; value: root }
+    Binding { target: surface; property: "orientation"; value: root.orientation }
+    Binding { target: surface; property: "z"; value: 1 }
+    Binding { target: surface; property: "enabled"; value: root.interactive; when: surface }
+    Binding { target: surface; property: "focus"; value: root.interactive; when: surface }
+
+    TouchGate {
+        targetItem: surface
+        anchors.fill: root
+        enabled: root.surface ? root.surface.enabled : false
+        z: 2
+    }
+
+    Connections {
+        target: root.surface
+        // FIXME: I would rather not need to do this, but currently it doesn't get
+        // active focus without it and I don't know why.
+        // Possibly because if an item get focus=true before it has a parent, once
+        // it gets a parent QQuickWindow won't check its focus and update its activeFocus
+        // accordingly. Unlike when you focus=true after the item already has a parent.
+        onFocusChanged: d.forceSurfaceActiveFocusIfReady();
+        onParentChanged: d.forceSurfaceActiveFocusIfReady();
+        onEnabledChanged: d.forceSurfaceActiveFocusIfReady();
+    }
+
+    QtObject {
+        id: d
+        function forceSurfaceActiveFocusIfReady() {
+            if (root.surface !== null &&
+                    root.surface.focus &&
+                    root.surface.parent === root &&
+                    root.surface.enabled) {
+                root.surface.forceActiveFocus();
+            }
+        }
     }
 
     states: [

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-09-04 23:11:17 +0000
+++ src/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -1,5 +1,6 @@
 include_directories(
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
 )
 
 file(GLOB_RECURSE QML_FILES
@@ -29,6 +30,11 @@
     target_link_libraries(${SHELL_APP} ${XCB_LDFLAGS})
 endif()
 
+target_link_libraries(${SHELL_APP} UbuntuGestures)
+
+# For it to find libUbuntuGestures.so
+set_target_properties(${SHELL_APP} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
+
 # install binaries
 install(TARGETS ${SHELL_APP}
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

=== modified file 'src/Dash/CMakeLists.txt'
--- src/Dash/CMakeLists.txt	2014-09-22 15:37:31 +0000
+++ src/Dash/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -9,6 +9,11 @@
 
 qt5_use_modules(unity8-dash Gui Qml Quick Test)
 
+# For it to find libUbuntuGestures.so, needed by Ubuntu.Gestures QML module.
+set_target_properties(unity8-dash PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${SHELL_PRIVATE_LIBDIR}")
+
+target_link_libraries(unity8-dash UbuntuGestures)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 
 # install binaries

=== modified file 'src/Dash/main.cpp'
--- src/Dash/main.cpp	2014-09-18 21:22:37 +0000
+++ src/Dash/main.cpp	2014-10-10 15:05:15 +0000
@@ -31,6 +31,9 @@
 #include "../ApplicationArguments.h"
 #include "../CachingNetworkManagerFactory.h"
 
+// Ubuntu Gestures
+#include <TouchRegistry.h>
+
 int main(int argc, const char *argv[])
 {
     QGuiApplication *application = new QGuiApplication(argc, (char**)argv);
@@ -88,6 +91,9 @@
     view->setTitle("Scopes");
     view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);
 
+    TouchRegistry touchRegistry;
+    view->installEventFilter(&touchRegistry);
+
     // You will need this if you want to interact with touch-only components using a mouse
     // Needed only when manually testing on a desktop.
     MouseTouchAdaptor *mouseTouchAdaptor = 0;

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-09-01 14:44:30 +0000
+++ src/main.cpp	2014-10-10 15:05:15 +0000
@@ -34,6 +34,9 @@
 #include "ApplicationArguments.h"
 #include "CachingNetworkManagerFactory.h"
 
+// Ubuntu Gestures
+#include <TouchRegistry.h>
+
 int main(int argc, const char *argv[])
 {
     bool isMirServer = false;
@@ -120,6 +123,8 @@
     if (parser.isSet(framelessOption)) {
         view->setFlags(Qt::FramelessWindowHint);
     }
+    TouchRegistry touchRegistry;
+    view->installEventFilter(&touchRegistry);
 
     // You will need this if you want to interact with touch-only components using a mouse
     // Needed only when manually testing on a desktop.

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-05-30 09:21:39 +0000
+++ tests/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -7,6 +7,7 @@
 add_custom_target(qmltests)
 add_dependencies(qmltests qmlunittests qmluitests)
 
+add_subdirectory(libs)
 add_subdirectory(qmltests)
 add_subdirectory(mocks)
 add_subdirectory(whitespace)

=== added directory 'tests/libs'
=== added file 'tests/libs/CMakeLists.txt'
--- tests/libs/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/libs/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(UbuntuGestures)

=== added directory 'tests/libs/UbuntuGestures'
=== added file 'tests/libs/UbuntuGestures/CMakeLists.txt'
--- tests/libs/UbuntuGestures/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/libs/UbuntuGestures/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -0,0 +1,20 @@
+include_directories(
+    ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
+    ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+macro(add_gesture_test CLASSNAME)
+    set(testCommand
+         ${CLASSNAME}TestExec -o ${CMAKE_BINARY_DIR}/test${CLASSNAME}.xml,xunitxml -o -,txt)
+
+    add_test(NAME test${CLASSNAME} COMMAND ${testCommand})
+
+    set_tests_properties(test${CLASSNAME} PROPERTIES
+        ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/libs/UbuntuGestures)
+
+    add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp)
+    qt5_use_modules(${CLASSNAME}TestExec Test Core Gui Quick)
+    target_link_libraries(${CLASSNAME}TestExec UbuntuGestures)
+endmacro(add_gesture_test)
+
+add_gesture_test(TouchRegistry)

=== added file 'tests/libs/UbuntuGestures/tst_TouchRegistry.cpp'
--- tests/libs/UbuntuGestures/tst_TouchRegistry.cpp	1970-01-01 00:00:00 +0000
+++ tests/libs/UbuntuGestures/tst_TouchRegistry.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,803 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+#include <QtTest>
+#include <QSet>
+#include <QTouchEvent>
+
+#include <Timer.h>
+#include <TouchOwnershipEvent.h>
+#include <TouchRegistry.h>
+#include <UnownedTouchEvent.h>
+
+using namespace UbuntuGestures;
+
+class TouchMemento {
+public:
+    TouchMemento(const QTouchEvent *touchEvent);
+    Qt::TouchPointStates touchPointStates;
+    QList<QTouchEvent::TouchPoint> touchPoints;
+
+    bool containsTouchWithId(int touchId) const;
+};
+
+class DummyCandidate : public QQuickItem
+{
+    Q_OBJECT
+public:
+    bool event(QEvent *e) override;
+    QSet<int> ownedTouches;
+    QSet<int> lostTouches;
+    QList<TouchMemento> unownedTouchEvents;
+};
+
+class tst_TouchRegistry : public QObject
+{
+    Q_OBJECT
+public:
+    tst_TouchRegistry() : QObject(0) { }
+private Q_SLOTS:
+    void initTestCase() {} // will be called before the first test function is executed
+    void cleanupTestCase() {} // will be called after the last test function was executed.
+
+    void init() {} // called right before each and every test function is executed
+    void cleanup() {} // called right after each and every test function is executed
+
+    void requestWithNoCandidates();
+    void lateCandidateRequestGetsNothing();
+    void lateCandidateGestOwnershipOnceEarlyCandidateQuits();
+    void dispatchesTouchEventsToCandidates();
+    void dispatchesTouchEventsToWatchers();
+    void keepDispatchingToWatchersAfterLastCandidateGivesUp();
+    void candidatesAndWatchers_1();
+    void candidatesAndWatchers_2();
+    void rejectingTouchfterItsEnd();
+    void removeOldUndecidedCandidates();
+};
+
+void tst_TouchRegistry::requestWithNoCandidates()
+{
+    TouchRegistry touchRegistry;
+    DummyCandidate candidate;
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.requestTouchOwnership(0, &candidate);
+
+    QVERIFY(candidate.ownedTouches.contains(0));
+}
+
+void tst_TouchRegistry::lateCandidateRequestGetsNothing()
+{
+    TouchRegistry touchRegistry;
+    DummyCandidate earlyCandidate;
+    earlyCandidate.setObjectName("early");
+    DummyCandidate lateCandidate;
+    lateCandidate.setObjectName("late");
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.addCandidateOwnerForTouch(0, &earlyCandidate);
+    touchRegistry.addCandidateOwnerForTouch(0, &lateCandidate);
+
+    QVERIFY(earlyCandidate.ownedTouches.isEmpty());
+    QVERIFY(lateCandidate.ownedTouches.isEmpty());
+
+    touchRegistry.requestTouchOwnership(0, &lateCandidate);
+
+    QVERIFY(earlyCandidate.ownedTouches.isEmpty());
+    QVERIFY(lateCandidate.ownedTouches.isEmpty());
+
+    touchRegistry.requestTouchOwnership(0, &earlyCandidate);
+
+    QVERIFY(earlyCandidate.ownedTouches.contains(0));
+    QVERIFY(lateCandidate.ownedTouches.isEmpty());
+}
+
+void tst_TouchRegistry::lateCandidateGestOwnershipOnceEarlyCandidateQuits()
+{
+    TouchRegistry touchRegistry;
+    DummyCandidate earlyCandidate;
+    DummyCandidate lateCandidate;
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.addCandidateOwnerForTouch(0, &earlyCandidate);
+    touchRegistry.addCandidateOwnerForTouch(0, &lateCandidate);
+
+    QVERIFY(earlyCandidate.ownedTouches.isEmpty());
+    QVERIFY(lateCandidate.ownedTouches.isEmpty());
+
+    touchRegistry.requestTouchOwnership(0, &lateCandidate);
+
+    QVERIFY(earlyCandidate.ownedTouches.isEmpty());
+    QVERIFY(lateCandidate.ownedTouches.isEmpty());
+
+    touchRegistry.removeCandidateOwnerForTouch(0, &earlyCandidate);
+
+    QVERIFY(earlyCandidate.ownedTouches.isEmpty());
+    QVERIFY(lateCandidate.ownedTouches.contains(0));
+}
+
+void tst_TouchRegistry::dispatchesTouchEventsToCandidates()
+{
+    TouchRegistry touchRegistry;
+    QQuickItem rootItem;
+
+    DummyCandidate candidate0;
+    candidate0.setObjectName("0");
+    candidate0.setParentItem(&rootItem);
+    candidate0.setX(1);
+    candidate0.setY(2);
+
+    DummyCandidate candidate1;
+    candidate1.setObjectName("1");
+    candidate0.setParentItem(&rootItem);
+    candidate1.setX(3);
+    candidate1.setY(4);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        touchPoints[0].setRect(QRect(10, 10, 0, 0));
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.addCandidateOwnerForTouch(0, &candidate0);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints[0].setRect(QRect(11, 11, 0, 0));
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointPressed);
+        touchPoints[1].setRect(QRect(20, 20, 0, 0));
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    // candidate0 should have received an update on the touch he's interested on.
+    QCOMPARE(candidate0.unownedTouchEvents.count(), 1);
+    // make sure only touch 0 is there (i.e. no mention of touch 1)
+    QCOMPARE(candidate0.unownedTouchEvents[0].touchPoints.count(), 1);
+    QCOMPARE(candidate0.unownedTouchEvents[0].touchPoints[0].id(), 0);
+    // Check that the points local coordinates have been mapped to candidate0's coordinate system.
+    QCOMPARE(candidate0.unownedTouchEvents[0].touchPoints[0].rect().x(), 11 - candidate0.x());
+    QCOMPARE(candidate0.unownedTouchEvents[0].touchPoints[0].rect().y(), 11 - candidate0.y());
+
+    touchRegistry.addCandidateOwnerForTouch(1, &candidate1);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints[0].setRect(QRect(12, 12, 0, 0));
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointMoved);
+        touchPoints[1].setRect(QRect(21, 21, 0, 0));
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    // candidate0 gets updates only for touch 0 and
+    // candidate1 gets updates only for touch 1
+
+    QCOMPARE(candidate0.unownedTouchEvents.count(), 2);
+    QCOMPARE(candidate0.unownedTouchEvents[1].touchPoints.count(), 1);
+    QCOMPARE(candidate0.unownedTouchEvents[1].touchPoints[0].id(), 0);
+
+    QCOMPARE(candidate1.unownedTouchEvents.count(), 1);
+    QCOMPARE(candidate1.unownedTouchEvents[0].touchPoints.count(), 1);
+    QCOMPARE(candidate1.unownedTouchEvents[0].touchPoints[0].id(), 1);
+}
+
+void tst_TouchRegistry::dispatchesTouchEventsToWatchers()
+{
+    TouchRegistry touchRegistry;
+    QQuickItem rootItem;
+
+    DummyCandidate watcher;
+    watcher.setObjectName("watcher");
+    watcher.setParentItem(&rootItem);
+    watcher.setX(1);
+    watcher.setY(2);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        touchPoints[0].setRect(QRect(10, 10, 0, 0));
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.addTouchWatcher(0, &watcher);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints[0].setRect(QRect(11, 11, 0, 0));
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointPressed);
+        touchPoints[1].setRect(QRect(20, 20, 0, 0));
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    // watcher should have received an update on the touch he's interested on.
+    QCOMPARE(watcher.unownedTouchEvents.count(), 1);
+    // make sure only touch 0 is there (i.e. no mention of touch 1)
+    QCOMPARE(watcher.unownedTouchEvents[0].touchPoints.count(), 1);
+    QCOMPARE(watcher.unownedTouchEvents[0].touchPoints[0].id(), 0);
+    // Check that the points local coordinates have been mapped to watcher's coordinate system.
+    QCOMPARE(watcher.unownedTouchEvents[0].touchPoints[0].rect().x(), 11 - watcher.x());
+    QCOMPARE(watcher.unownedTouchEvents[0].touchPoints[0].rect().y(), 11 - watcher.y());
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints[0].setRect(QRect(12, 12, 0, 0));
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointMoved);
+        touchPoints[1].setRect(QRect(21, 21, 0, 0));
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    // watcher gets updates only for touch 0
+
+    QCOMPARE(watcher.unownedTouchEvents.count(), 2);
+    QCOMPARE(watcher.unownedTouchEvents[1].touchPoints.count(), 1);
+    QCOMPARE(watcher.unownedTouchEvents[1].touchPoints[0].id(), 0);
+}
+
+void tst_TouchRegistry::keepDispatchingToWatchersAfterLastCandidateGivesUp()
+{
+    TouchRegistry touchRegistry;
+    DummyCandidate item;
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.addCandidateOwnerForTouch(0, &item);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    QCOMPARE(item.unownedTouchEvents.count(), 1);
+    QCOMPARE(item.unownedTouchEvents[0].touchPoints.count(), 1);
+    QCOMPARE(item.unownedTouchEvents[0].touchPoints[0].id(), 0);
+    item.unownedTouchEvents.clear();
+
+    touchRegistry.addTouchWatcher(1, &item);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointMoved);
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    QCOMPARE(item.unownedTouchEvents.count(), 1);
+    QCOMPARE(item.unownedTouchEvents[0].touchPoints.count(), 2);
+    QVERIFY(item.unownedTouchEvents[0].containsTouchWithId(0));
+    QVERIFY(item.unownedTouchEvents[0].containsTouchWithId(1));
+    item.unownedTouchEvents.clear();
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointReleased);
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointMoved);
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointReleased | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    QCOMPARE(item.unownedTouchEvents.count(), 1);
+    QCOMPARE(item.unownedTouchEvents[0].touchPoints.count(), 2);
+    QVERIFY(item.unownedTouchEvents[0].containsTouchWithId(0));
+    QVERIFY(item.unownedTouchEvents[0].containsTouchWithId(1));
+    item.unownedTouchEvents.clear();
+
+    touchRegistry.removeCandidateOwnerForTouch(0, &item);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[0].setState(Qt::TouchPointReleased);
+        QTouchEvent touchEvent(QEvent::TouchEnd,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointReleased,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    QCOMPARE(item.unownedTouchEvents.count(), 1);
+    QCOMPARE(item.unownedTouchEvents[0].touchPoints.count(), 1);
+    QVERIFY(item.unownedTouchEvents[0].containsTouchWithId(1));
+    item.unownedTouchEvents.clear();
+
+    QVERIFY(touchRegistry.m_touchInfoPool.isEmpty());
+}
+
+/*
+  Regression test that reproduces a problematic scenario that came up during manual testing.
+  It reproduces the interaction between TouchRegistry and a DirectionalDragArea
+ */
+void tst_TouchRegistry::candidatesAndWatchers_1()
+{
+    TouchRegistry touchRegistry;
+    DummyCandidate item;
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.addCandidateOwnerForTouch(0, &item);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.addTouchWatcher(1, &item);
+
+    touchRegistry.removeCandidateOwnerForTouch(0, &item);
+
+    touchRegistry.addTouchWatcher(0, &item);
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointReleased);
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointMoved);
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointReleased | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[0].setState(Qt::TouchPointReleased);
+        QTouchEvent touchEvent(QEvent::TouchEnd,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointReleased,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    QVERIFY(touchRegistry.m_touchInfoPool.isEmpty());
+
+    item.unownedTouchEvents.clear();
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    // Haven't made any subscription for that new touch 0.
+    QCOMPARE(item.unownedTouchEvents.count(), 0);
+}
+
+/*
+  Regression test that reproduces a problematic scenario that came up during manual testing.
+  It reproduces the interaction between TouchRegistry, DirectionalDragArea and a TouchGate.
+ */
+void tst_TouchRegistry::candidatesAndWatchers_2()
+{
+    TouchRegistry touchRegistry;
+
+    DummyCandidate directionalDragArea;
+    directionalDragArea.setObjectName("DirectionalDragArea");
+
+    DummyCandidate touchGate;
+    touchGate.setObjectName("TouchGate");
+
+    // [DDA] 1298 TouchBegin (id:0, state:pressed, scenePos:(147,1023))
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    // [TouchRegistry] addCandidateOwnerForTouch id 0 candidate DirectionalDragArea
+    touchRegistry.addCandidateOwnerForTouch(0, &directionalDragArea);
+
+    // [TouchRegistry] requestTouchOwnership id  0 candidate TouchGate
+    touchRegistry.requestTouchOwnership(0, &touchGate);
+
+    //[TouchRegistry] got TouchUpdate (id:0, state:moved, scenePos:(147,1023)) (id:1, state:pressed, scenePos:(327,792))
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed | Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    // [TouchRegistry] addTouchWatcher id 1 watcher DirectionalDragArea
+    touchRegistry.addTouchWatcher(1, &directionalDragArea);
+
+    // [TouchRegistry] removeCandidateOwnerForTouch id 0 candidate DirectionalDragArea
+    touchRegistry.removeCandidateOwnerForTouch(0, &directionalDragArea);
+
+    //[TouchRegistry] sending TouchWonershipEvent(id = 0  gained) to candidate TouchGate
+    QCOMPARE(touchGate.ownedTouches.count(), 1);
+    QVERIFY(touchGate.ownedTouches.contains(0));
+
+    // [TouchRegistry] addTouchWatcher id 0 watcher DirectionalDragArea
+    touchRegistry.addTouchWatcher(0, &directionalDragArea);
+
+    // [TouchRegistry] requestTouchOwnership id  1 candidate TouchGate
+    touchRegistry.requestTouchOwnership(1, &touchGate);
+
+    //[TouchRegistry] sending TouchWonershipEvent(id = 1  gained) to candidate TouchGate
+    QCOMPARE(touchGate.ownedTouches.count(), 2);
+    QVERIFY(touchGate.ownedTouches.contains(1));
+
+    directionalDragArea.unownedTouchEvents.clear();
+    touchGate.unownedTouchEvents.clear();
+
+    //[TouchRegistry] got TouchUpdate (id:0, state:moved, scenePos:(148,1025)) (id:1, state:moved, scenePos:(329,795))
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointMoved);
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointMoved,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    //vvvvv  DDA Watchers are being ignored from now on vvvvvvv
+
+    QCOMPARE(directionalDragArea.unownedTouchEvents.count(), 1);
+    QCOMPARE(directionalDragArea.unownedTouchEvents.first().touchPoints.count(), 2);
+    QVERIFY(directionalDragArea.unownedTouchEvents.first().containsTouchWithId(0));
+    QVERIFY(directionalDragArea.unownedTouchEvents.first().containsTouchWithId(1));
+
+    QVERIFY(touchGate.unownedTouchEvents.isEmpty());
+
+    directionalDragArea.unownedTouchEvents.clear();
+
+    //[TouchRegistry] got TouchUpdate (id:0, state:moved, scenePos:(151,1029)) (id:1, state:released, scenePos:(329,795))
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointMoved);
+        touchPoints.append(QTouchEvent::TouchPoint(1));
+        touchPoints[1].setState(Qt::TouchPointReleased);
+        QTouchEvent touchEvent(QEvent::TouchUpdate,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointMoved | Qt::TouchPointReleased,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    QCOMPARE(directionalDragArea.unownedTouchEvents.count(), 1);
+    QCOMPARE(directionalDragArea.unownedTouchEvents.first().touchPoints.count(), 2);
+    QVERIFY(directionalDragArea.unownedTouchEvents.first().containsTouchWithId(0));
+    QVERIFY(directionalDragArea.unownedTouchEvents.first().containsTouchWithId(1));
+
+    QVERIFY(touchGate.unownedTouchEvents.isEmpty());
+
+    directionalDragArea.unownedTouchEvents.clear();
+
+    //[TouchRegistry] got TouchEnd (id:0, state:released, scenePos:(157,1034))
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointReleased);
+        QTouchEvent touchEvent(QEvent::TouchEnd,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointReleased,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    QCOMPARE(directionalDragArea.unownedTouchEvents.count(), 1);
+    QCOMPARE(directionalDragArea.unownedTouchEvents.first().touchPoints.count(), 1);
+    QVERIFY(directionalDragArea.unownedTouchEvents.first().containsTouchWithId(0));
+
+    QVERIFY(touchGate.unownedTouchEvents.isEmpty());
+}
+
+void tst_TouchRegistry::rejectingTouchfterItsEnd()
+{
+    TouchRegistry touchRegistry;
+    DummyCandidate earlyCandidate;
+    DummyCandidate lateCandidate;
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    touchRegistry.addCandidateOwnerForTouch(0, &earlyCandidate);
+    touchRegistry.addCandidateOwnerForTouch(0, &lateCandidate);
+
+    QVERIFY(earlyCandidate.ownedTouches.isEmpty());
+    QVERIFY(lateCandidate.ownedTouches.isEmpty());
+
+    touchRegistry.requestTouchOwnership(0, &lateCandidate);
+
+    QVERIFY(earlyCandidate.ownedTouches.isEmpty());
+    QVERIFY(lateCandidate.ownedTouches.isEmpty());
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointReleased);
+        QTouchEvent touchEvent(QEvent::TouchEnd,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry.update(&touchEvent);
+    }
+
+    QVERIFY(earlyCandidate.ownedTouches.isEmpty());
+    QVERIFY(lateCandidate.ownedTouches.isEmpty());
+
+    touchRegistry.removeCandidateOwnerForTouch(0, &earlyCandidate);
+
+    QCOMPARE(lateCandidate.ownedTouches.count(), 1);
+    QCOMPARE(lateCandidate.ownedTouches.contains(0), 1);
+
+    // Check that there's no trace left of touch 0 as we no longer need to keep tabs on it.
+    QVERIFY(!touchRegistry.findTouchInfo(0));
+}
+
+void tst_TouchRegistry::removeOldUndecidedCandidates()
+{
+    FakeTimerFactory *fakeTimerFactory = new FakeTimerFactory;
+    TouchRegistry *touchRegistry = new TouchRegistry(nullptr, fakeTimerFactory);
+
+    DummyCandidate undecidedCandidate;
+    undecidedCandidate.setObjectName("undecided");
+
+    DummyCandidate candidateThatWantsTouch;
+    candidateThatWantsTouch.setObjectName("wantsTouch");
+
+    {
+        QList<QTouchEvent::TouchPoint> touchPoints;
+        touchPoints.append(QTouchEvent::TouchPoint(0));
+        touchPoints[0].setState(Qt::TouchPointPressed);
+        QTouchEvent touchEvent(QEvent::TouchBegin,
+                               0 /* device */,
+                               Qt::NoModifier,
+                               Qt::TouchPointPressed,
+                               touchPoints);
+        touchRegistry->update(&touchEvent);
+    }
+
+    touchRegistry->addCandidateOwnerForTouch(0, &undecidedCandidate);
+
+    touchRegistry->requestTouchOwnership(0, &candidateThatWantsTouch);
+
+    QVERIFY(undecidedCandidate.ownedTouches.isEmpty());
+    QVERIFY(undecidedCandidate.lostTouches.isEmpty());
+    QVERIFY(candidateThatWantsTouch.ownedTouches.isEmpty());
+    QVERIFY(candidateThatWantsTouch.lostTouches.isEmpty());
+
+    // Simulate that enough time has passed to cause the CandidateInactivityTimer to timeout,
+    // making TouchRegistry consider that undecidedCantidate defaulted.
+    fakeTimerFactory->makeRunningTimersTimeout();
+
+    QVERIFY(undecidedCandidate.ownedTouches.isEmpty());
+    QVERIFY(undecidedCandidate.lostTouches.contains(0));
+    QVERIFY(candidateThatWantsTouch.ownedTouches.contains(0));
+    QVERIFY(candidateThatWantsTouch.lostTouches.isEmpty());
+
+    delete touchRegistry;
+}
+
+////////////// TouchMemento //////////
+
+TouchMemento::TouchMemento(const QTouchEvent *touchEvent)
+    : touchPointStates(touchEvent->touchPointStates()), touchPoints(touchEvent->touchPoints())
+{
+}
+
+bool TouchMemento::containsTouchWithId(int touchId) const
+{
+    for (int i = 0; i < touchPoints.count(); ++i) {
+        if (touchPoints.at(i).id() == touchId) {
+            return true;
+        }
+    }
+    return false;
+}
+
+////////////// DummyCandidate //////////
+
+bool DummyCandidate::event(QEvent *e)
+{
+    if (e->type() == TouchOwnershipEvent::touchOwnershipEventType()) {
+        TouchOwnershipEvent *touchOwnershipEvent = static_cast<TouchOwnershipEvent *>(e);
+
+        // NB: Cannot use QVERIFY here because the macro doesn't return a boolean and is
+        //     meant for use only directly in the body of a test function
+        if (ownedTouches.contains(touchOwnershipEvent->touchId()))
+            qFatal("Sent ownership event for a touch that is already owned.");
+        if (lostTouches.contains(touchOwnershipEvent->touchId()))
+            qFatal("Sent ownership event for a touch that has already been lost.");
+
+        if (touchOwnershipEvent->gained()) {
+            ownedTouches.insert(touchOwnershipEvent->touchId());
+        } else {
+            lostTouches.insert(touchOwnershipEvent->touchId());
+        }
+        return true;
+    } else if (e->type() == UnownedTouchEvent::unownedTouchEventType()) {
+        UnownedTouchEvent *unownedTouchEvent = static_cast<UnownedTouchEvent *>(e);
+        unownedTouchEvents.append(TouchMemento(unownedTouchEvent->touchEvent()));
+        return true;
+    } else {
+        return QObject::event(e);
+    }
+}
+
+QTEST_GUILESS_MAIN(tst_TouchRegistry)
+
+#include "tst_TouchRegistry.moc"

=== modified file 'tests/mocks/Unity/Application/CMakeLists.txt'
--- tests/mocks/Unity/Application/CMakeLists.txt	2014-09-29 09:43:18 +0000
+++ tests/mocks/Unity/Application/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -13,6 +13,7 @@
     SessionManager.cpp
     SurfaceManager.cpp
     SessionModel.h
+    UbuntuKeyboardInfo.cpp
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
 )

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-09-04 10:03:10 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2014-10-10 15:05:15 +0000
@@ -40,6 +40,8 @@
     , m_state(state)
     , m_live(true)
     , m_orientation(Qt::PortraitOrientation)
+    , m_touchPressCount(0)
+    , m_touchReleaseCount(0)
     , m_qmlItem(nullptr)
     , m_screenshotUrl(screenshot)
 {
@@ -144,24 +146,12 @@
     }
 }
 
-void MirSurfaceItem::onQmlWantInputMethodChanged()
-{
-    QQmlProperty prop(m_qmlItem, "wantInputMethod");
-    bool wantInputMethod = prop.read().toBool();
-
-    if (hasFocus() && wantInputMethod) {
-        Q_EMIT inputMethodRequested();
-    }
-}
-
 void MirSurfaceItem::onFocusChanged()
 {
-    QQmlProperty prop(m_qmlItem, "wantInputMethod");
-    bool wantInputMethod = prop.read().toBool();
-
-    if (!hasFocus() && wantInputMethod) {
-        Q_EMIT inputMethodDismissed();
-        prop.write(QVariant::fromValue(false));
+    if (!hasFocus()) {
+        // Causes a crash in tst_Shell.qml, inside the mock Unity.Application itself.
+        // Didn't have time to debug yet.
+        //Q_EMIT inputMethodDismissed();
     }
 }
 
@@ -194,12 +184,18 @@
         QQmlProperty screenshotSource(m_qmlItem, "screenshotSource");
         screenshotSource.write(QVariant::fromValue(m_screenshotUrl));
     }
+}
 
-    {
-        QQmlProperty prop(m_qmlItem, "wantInputMethod");
-        if (prop.type() == QQmlProperty::Property) {
-            bool ok = prop.connectNotifySignal(this, SLOT(onQmlWantInputMethodChanged()));
-            if (!ok) qCritical("MirSurfaceItem: failed to connect to wantInputMethod notify signal");
-        }
+void MirSurfaceItem::touchEvent(QTouchEvent * event)
+{
+    if (event->touchPointStates() & Qt::TouchPointPressed) {
+        ++m_touchPressCount;
+        Q_EMIT touchPressCountChanged(m_touchPressCount);
+        // Causes a crash in tst_Shell.qml, inside the mock Unity.Application itself.
+        // Didn't have time to debug yet.
+        // Q_EMIT inputMethodRequested();
+    } else if (event->touchPointStates() & Qt::TouchPointReleased) {
+        ++m_touchReleaseCount;
+        Q_EMIT touchReleaseCountChanged(m_touchReleaseCount);
     }
 }

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2014-09-04 10:03:10 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2014-10-10 15:05:15 +0000
@@ -36,6 +36,11 @@
     Q_PROPERTY(bool live READ live NOTIFY liveChanged)
     Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged DESIGNABLE false)
 
+    Q_PROPERTY(int touchPressCount READ touchPressCount WRITE setTouchPressCount NOTIFY touchPressCountChanged
+                                   DESIGNABLE false)
+    Q_PROPERTY(int touchReleaseCount READ touchReleaseCount WRITE setTouchReleaseCount NOTIFY touchReleaseCountChanged
+                                     DESIGNABLE false)
+
 public:
     enum Type {
         Normal,
@@ -73,6 +78,12 @@
     void setScreenshot(const QUrl& screenshot);
     void setLive(bool live);
 
+    int touchPressCount() const { return m_touchPressCount; }
+    void setTouchPressCount(int count) { m_touchPressCount = count; Q_EMIT touchPressCountChanged(count); }
+
+    int touchReleaseCount() const { return m_touchReleaseCount; }
+    void setTouchReleaseCount(int count) { m_touchReleaseCount = count; Q_EMIT touchReleaseCountChanged(count); }
+
     Q_INVOKABLE void setState(State newState);
     Q_INVOKABLE void release();
 
@@ -81,6 +92,8 @@
     void stateChanged(State);
     void liveChanged(bool live);
     void orientationChanged();
+    void touchPressCountChanged(int count);
+    void touchReleaseCountChanged(int count);
 
     void inputMethodRequested();
     void inputMethodDismissed();
@@ -88,10 +101,12 @@
     // internal mock use
     void deregister();
 
+protected:
+    void touchEvent(QTouchEvent * event) override;
+
 private Q_SLOTS:
     void onFocusChanged();
     void onComponentStatusChanged(QQmlComponent::Status status);
-    void onQmlWantInputMethodChanged();
 
 private:
     explicit MirSurfaceItem(const QString& name,
@@ -110,6 +125,8 @@
     State m_state;
     bool m_live;
     Qt::ScreenOrientation m_orientation;
+    int m_touchPressCount;
+    int m_touchReleaseCount;
 
     QQmlComponent *m_qmlContentComponent;
     QQuickItem *m_qmlItem;

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.qml'
--- tests/mocks/Unity/Application/MirSurfaceItem.qml	2014-09-10 17:10:48 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.qml	2014-10-10 15:05:15 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 
 Rectangle {
-    objectName: "fakeSurfaceQML"
     id: root
     color: "pink"
 
@@ -38,11 +37,6 @@
     property alias screenshotSource: screenshotImage.source
     property int orientation: Qt.PortraitOrientation
 
-    property bool wantInputMethod: false
-
-    property int touchPressCount: 0
-    property int touchReleaseCount: 0
-
     Image {
         id: screenshotImage
         anchors.fill: parent
@@ -58,10 +52,4 @@
         minimumPixelSize: 10; font.pixelSize: 200
         verticalAlignment: Text.AlignVCenter
     }
-
-    MultiPointTouchArea {
-        anchors.fill: parent
-        onPressed: { root.wantInputMethod = true; root.touchPressCount++; }
-        onReleased: { root.touchReleaseCount++; }
-    }
 }

=== added file 'tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp'
--- tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/UbuntuKeyboardInfo.cpp	2014-10-10 15:05:15 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UbuntuKeyboardInfo.h"
+
+UbuntuKeyboardInfo *UbuntuKeyboardInfo::m_instance = nullptr;
+
+UbuntuKeyboardInfo::UbuntuKeyboardInfo(QObject *parent)
+    : QObject(parent),
+    m_x(0),
+    m_y(0),
+    m_width(200),
+    m_height(200)
+{
+}

=== added file 'tests/mocks/Unity/Application/UbuntuKeyboardInfo.h'
--- tests/mocks/Unity/Application/UbuntuKeyboardInfo.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/UbuntuKeyboardInfo.h	2014-10-10 15:05:15 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBUNTU_KEYBOARD_INFO_H
+#define UBUNTU_KEYBOARD_INFO_H
+
+#include <QLocalSocket>
+#include <QTimer>
+
+class UbuntuKeyboardInfo : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(qreal x READ x NOTIFY xChanged)
+    Q_PROPERTY(qreal y READ y NOTIFY yChanged)
+    Q_PROPERTY(qreal width READ width NOTIFY widthChanged)
+    Q_PROPERTY(qreal height READ height NOTIFY heightChanged)
+public:
+    UbuntuKeyboardInfo(QObject *parent = 0);
+    virtual ~UbuntuKeyboardInfo() {}
+    qreal x() const { return m_x; }
+    qreal y() const { return m_y; }
+    qreal width() const { return m_width; }
+    qreal height() const { return m_height; }
+
+    static UbuntuKeyboardInfo *singleton() {
+        if (!m_instance) {
+            m_instance = new UbuntuKeyboardInfo;
+        }
+        return m_instance;
+    }
+
+Q_SIGNALS:
+    void xChanged(qreal x);
+    void yChanged(qreal y);
+    void widthChanged(qreal width);
+    void heightChanged(qreal height);
+
+private:
+    QLocalSocket m_socket;
+    qint32 m_x;
+    qint32 m_y;
+    qint32 m_width;
+    qint32 m_height;
+
+    static UbuntuKeyboardInfo *m_instance;
+};
+
+#endif // UBUNTU_KEYBOARD_INFO_H

=== modified file 'tests/mocks/Unity/Application/plugin.cpp'
--- tests/mocks/Unity/Application/plugin.cpp	2014-09-01 16:07:55 +0000
+++ tests/mocks/Unity/Application/plugin.cpp	2014-10-10 15:05:15 +0000
@@ -24,6 +24,7 @@
 #include "SurfaceManager.h"
 #include "SessionManager.h"
 #include "ApplicationTestInterface.h"
+#include "UbuntuKeyboardInfo.h"
 
 #include <qqml.h>
 #include <QQmlEngine>
@@ -46,6 +47,11 @@
     return SessionManager::singleton();
 }
 
+static QObject* ubuntuKeyboardInfoSingleton(QQmlEngine*, QJSEngine*) {
+    return UbuntuKeyboardInfo::singleton();
+}
+
+
 ApplicationTestInterface* s_appTestInterface = nullptr;
 
 static QObject* applicationTestInterface(QQmlEngine* engine, QJSEngine* scriptEngine) {
@@ -76,6 +82,7 @@
     qmlRegisterSingletonType<SurfaceManager>(uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
     qmlRegisterSingletonType<SessionManager>(uri, 0, 1, "SessionManager", sessionManagerSingleton);
     qmlRegisterSingletonType<ApplicationTestInterface>(uri, 0, 1, "ApplicationTest", applicationTestInterface);
+    qmlRegisterSingletonType<UbuntuKeyboardInfo>(uri, 0, 1, "UbuntuKeyboardInfo", ubuntuKeyboardInfoSingleton);
 
     qRegisterMetaType<MirSurfaceItem::Type>("MirSurfaceItem::Type");
     qRegisterMetaType<MirSurfaceItem::State>("MirSurfaceItem::State");

=== modified file 'tests/plugins/Ubuntu/Gestures/CMakeLists.txt'
--- tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2014-09-01 09:13:08 +0000
+++ tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2014-10-10 15:05:15 +0000
@@ -1,7 +1,13 @@
 include(QmlTest)
 
+# DANGER! DANGER! Using Qt's private API!
+include_directories(
+    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+)
+
 include_directories(
     ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
+    ${CMAKE_SOURCE_DIR}/libs/UbuntuGestures
     ${CMAKE_CURRENT_BINARY_DIR}
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     )
@@ -17,7 +23,7 @@
 macro(add_gesture_ui_test CLASSNAME)
     add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp)
     qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
-    target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)
+    target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml UbuntuGestures)
 
     add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles "")
     add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
@@ -34,10 +40,11 @@
 
     add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp)
     qt5_use_modules(${CLASSNAME}TestExec Test Core)
-    target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)
+    target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml)
 endmacro(add_gesture_test)
 
 add_gesture_ui_test(DirectionalDragArea)
 add_gesture_ui_test(PressedOutsideNotifier)
+add_gesture_ui_test(TouchGate)
 add_gesture_test(Damper)
 add_gesture_test(AxisVelocityCalculator)

=== modified file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2014-02-11 20:21:24 +0000
+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2014-10-10 15:05:15 +0000
@@ -46,6 +46,9 @@
         id: dragArea
         objectName: "hpDragArea"
 
+        // give some room for items to be dynamically stacked right behind him
+        z: 10.0
+
         width: units.gu(5)
 
         direction: Direction.Rightwards

=== added file 'tests/plugins/Ubuntu/Gestures/touchGateExample.qml'
--- tests/plugins/Ubuntu/Gestures/touchGateExample.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/touchGateExample.qml	2014-10-10 15:05:15 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Gestures 0.1
+
+Rectangle {
+    width: 720; height: 720
+
+    TouchGate {
+        anchors.fill: parent
+        objectName: "touchGate"
+    }
+}

=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2014-03-07 10:49:30 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2014-10-10 15:05:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,37 +19,63 @@
 #include <QtQuick/QQuickView>
 #include <QtQml/QQmlEngine>
 #include <QPointer>
+#include <private/qquickmousearea_p.h>
+
+// C++ std lib
+#include <functional>
 
 #include <DirectionalDragArea.h>
+#include <TouchRegistry.h>
 
 #include "GestureTest.h"
 
 using namespace UbuntuGestures;
 
-class FakeTimer : public AbstractTimer
-{
-    Q_OBJECT
-public:
-    FakeTimer(const SharedTimeSource &timeSource, QObject *parent = 0)
-        : UbuntuGestures::AbstractTimer(parent),
+class TouchMemento {
+public:
+    TouchMemento(const QTouchEvent *touchEvent);
+    Qt::TouchPointStates touchPointStates;
+    QList<QTouchEvent::TouchPoint> touchPoints;
+
+    bool containsTouchWithId(int touchId) const;
+};
+
+class DummyItem : public QQuickItem
+{
+    Q_OBJECT
+public:
+    DummyItem(QQuickItem *parent = 0);
+
+    QList<TouchMemento> touchEvents;
+    std::function<void(QTouchEvent*)> touchEventHandler;
+protected:
+    void touchEvent(QTouchEvent *event) override;
+private:
+    static void defaultTouchEventHandler(QTouchEvent *event);
+};
+
+class ComplexFakeTimer : public FakeTimer
+{
+    Q_OBJECT
+public:
+    ComplexFakeTimer(const SharedTimeSource &timeSource, QObject *parent = 0)
+        : FakeTimer(parent),
           m_timeSource(timeSource)
     {}
 
-    int interval() const override { return m_interval; }
-    void setInterval(int msecs) override { m_interval = msecs; }
     void start() override {
         AbstractTimer::start();
-        m_nextTimeoutTime = m_timeSource->msecsSinceReference() + (qint64)m_interval;
+        m_nextTimeoutTime = m_timeSource->msecsSinceReference() + (qint64)interval();
     }
 
     void emitTimeout() {
-        m_nextTimeoutTime += m_interval;
+        m_nextTimeoutTime += interval();
         Q_EMIT timeout();
     }
 
     qint64 nextTimeoutTime() const { return m_nextTimeoutTime; }
+
 private:
-    int m_interval;
     SharedTimeSource m_timeSource;
     qint64 m_nextTimeoutTime;
 };
@@ -62,6 +88,30 @@
     qint64 m_msecsSinceReference;
 };
 
+/*
+    QQuickMouseArea::canceled() signal is not registered in the meta object system.
+    So using a QSignalSpy to track it won't work. Thus the only way to connect to it
+    is using its method address directly.
+ */
+class MouseAreaSpy : public QObject
+{
+    Q_OBJECT
+public:
+    MouseAreaSpy(QQuickMouseArea *mouseArea)
+        : canceledCount(0)
+    {
+        connect(mouseArea, &QQuickMouseArea::canceled,
+                this, &MouseAreaSpy::onMouseAreaCanceled);
+    }
+
+    int canceledCount;
+
+private Q_SLOTS:
+    void onMouseAreaCanceled() {
+        ++canceledCount;
+    }
+};
+
 class tst_DirectionalDragArea: public GestureTest
 {
     Q_OBJECT
@@ -87,10 +137,20 @@
     void sceneDistance();
     void sceneDistance_data();
     void disabledWhileDragging();
+    void oneFingerDownFollowedByLateSecondFingerDown();
+    void givesUpWhenLosesTouch();
+    void threeFingerDrag();
+    void immediateRecognitionWhenConstraintsDisabled();
+    void withdrawTouchOwnershipCandidacyIfDisabledDuringRecognition();
+    void withdrawTouchOwnershipCandidacyIfDisabledDuringRecognition_data();
+    void tappedSignal();
+    void tappedSignal_data();
+    void gettingTouchOwnershipMakesMouseAreaBehindGetCanceled();
 
 private:
-    void passTime(qint64 timeSpan);
-    FakeTimer *fakeTimer;
+    void passTime(qint64 timeSpanMs);
+    TouchRegistry *touchRegistry;
+    ComplexFakeTimer *fakeTimer;
     QSharedPointer<FakeTimeSource> fakeTimeSource;
 };
 
@@ -111,12 +171,19 @@
     QTRY_COMPARE(m_view->width(), (int)m_view->rootObject()->width());
     QTRY_COMPARE(m_view->height(), (int)m_view->rootObject()->height());
 
+    touchRegistry = new TouchRegistry;