Merge lp:~dandrader/unity/phablet_edgeDragGesture into lp:unity/phablet

[Daniel d'Andrada]

New: DirectionalDragArea component

An area that detects axis-aligned single-finger drag gestures.

New: DirectionalDragArea component

An area that detects axis-aligned single-finger drag gestures.

To be used for edge-drag gestures (like bringing in the launcher).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:662
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/865/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/790/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/741/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/745/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/865/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:663
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/866/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/791/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/742/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/746/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/866/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:664
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/869/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/797/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/745/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/749/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/869/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:665
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/871/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/799/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/747/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/751/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/871/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:667
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/872/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/801/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/748/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/752/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/872/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:668
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/873/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/802/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/749/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/753

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/873/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:668
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/874/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/803/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/750/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/754/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/874/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:669
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/875/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/804/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/755/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/875/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:670
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/876/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/805/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/752
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/752/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/756

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/876/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:670
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/888/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/818
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/764
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/764/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/768

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/888/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

* instead of the pair direction, positiveDirection, I'd go for a single enum with 4 values, what do you think?
* we talked yesterday about the possibility to add a time threshold as well (within which the touch must cross the distance threshold), do you think you could add it here or in a later change?
* there seems to be a bunch of things common with the QtWidgets QGestureRecognizer (state names, for example) [1] - do you think it would make sense to converge on the same terminology?
* could you add some newlines to tests/plugins/UbuntuGestures/CMakeLists.txt for readability?

=====

 360 +add_definitions(-DUBUNTUGESTURES_LIBRARY)
 361 +
 362 +add_library(UbuntuGestureQml MODULE ${UbuntuGestureQml_SOURCES})

 749 +class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {

 856 +#if defined(UBUNTUGESTURES_LIBRARY)
 857 +# define UBUNTUGESTURES_EXPORT Q_DECL_EXPORT
 858 +#else
 859 +# define UBUNTUGESTURES_EXPORT Q_DECL_IMPORT
 860 +#endif

 973 + LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures

 982 +target_link_libraries(DirectionalDragAreaTestExec UbuntuGestureQml)

maybe directly use the .cpp in test sources instead? We don't really want it to be a library, do we.

=====

 538 + if (touchPoint->state() == Qt::TouchPointReleased) {

is it not possible here for touchPoint to be invalid? why wouldn't QTouchEvent::touchPoints() be enough here?

=====

I'm wondering if the "pointInside..." calculations couldn't be simplified by using a qreal factor instead of the angle - you'd just need to make sure that:

-d <= Δy <= Δx * f + d

where y is perpendicular to the gesture direction (horizontal positive / left-to-right in that case), d is max deviation, f is the factor; with f = 1 that would mean 45° widening angle; what do you think?

=====

 666 +bool DirectionalDragArea::movingInRightDirection(const QPointF &point)
 667 +{
 668 + if (m_orientation == Horizontal) {
 669 + if (m_positiveDirection) {
 670 + return point.x() >= m_previousPos.x();

shouldn't this take some deviation into account? i.e. if your finger goes slightly back in Recognizing state, won't that mean rejecting the gesture altogether?

=====

 744 + recognition will fail. It will also fail it the drag or flick is too short. E.g. a

→ "...fail if the drag..."

=====

 740 +/*
 741 + An area that detects axis-aligned single-finger drag gestures

could we ask for a little more documentation on the properties?

=====

 755 + // stuff that will be set in stone at some point

as discussed, I do agree we need strong defaults here, but allowing advanced use where those would be modifiable could be possible as well

=====

 768 + bool positiveDirection() const { return m_positiveDirection; }

 773 + qreal maxDeviation() const {return m_maxDeviation;}

 776 + qreal wideningAngle() const {return m_wideningAngle;}

 779 + qreal distanceThreshold() const {return m_distanceThreshold;}

please use spaces after/before curly braces consistently

=====

 764 + enum Orientation { Horizontal = Qt::Horizontal, Vertical = Qt::Vertical };

 812 + enum {

please consider using strongly-typed enums (although I don't think we've c...

review: Needs Fixing

[Michał Sawicz (saviq)]

One more thing:

972 +add_subdirectory(UbuntuGestures)
973
974 === added directory 'tests/plugins/UbuntuGestures'

Please mimic the same directory structure as the source - so 'tests/plugins/Ubuntu/Gestures'

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> hmm... any way to make the example work with a pointer? can we enable pointer
> composition?

I'm afraid we will have to add code that manually synthesizes QTouchEvents out of QMouseEvents as Qt::AA_SynthesizeTouchForUnhandledMouseEvents might not be exactly what we need.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:671
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/911/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/866
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/787
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/787/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1444

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/911/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:672
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/914/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/872
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/790
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/790/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1448

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/914/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:673
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/916/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/874/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/792/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/796/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/916/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:687
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/918/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/876
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/794
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/794/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1451

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/918/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

W dniu 14.05.2013 14:58, Daniel d'Andrada pisze:
>> hmm... any way to make the example work with a pointer? can we enable pointer
>> > composition?
> I'm afraid we will have to add code that manually synthesizes QTouchEvents out of QMouseEvents as Qt::AA_SynthesizeTouchForUnhandledMouseEvents might not be exactly what we need.

Why is that? If I read [1] correctly that should work? Although the
"Unhandled" part might be tricky...

[1]
http://qt-project.org/doc/qt-5.0/qtcore/qt.html#ApplicationAttribute-enum
--
Michał Sawicz <email address hidden>
Canonical Services Ltd.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:688
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/930/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/806
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/806/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1460

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/930/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:691
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/931/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/890/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/807
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/807/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1467

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/931/rebuild

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

> One more thing:
>
> 972 +add_subdirectory(UbuntuGestures)
> 973
> 974 === added directory 'tests/plugins/UbuntuGestures'
>
> Please mimic the same directory structure as the source - so
> 'tests/plugins/Ubuntu/Gestures'

Done.

[Daniel d'Andrada (dandrader)]

> * instead of the pair direction, positiveDirection, I'd go for a single enum
> with 4 values, what do you think?

Done.

> * we talked yesterday about the possibility to add a time threshold as well
> (within which the touch must cross the distance threshold), do you think you
> could add it here or in a later change?

I can add it in a later change.

> * there seems to be a bunch of things common with the QtWidgets
> QGestureRecognizer (state names, for example) [1] - do you think it would make
> sense to converge on the same terminology?

You mean those signals?

    void dragStarted();
    void directionalDragRecognized();
    void dragRejected();
    void dragEnded();

Compared to this enum?

    enum ResultFlag { Ignore, MayBeGesture, TriggerGesture, FinishGesture, CancelGesture, ConsumeEventHint }

Well, they are intented for different audiences (the former for application code and the latter for the gesture fw engine) in a bit different contexts. I preffer the signal naming the way they are, as they look very clear in meaning IMHO. One thing I see could change though is s/dragRejected/dragCancelled

> * could you add some newlines to tests/plugins/UbuntuGestures/CMakeLists.txt
> for readability?

Done.

>
> =====
>
> 360 +add_definitions(-DUBUNTUGESTURES_LIBRARY)
> 361 +
> 362 +add_library(UbuntuGestureQml MODULE ${UbuntuGestureQml_SOURCES})
>
> 749 +class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {
>
> 856 +#if defined(UBUNTUGESTURES_LIBRARY)
> 857 +# define UBUNTUGESTURES_EXPORT Q_DECL_EXPORT
> 858 +#else
> 859 +# define UBUNTUGESTURES_EXPORT Q_DECL_IMPORT
> 860 +#endif
>
> 973 + LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
>
> 982 +target_link_libraries(DirectionalDragAreaTestExec UbuntuGestureQml)
>
> maybe directly use the .cpp in test sources instead? We don't really want it
> to be a library, do we.

Why not? Makes testing simpler. Recompiling the whole plugin in the test directory seems wasteful.

>
> =====
>
> 538 + if (touchPoint->state() == Qt::TouchPointReleased) {
>
> is it not possible here for touchPoint to be invalid?

No. A point has to be released before it disappears from the list of active points.

> why wouldn't QTouchEvent::touchPoints() be enough here?

We are tracking a specific touch point. Further touch points might come in after the gesture is recgonized but we just don't care.

>
> =====
>
> I'm wondering if the "pointInside..." calculations couldn't be simplified by
> using a qreal factor instead of the angle - you'd just need to make sure that:
>
> -d <= Δy <= Δx * f + d
>
> where y is perpendicular to the gesture direction (horizontal positive / left-
> to-right in that case), d is max deviation, f is the factor; with f = 1 that
> would mean 45° widening angle; what do you think?

I think you mean:
Δx >= -d && abs(Δy) <= (Δx * f) + d

Yes, we can skip use of trigonometric functions by using a widening factor parameter instead of a widening angle.
Done.

>
> =====
>
> 666 +bool DirectionalDragArea::movingInRightDirection(const QPointF &point)
> 667 +{
> 668 + if (m_orientation == Horizontal) {
> 669 + if (m_positiveDi...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:692
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/932/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/808
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/808/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1468

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/932/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:694
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/933/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/892
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/809
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/809/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/813
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1469/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/933/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:694
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/934/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/893
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/810
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/810/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1470

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/934/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

W dniu 16.05.2013 01:04, Daniel d'Andrada pisze:
>> * there seems to be a bunch of things common with the QtWidgets
>> QGestureRecognizer (state names, for example) [1] - do you think it would make
>> sense to converge on the same terminology?
>
> You mean those signals?
>
> void dragStarted();
> void directionalDragRecognized();
> void dragRejected();
> void dragEnded();
>
> Compared to this enum?
>
> enum ResultFlag { Ignore, MayBeGesture, TriggerGesture, FinishGesture, CancelGesture, ConsumeEventHint }
>
> Well, they are intented for different audiences (the former for application code and the latter for the gesture fw engine) in a bit different contexts. I preffer the signal naming the way they are, as they look very clear in meaning IMHO. One thing I see could change though is s/dragRejected/dragCancelled

Your call.

>> =====
>>
>> 360 +add_definitions(-DUBUNTUGESTURES_LIBRARY)
>> 361 +
>> 362 +add_library(UbuntuGestureQml MODULE ${UbuntuGestureQml_SOURCES})
>>
>> 749 +class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {
>>
>> 856 +#if defined(UBUNTUGESTURES_LIBRARY)
>> 857 +# define UBUNTUGESTURES_EXPORT Q_DECL_EXPORT
>> 858 +#else
>> 859 +# define UBUNTUGESTURES_EXPORT Q_DECL_IMPORT
>> 860 +#endif
>>
>> 973 + LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
>>
>> 982 +target_link_libraries(DirectionalDragAreaTestExec UbuntuGestureQml)
>>
>> maybe directly use the .cpp in test sources instead? We don't really want it
>> to be a library, do we.
>
> Why not? Makes testing simpler. Recompiling the whole plugin in the test directory seems wasteful.

There's just a lot here that suggests this is meant to be used as a
shared library, which it isn't. But I can live with that. We should
probably simply find a way to use the plugins from C++.

>> 764 + enum Orientation { Horizontal = Qt::Horizontal, Vertical =
>> Qt::Vertical };
>>
>> 812 + enum {
>>
>> please consider using strongly-typed enums (although I don't think we've
>> checked how QML currently deals with passing them to/from QML - so we might
>> need to wait there)
>
> Yeah, I think we might need to wait indeed.

I've used them successfully in [1] - they end up as numbers in QML, so
there's some casting involved, but they seem to work fine.

>> do you have a Nexus 10 to try it out? I'm getting quite some false negatives
>> with the examples
>
> No, I don't. Do you have a Galaxy Nexus to try it out and see if results differ? That's the device I have.
>
> It seems that drags coming from the top, left and right borders are being filtered out by mir as those borders are reserved for the shell and qmlscene is not the shell? Because no input events come at all in those situations. If you start dragging already from withing the window it works.
> Also from the bottom border it always works, I guess it's because the bottom edge is for application's tool bars.

You can stop qml-phone-shell by removing its line from
/etc/phone-services on the device and `sudo restart ubuntu-session`.
You'll get all the input then.

>> also, tapping in the edge area results in the red rectangle to stay on screen
>
> Details, deta...

[Daniel d'Andrada (dandrader)]

> > It seems that drags coming from the top, left and right borders are being
> filtered out by mir as those borders are reserved for the shell and qmlscene
> is not the shell? Because no input events come at all in those situations. If
> you start dragging already from withing the window it works.
> > Also from the bottom border it always works, I guess it's because the bottom
> edge is for application's tool bars.
>
> You can stop qml-phone-shell by removing its line from
> /etc/phone-services on the device and `sudo restart ubuntu-session`.
> You'll get all the input then.
>

qml-phone-shell wasn't running while I was trying out the example/test app on the device.

[Michał Sawicz (saviq)]

1087 + COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.qml" ${CMAKE_CURRENT_BINARY_DIR}

This should use ${qmlFiles}, too.

review: Needs Fixing

[Michał Sawicz (saviq)]

522 +qreal DirectionalDragArea::wideningAngle() const
523 +{
524 + // convert factor (which is in fact a tangent value) to its corresponding
525 + // angle in degrees
526 + return qAtan(m_wideningFactor) * 180.0 / M_PI;
527 +}
528 +
529 +void DirectionalDragArea::setWideningAngle(qreal angle)
530 +{
531 + qreal newFactor = qTan(angle * M_PI / 180.0);
532 +
533 + if (m_wideningFactor != newFactor) {
534 + m_wideningFactor = newFactor;
535 + Q_EMIT wideningAngleChanged(angle);
536 + }
537 +}

Depending on rounding errors, wideningAngle() might return a different value than was set (and emitted).

Shouldn't this be int now that we're doing degrees?

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> 522 +qreal DirectionalDragArea::wideningAngle() const
> 523 +{
> 524 + // convert factor (which is in fact a tangent value) to its
> corresponding
> 525 + // angle in degrees
> 526 + return qAtan(m_wideningFactor) * 180.0 / M_PI;
> 527 +}
> 528 +
> 529 +void DirectionalDragArea::setWideningAngle(qreal angle)
> 530 +{
> 531 + qreal newFactor = qTan(angle * M_PI / 180.0);
> 532 +
> 533 + if (m_wideningFactor != newFactor) {
> 534 + m_wideningFactor = newFactor;
> 535 + Q_EMIT wideningAngleChanged(angle);
> 536 + }
> 537 +}
>
> Depending on rounding errors, wideningAngle() might return a different value
> than was set (and emitted).

Fixed.

> Shouldn't this be int now that we're doing degrees?

No. Nothing stops you from having widening angles such as 9.36 degrees

[Daniel d'Andrada (dandrader)]

> 1087 + COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/*.qml"
> ${CMAKE_CURRENT_BINARY_DIR}
>
> This should use ${qmlFiles}, too.

Done.

[Michał Sawicz (saviq)]

694 + case Upwards:
695 + return dY <= m_maxDeviation && qFabs(dX) <= (m_maxDeviation + dY) * m_wideningFactor + m_maxDeviation;
696 + case Downwards:
697 + return dY >= -m_maxDeviation && qFabs(dX) <= (m_maxDeviation + dY) * m_wideningFactor + m_maxDeviation;
698 + case Leftwards:
699 + return dX <= m_maxDeviation && qFabs(dY) <= (m_maxDeviation + dX) * m_wideningFactor + m_maxDeviation;
700 + default: // Rightwards:
701 + return dX >= -m_maxDeviation && qFabs(dY) <= (m_maxDeviation + dX) * m_wideningFactor + m_maxDeviation;

Why adding maxDeviation before multiplying by the factor?

review: Needs Information

[Michał Sawicz (saviq)]

W dniu 16.05.2013 15:52, Daniel d'Andrada pisze:
> No. Nothing stops you from having widening angles such as 9.36 degrees

But we can ;)

--
Michał Sawicz <email address hidden>
Canonical Services Ltd.

[Michał Sawicz (saviq)]

I'll have a fresh overview look tomorrow morning, but this looks good!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:696
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/946/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/907
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/822
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/822/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/826
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1492

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/946/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

> 694 + case Upwards:
> 695 + return dY <= m_maxDeviation && qFabs(dX) <= (m_maxDeviation + dY) *
> m_wideningFactor + m_maxDeviation;
> 696 + case Downwards:
> 697 + return dY >= -m_maxDeviation && qFabs(dX) <= (m_maxDeviation + dY) *
> m_wideningFactor + m_maxDeviation;
> 698 + case Leftwards:
> 699 + return dX <= m_maxDeviation && qFabs(dY) <= (m_maxDeviation + dX) *
> m_wideningFactor + m_maxDeviation;
> 700 + default: // Rightwards:
> 701 + return dX >= -m_maxDeviation && qFabs(dY) <= (m_maxDeviation + dX) *
> m_wideningFactor + m_maxDeviation;
>
> Why adding maxDeviation before multiplying by the factor?

Because the widening starts from startPos - maxDeviation, not from startPos itself (see doc/DirectionalDragArea.svg)

[Michał Sawicz (saviq)]

 803 +#include <QQuickItem>

1025 +#include <QQmlExtensionPlugin>

1513 +#include <QtTest/QtTest>
1514 +#include <QObject>
1515 +#include <qpa/qwindowsysteminterface.h>
1516 +#include <QQuickView>
1517 +#include <QQmlEngine>

Please use <QtQuick/QQuickItem> etc.

=====

Damper.h should #include <QtCore/QPointF>.

=====

 407 + void setMaxDelta(Type maxDelta) {
 408 + m_maxDelta = maxDelta;
 409 + }

 418 + if (delta > 0 && delta > m_maxDelta) {
 419 + m_value += delta - m_maxDelta;
 420 + } else if (delta < 0 && delta < -m_maxDelta) {
 421 + m_value += delta - m_maxDelta;
 422 + }

The > 0, < 0 seem unnecessary? Although setMaxDelta() should make sure that it's > 0?

=====

 434 +/*
 435 + A point that has its movement dampened.
 436 + */
 437 +class DampedPointF {
 438 +public:
 439 + void setMaxDelta(qreal maxDelta) {
 440 + m_x.setMaxDelta(maxDelta);
 441 + m_y.setMaxDelta(maxDelta);
 442 + }
 443 +
 444 + qreal maxDelta() const { return m_x.maxDelta(); }
 445 +
 446 + void reset(const QPointF &point) {
 447 + m_x.reset(point.x());
 448 + m_y.reset(point.y());
 449 + }
 450 +
 451 + void update(const QPointF &point) {
 452 + m_x.update(point.x());
 453 + m_y.update(point.y());
 454 + }
 455 +
 456 + qreal x() const { return m_x.value(); }
 457 + qreal y() const { return m_y.value(); }
 458 +private:
 459 + Damper<qreal> m_x;
 460 + Damper<qreal> m_y;
 461 +};

I know it's probably minor (square vs. circular dampening area), but shouldn't we use QPointF::operator- and QPointF::manhattanLength here?

=====

 561 + if (m_state == Rejected)
 562 + return 0.0;

Please wrap all blocks in braces.

=====

 633 + if (!pointInsideAllowedArea(touchPos)) {
 634 + setState(Rejected);
 635 + return;
 636 + }
 637 +
 638 + m_previousDampedPos.setX(m_dampedPos.x());
 639 + m_previousDampedPos.setY(m_dampedPos.y());
 640 + m_dampedPos.update(touchPos);
 641 +
 642 + if (!movingInRightDirection()) {
 643 + setState(Rejected);
 644 + return;
 645 + }

 704 +bool DirectionalDragArea::movingInRightDirection() const
 705 +{
 706 + switch (m_direction) {
 707 + case Upwards:
 708 + return m_dampedPos.y() <= m_previousDampedPos.y();
 709 + case Downwards:
 710 + return m_dampedPos.y() >= m_previousDampedPos.y();
 711 + case Leftwards:
 712 + return m_dampedPos.x() <= m_previousDampedPos.x();
 713 + default: // Rightwards:
 714 + return m_dampedPos.x() >= m_previousDampedPos.x();
 715 + }
 716 +}

I would think I should be able to move within maxDeviation from the start point in Recognizing state and that would not cause a rejection. But if I'm reading the above correctly, I'm only really allowed to move within movementDamperMaxDelta from the start position, no?

=====

 851 + Q_PROPERTY(qreal movementDamperMaxDelta
 852 + READ movementDamperMaxDelta
 853 + WRITE setMovementDamperMaxDelta
 854 + NOTIFY movementDamperMaxDeltaChanged)

I'd probably go for ...

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

> 803 +#include <QQuickItem>
>
> 1025 +#include <QQmlExtensionPlugin>
>
> 1513 +#include <QtTest/QtTest>
> 1514 +#include <QObject>
> 1515 +#include <qpa/qwindowsysteminterface.h>
> 1516 +#include <QQuickView>
> 1517 +#include <QQmlEngine>
>
> Please use <QtQuick/QQuickItem> etc.

Done.

>
> =====
>
> Damper.h should #include <QtCore/QPointF>.

Done.

>
> =====
>
> 407 + void setMaxDelta(Type maxDelta) {
> 408 + m_maxDelta = maxDelta;
> 409 + }
>
> 418 + if (delta > 0 && delta > m_maxDelta) {
> 419 + m_value += delta - m_maxDelta;
> 420 + } else if (delta < 0 && delta < -m_maxDelta) {
> 421 + m_value += delta - m_maxDelta;
> 422 + }
>
> The > 0, < 0 seem unnecessary?

No, it's necessary. I do have to distinguish between a negative and a positive delta. Speaking of which, I just spotted a bug in diff line 421. It should be "m_value += delta + m_maxDelta;" instead. Fixed it.

> Although setMaxDelta() should make sure that
> it's > 0?

Yeah, added the check.

>
> =====
>
> 434 +/*
> 435 + A point that has its movement dampened.
> 436 + */
> 437 +class DampedPointF {
> 438 +public:
> 439 + void setMaxDelta(qreal maxDelta) {
> 440 + m_x.setMaxDelta(maxDelta);
> 441 + m_y.setMaxDelta(maxDelta);
> 442 + }
> 443 +
> 444 + qreal maxDelta() const { return m_x.maxDelta(); }
> 445 +
> 446 + void reset(const QPointF &point) {
> 447 + m_x.reset(point.x());
> 448 + m_y.reset(point.y());
> 449 + }
> 450 +
> 451 + void update(const QPointF &point) {
> 452 + m_x.update(point.x());
> 453 + m_y.update(point.y());
> 454 + }
> 455 +
> 456 + qreal x() const { return m_x.value(); }
> 457 + qreal y() const { return m_y.value(); }
> 458 +private:
> 459 + Damper<qreal> m_x;
> 460 + Damper<qreal> m_y;
> 461 +};
>
> I know it's probably minor (square vs. circular dampening area), but shouldn't
> we use QPointF::operator- and QPointF::manhattanLength here?

Using a circular area is computationally more expensive and we're just fine with this less accurate method.

Using a manhattan lenght would result in an area defined by a square rotated by 45 degrees instead of an axis-aligned square as it is now. So, in the end, these two approaches are equivalent (a square area).

>
> =====
>
> 561 + if (m_state == Rejected)
> 562 + return 0.0;
>
> Please wrap all blocks in braces.

Done.

>
> =====
>
> 633 + if (!pointInsideAllowedArea(touchPos)) {
> 634 + setState(Rejected);
> 635 + return;
> 636 + }
> 637 +
> 638 + m_previousDampedPos.setX(m_dampedPos.x());
> 639 + m_previousDampedPos.setY(m_dampedPos.y());
> 640 + m_dampedPos.update(touchPos);
> 641 +
> 642 + if (!movingInRightDirection()) {
> 643 + setState(Rejected);
> 644 + return;
> 645 + }
>
> 704 +bool DirectionalDragArea::movingInRightDirection() const
> 705 +{
> 706 + switch (m_direction) {
> 707 + case Upwards:
> 708 + return m_dampedPos.y() <= m_previousDampedPos.y();
> 709 + case Downwards:
> 710 + return m_dampedPo...

[Daniel d'Andrada (dandrader)]

Ah, and thanks for the thorough reviews. Code is getting better and better!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:704
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/966/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/842
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/842/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/846

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/966/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:704
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/967/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/843
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/843/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1536

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/967/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

W dniu 17.05.2013 20:37, Daniel d'Andrada pisze:
>> I wonder if DirectionalDragArea::state (or status to avoid confusion) should
>> be exposed to QML? Or maybe a "dragging" boolean?
>
> Yeah, we could expose the state variable indeed.
> Done.

818 + // The current state of the directional drag gesture.
819 + Q_PROPERTY(GestureState gestureState READ gestureState NOTIFY
gestureStateChanged)

Could we go with "status" to be consistent with other QML components?

And I would still like a boolean "dragging" more in favor of dragEnded,
dragStarted and dragRecognized signals.

>> Shouldn't dragValue be reset to 0 when going back to WaitingForTouch? Or maybe
>> that's a higher level's responsibility to make sure of that...
>
> No, I think it should stay as it is. It's up to the application to decide what to do once the gesture ends.

731 + default: // Rejected
732 + Q_EMIT dragRejected();
733 + Q_EMIT distanceChanged(distance());

Shouldn't that not emit the distance then? I'm just worried that people
might rely on it to cancel the movement, but then the dragRejected
signal (or draggingChanged(false) when you introduce that property)
should already be enough to say "the gesture is uninteresting, do what
you need to cancel".

>> 1070 + LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
>>
>> This should be set as an ENVIRONMENT property on the test instead.
>
> Why? So you want CMake to pass it as a DEFINE to tst_DirectionalDragArea.cpp during compilation?

No, I mean it should be possible to use set_target_properties() to pass
that environment var to the target, just as we do in add_qml_test() to
set the QPA platform to "minimal".

--
Michał Sawicz <email address hidden>
Canonical Services Ltd.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:704
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/968/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/844
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/844/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/848
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1537

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/968/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

> 818 + // The current state of the directional drag gesture.
> 819 + Q_PROPERTY(GestureState gestureState READ gestureState NOTIFY
> gestureStateChanged)
>
> Could we go with "status" to be consistent with other QML components?

Done.

>
> And I would still like a boolean "dragging" more in favor of dragEnded,
> dragStarted and dragRecognized signals.

Done.

>
> >> Shouldn't dragValue be reset to 0 when going back to WaitingForTouch? Or
> maybe
> >> that's a higher level's responsibility to make sure of that...
> >
> > No, I think it should stay as it is. It's up to the application to decide
> what to do once the gesture ends.
>
> 731 + default: // Rejected
> 732 + Q_EMIT dragRejected();
> 733 + Q_EMIT distanceChanged(distance());
>
> Shouldn't that not emit the distance then? I'm just worried that people
> might rely on it to cancel the movement, but then the dragRejected
> signal (or draggingChanged(false) when you introduce that property)
> should already be enough to say "the gesture is uninteresting, do what
> you need to cancel".

For the sake of consistency with the transition to WaitingForTouch, I made it keep its last valid value while on Rejected state.

>
> >> 1070 + LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
> >>
> >> This should be set as an ENVIRONMENT property on the test instead.
> >
> > Why? So you want CMake to pass it as a DEFINE to tst_DirectionalDragArea.cpp
> during compilation?
>
> No, I mean it should be possible to use set_target_properties() to pass
> that environment var to the target, just as we do in add_qml_test() to
> set the QPA platform to "minimal".

The test for DirectionalDragArea is a custom target (using add_custom_target()) not a proper cmake test (using add_test()). A custom target doesn't have (or use) an ENVIRONMENT property.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:707
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/970/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/846
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/846/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/850
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1543

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/970/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

889 + bool dragging() const { return m_status && (Undecided || Recognized); }

This looks incorrect. Undecided || Recognized is always true (assuming their values are 1 and 2, respectively) so dragging becomes (bool)m_status, which will, only be false in WaitingForTouch status.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:708
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/972/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/939
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/848
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/852
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1547

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/972/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

> 889 + bool dragging() const { return m_status && (Undecided ||
> Recognized); }
>
> This looks incorrect. Undecided || Recognized is always true (assuming their
> values are 1 and 2, respectively) so dragging becomes (bool)m_status, which
> will, only be false in WaitingForTouch status.

Right, they're not flags. Silly mistake. Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:709
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/974/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/850
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/850/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1549

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/974/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/334/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/943
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/268
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1552

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/qml-phone-shell.install'
--- debian/qml-phone-shell.install	2013-05-16 12:02:23 +0000
+++ debian/qml-phone-shell.install	2013-05-20 13:14:26 +0000
@@ -16,3 +16,4 @@
 /usr/share/qml-phone-shell/plugins/LightDM/*
 /usr/share/qml-phone-shell/plugins/Unity/*
 /usr/share/qml-phone-shell/plugins/Utils/*
+/usr/share/qml-phone-shell/plugins/Ubuntu/*
 
=== added file 'doc/DirectionalDragArea.svg'
--- doc/DirectionalDragArea.svg	1970-01-01 00:00:00 +0000
+++ doc/DirectionalDragArea.svg	2013-05-20 13:14:26 +0000
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="644.35803"
+   height="626.32886"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="DirectionalDragArea.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient6853">
+      <stop
+         style="stop-color:#00adff;stop-opacity:1;"
+         offset="0"
+         id="stop6855" />
+      <stop
+         id="stop6861"
+         offset="0.82191783"
+         style="stop-color:#00adff;stop-opacity:0.49803922;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6857" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         id="path4958"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Sstart"
+       style="overflow:visible">
+      <path
+         id="path4955"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible">
+      <path
+         id="path4949"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Sstart-4"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4955-5"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.2,0,0,0.2,1.2,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send-4"
+       style="overflow:visible">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4958-6"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4158879"
+     inkscape:cx="311.5"
+     inkscape:cy="313"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="5"
+     fit-margin-left="5"
+     fit-margin-right="5"
+     fit-margin-bottom="5"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-253.65772,218.97803)">
+    <path
+       style="fill:#00adff;fill-opacity:0.75686275;stroke:none"
+       d="M 259.64804,57.193502 792.57928,-142.14719 793.2573,341.96589 259.60777,174.1189 z"
+       id="path6851"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 890.84952,-178.96696 -631.14314,236.973167 0,116.242063 630.29325,197.35579"
+       id="path4887"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:12.5458998, 12.5458998;stroke-dashoffset:0"
+       d="m 260.83781,59.275793 630.97079,0"
+       id="path4891"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:12.5458998, 12.5458998;stroke-dashoffset:0"
+       d="m 260.99944,172.08634 630.97079,0"
+       id="path4891-7"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8.3639332, 8.3639332;stroke-dashoffset:0"
+       d="m 793.23579,-189.85001 0,591.15535"
+       id="path4911"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4915"
+       sodipodi:cx="259.74588"
+       sodipodi:cy="211.80014"
+       sodipodi:rx="18.943148"
+       sodipodi:ry="18.943148"
+       d="m 277.40703,204.94983 a 18.943148,18.943148 0 0 1 1.28197,6.81725"
+       transform="matrix(2.987119,0,0,2.987119,-515.9493,-573.75675)"
+       sodipodi:open="true"
+       sodipodi:start="5.9131755"
+       sodipodi:end="6.28144" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path4915-5"
+       sodipodi:cx="259.74588"
+       sodipodi:cy="211.80014"
+       sodipodi:rx="18.943148"
+       sodipodi:ry="18.943148"
+       d="m 278.67886,211.17971 a 18.943148,18.943148 0 0 1 -0.8432,6.24205"
+       transform="matrix(2.987119,0,0,2.987119,-517.22894,-458.90756)"
+       sodipodi:start="6.250427"
+       sodipodi:end="6.5844864"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path4935"
+       sodipodi:cx="282.05548"
+       sodipodi:cy="227.78796"
+       sodipodi:rx="1.00761"
+       sodipodi:ry="1.00761"
+       d="m 283.06309,227.78796 a 1.00761,1.00761 0 1 1 -2.01522,0 1.00761,1.00761 0 1 1 2.01522,0 z"
+       transform="matrix(2.987119,0,0,2.987119,-525.77343,-564.0127)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Sstart);marker-end:url(#Arrow1Send)"
+       d="m 317.09757,65.254063 0,42.548767"
+       id="path4937"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#Arrow1Sstart);marker-end:url(#Arrow1Send)"
+       d="m 308.28828,116.39919 -42.54876,0"
+       id="path4937-9"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:29.87118912px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="321.45822"
+       y="92.085648"
+       id="text5787"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5789"
+         x="321.45822"
+         y="92.085648"
+         style="font-size:11.94847584px">maxDeviation</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:29.87118912px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="322.99289"
+       y="48.58828"
+       id="text5787-2"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5789-5"
+         x="322.99289"
+         y="48.58828"
+         style="font-size:11.94847584px">wideningAngle</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path5830"
+       d="m 315.70321,-189.85001 0,225.307165"
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8.3639332, 8.3639332;stroke-dashoffset:0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 315.79005,-204.37393 476.77774,0"
+       id="path5832"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 315.303,-212.93254 0,17.24097"
+       id="path6839"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path6841"
+       d="m 792.91626,-212.93254 0,17.24097"
+       style="fill:none;stroke:#000000;stroke-width:2.09098315;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text6843"
+       y="-188.72206"
+       x="483.68591"
+       style="font-size:29.87118912px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       xml:space="preserve"><tspan
+         style="font-size:11.94847584px"
+         y="-188.72206"
+         x="483.68591"
+         id="tspan6845"
+         sodipodi:role="line">distanceThreshold</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text6847"
+       y="121.95684"
+       x="321.45822"
+       style="font-size:29.87118912px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       xml:space="preserve"><tspan
+         style="font-size:11.94847584px"
+         y="121.95684"
+         x="321.45822"
+         id="tspan6849"
+         sodipodi:role="line">Position of touch press</tspan></text>
+    <rect
+       style="fill:#00adff;fill-opacity:0.75686275;stroke:none"
+       id="rect6863"
+       width="35.257538"
+       height="35.935566"
+       x="295.58365"
+       y="318.91293" />
+    <text
+       xml:space="preserve"
+       style="font-size:29.87118912px;font-style:normal;font-weight:bold;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+       x="335.01886"
+       y="340.96045"
+       id="text6865"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan6867"
+         x="335.01886"
+         y="340.96045"
+         style="font-size:11.94847584px">Valid area for touch position during recognition</tspan></text>
+  </g>
+</svg>
 
=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2013-04-19 15:06:41 +0000
+++ plugins/CMakeLists.txt	2013-05-20 13:14:26 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(Ubuntu)
 add_subdirectory(Utils)
 add_subdirectory(Unity)
 add_subdirectory(HudClient)
 
=== added directory 'plugins/Ubuntu'
=== added file 'plugins/Ubuntu/CMakeLists.txt'
--- plugins/Ubuntu/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/CMakeLists.txt	2013-05-20 13:14:26 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(Gestures)
 
=== added directory 'plugins/Ubuntu/Gestures'
=== added file 'plugins/Ubuntu/Gestures/CMakeLists.txt'
--- plugins/Ubuntu/Gestures/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/CMakeLists.txt	2013-05-20 13:14:26 +0000
@@ -0,0 +1,30 @@
+set(CMAKE_AUTOMOC ON)
+
+include(FindPkgConfig)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Quick REQUIRED)
+
+set(UbuntuGestureQml_SOURCES
+    plugin.cpp
+    DirectionalDragArea.cpp
+)
+
+add_definitions(-DUBUNTUGESTURES_LIBRARY)
+
+add_library(UbuntuGestureQml MODULE ${UbuntuGestureQml_SOURCES})
+
+qt5_use_modules(UbuntuGestureQml Core Quick)
+
+# copy files into build directory for shadow builds
+add_custom_target(UbuntuGestureQmlDirFile ALL
+    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS qmldir
+)
+
+install(TARGETS UbuntuGestureQml
+    DESTINATION ${SHELL_APP_DIR}/plugins/Ubuntu/Gestures
+    )
+
+install(FILES qmldir
+    DESTINATION ${SHELL_APP_DIR}/plugins/Ubuntu/Gestures
+    )
 
=== added file 'plugins/Ubuntu/Gestures/Damper.h'
--- plugins/Ubuntu/Gestures/Damper.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/Damper.h	2013-05-20 13:14:26 +0000
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2013 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_GESTURES_DAMPER_H
+#define UBUNTU_GESTURES_DAMPER_H
+
+#include <QtCore/QPointF>
+
+/*
+  Decreases the oscillations of a value along an axis.
+ */
+template <class Type> class Damper {
+public:
+    // Maximum delta between the raw value and its dampened counterpart.
+    void setMaxDelta(Type maxDelta) {
+        if (maxDelta < 0) qFatal("Damper::maxDelta must be a positive number.");
+        m_maxDelta = maxDelta;
+    }
+    Type maxDelta() const { return m_maxDelta; }
+
+    void reset(Type value) {
+        m_value = value;
+    }
+
+    Type update(Type value) {
+        Type delta = value - m_value;
+        if (delta > 0 && delta > m_maxDelta) {
+            m_value += delta - m_maxDelta;
+        } else if (delta < 0 && delta < -m_maxDelta) {
+            m_value += delta + m_maxDelta;
+        }
+
+        return m_value;
+    }
+
+    Type value() const { return m_value; }
+
+private:
+    Type m_value;
+    Type m_maxDelta;
+};
+
+/*
+    A point that has its movement dampened.
+ */
+class DampedPointF {
+public:
+    void setMaxDelta(qreal maxDelta) {
+        m_x.setMaxDelta(maxDelta);
+        m_y.setMaxDelta(maxDelta);
+    }
+
+    qreal maxDelta() const { return m_x.maxDelta(); }
+
+    void reset(const QPointF &point) {
+        m_x.reset(point.x());
+        m_y.reset(point.y());
+    }
+
+    void update(const QPointF &point) {
+        m_x.update(point.x());
+        m_y.update(point.y());
+    }
+
+    qreal x() const { return m_x.value(); }
+    qreal y() const { return m_y.value(); }
+private:
+    Damper<qreal> m_x;
+    Damper<qreal> m_y;
+};
+
+#endif // UBUNTU_GESTURES_DAMPER_H
 
=== added file 'plugins/Ubuntu/Gestures/DirectionalDragArea.cpp'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.cpp	2013-05-20 13:14:26 +0000
@@ -0,0 +1,292 @@
+/*
+ * Copyright (C) 2013 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 "DirectionalDragArea.h"
+
+#include <QtCore/qmath.h>
+
+DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_status(WaitingForTouch)
+    , m_touchId(-1)
+    , m_direction(DirectionalDragArea::Rightwards)
+    , m_wideningAngle(0)
+    , m_wideningFactor(0)
+    , m_distanceThreshold(0)
+{
+}
+
+DirectionalDragArea::Direction DirectionalDragArea::direction() const
+{
+    return m_direction;
+}
+
+void DirectionalDragArea::setDirection(DirectionalDragArea::Direction direction)
+{
+    if (direction != m_direction) {
+        m_direction = direction;
+        Q_EMIT directionChanged(m_direction);
+    }
+}
+
+void DirectionalDragArea::setMaxDeviation(qreal value)
+{
+    if (m_dampedPos.maxDelta() != value) {
+        m_dampedPos.setMaxDelta(value);
+        Q_EMIT maxDeviationChanged(value);
+    }
+}
+
+qreal DirectionalDragArea::wideningAngle() const
+{
+    return m_wideningAngle;
+}
+
+void DirectionalDragArea::setWideningAngle(qreal angle)
+{
+    if (angle == m_wideningAngle)
+        return;
+
+    m_wideningAngle = angle;
+    m_wideningFactor = qTan(angle * M_PI / 180.0);
+    Q_EMIT wideningAngleChanged(angle);
+}
+
+void DirectionalDragArea::setDistanceThreshold(qreal value)
+{
+    if (m_distanceThreshold != value) {
+        m_distanceThreshold = value;
+        Q_EMIT distanceThresholdChanged(value);
+    }
+}
+
+qreal DirectionalDragArea::distance() const
+{
+    if (directionIsHorizontal()) {
+        return m_previousPos.x() - m_startPos.x();
+    } else {
+        return m_previousPos.y() - m_startPos.y();
+    }
+}
+
+qreal DirectionalDragArea::touchX() const
+{
+    return m_previousPos.x();
+}
+
+qreal DirectionalDragArea::touchY() const
+{
+    return m_previousPos.y();
+}
+
+void DirectionalDragArea::touchEvent(QTouchEvent *event)
+{
+    if (!isEnabled() || !isVisible()) {
+        QQuickItem::touchEvent(event);
+        return;
+    }
+
+    switch (m_status) {
+        case WaitingForTouch:
+            touchEvent_absent(event);
+            break;
+        case Undecided:
+            touchEvent_undecided(event);
+            break;
+        case Recognized:
+            touchEvent_recognized(event);
+            break;
+        default: // Rejected
+            touchEvent_rejected(event);
+            break;
+    }
+}
+
+void DirectionalDragArea::touchEvent_absent(QTouchEvent *event)
+{
+    if ((event->touchPointStates() && (Qt::TouchPointPressed || Qt::TouchPointMoved))
+            && event->touchPoints().count() == 1) {
+        m_startPos = event->touchPoints()[0].pos();
+        m_touchId = event->touchPoints()[0].id();
+        m_dampedPos.reset(m_startPos);
+        setStatus(Undecided);
+        setPreviousPos(m_startPos);
+    }
+}
+
+void DirectionalDragArea::touchEvent_undecided(QTouchEvent *event)
+{
+    const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);
+    const QPointF &touchPos = touchPoint->pos();
+
+    if (touchPoint->state() == Qt::TouchPointReleased) {
+        // touch has ended before recognition concluded
+        setStatus(WaitingForTouch);
+        return;
+    }
+
+    if (event->touchPointStates().testFlag(Qt::TouchPointPressed)
+            || event->touchPoints().count() > 1) {
+        // multi-finger drags are not accepted
+        setStatus(Rejected);
+        return;
+    }
+
+    m_previousDampedPos.setX(m_dampedPos.x());
+    m_previousDampedPos.setY(m_dampedPos.y());
+    m_dampedPos.update(touchPos);
+
+    if (!pointInsideAllowedArea()) {
+        setStatus(Rejected);
+        return;
+    }
+
+    if (!movingInRightDirection()) {
+        setStatus(Rejected);
+        return;
+    }
+
+    setPreviousPos(touchPos);
+
+    if (movedFarEnough(touchPos)) {
+        setStatus(Recognized);
+    }
+}
+
+void DirectionalDragArea::touchEvent_recognized(QTouchEvent *event)
+{
+    const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);
+
+    setPreviousPos(touchPoint->pos());
+
+    if (touchPoint->state() == Qt::TouchPointReleased) {
+        setStatus(WaitingForTouch);
+    }
+}
+
+void DirectionalDragArea::touchEvent_rejected(QTouchEvent *event)
+{
+    const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);
+
+    if (!touchPoint || touchPoint->state() == Qt::TouchPointReleased) {
+        setStatus(WaitingForTouch);
+    }
+}
+
+const QTouchEvent::TouchPoint *DirectionalDragArea::fetchTargetTouchPoint(QTouchEvent *event)
+{
+    const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();
+    const QTouchEvent::TouchPoint *touchPoint = 0;
+    for (int i = 0; i < touchPoints.size(); ++i) {
+        if (touchPoints.at(i).id() == m_touchId) {
+            touchPoint = &touchPoints.at(i);
+            break;
+        }
+    }
+    return touchPoint;
+}
+
+bool DirectionalDragArea::pointInsideAllowedArea() const
+{
+    qreal dX = m_dampedPos.x() - m_startPos.x();
+    qreal dY = m_dampedPos.y() - m_startPos.y();
+
+    switch (m_direction) {
+        case Upwards:
+            return dY <= 0 && qFabs(dX) <= qFabs(dY) * m_wideningFactor;
+        case Downwards:
+            return dY >= 0 && qFabs(dX) <= dY * m_wideningFactor;
+        case Leftwards:
+            return dX <= 0  && qFabs(dY) <= qFabs(dX) * m_wideningFactor;
+        default: // Rightwards:
+            return dX >= 0 && qFabs(dY) <= dX * m_wideningFactor;
+    }
+}
+
+bool DirectionalDragArea::movingInRightDirection() const
+{
+    switch (m_direction) {
+        case Upwards:
+            return m_dampedPos.y() <= m_previousDampedPos.y();
+        case Downwards:
+            return m_dampedPos.y() >= m_previousDampedPos.y();
+        case Leftwards:
+            return m_dampedPos.x() <= m_previousDampedPos.x();
+        default: // Rightwards:
+            return m_dampedPos.x() >= m_previousDampedPos.x();
+    }
+}
+
+bool DirectionalDragArea::movedFarEnough(const QPointF &point) const
+{
+    if (directionIsHorizontal())
+        return qFabs(point.x() - m_startPos.x()) > m_distanceThreshold;
+    else
+        return qFabs(point.y() - m_startPos.y()) > m_distanceThreshold;
+}
+
+void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)
+{
+    if (newStatus == m_status)
+        return;
+
+    m_status = newStatus;
+    Q_EMIT statusChanged(m_status);
+
+    switch (newStatus) {
+        case WaitingForTouch:
+            Q_EMIT draggingChanged(false);
+            break;
+        case Undecided:
+            Q_EMIT draggingChanged(true);
+            break;
+        default: // Rejected
+            // no-op
+            break;
+    }
+}
+
+void DirectionalDragArea::setPreviousPos(QPointF point)
+{
+    Q_ASSERT(m_status != Rejected);
+
+    bool xChanged = m_previousPos.x() != point.x();
+    bool yChanged = m_previousPos.y() != point.y();
+
+    m_previousPos = point;
+
+    if (xChanged) {
+        Q_EMIT touchXChanged(point.x());
+        if (directionIsHorizontal())
+            Q_EMIT distanceChanged(distance());
+    }
+
+    if (yChanged) {
+        Q_EMIT touchYChanged(point.y());
+        if (directionIsVertical())
+            Q_EMIT distanceChanged(distance());
+    }
+}
+
+bool DirectionalDragArea::directionIsHorizontal() const
+{
+    return m_direction == Leftwards || m_direction == Rightwards;
+}
+
+bool DirectionalDragArea::directionIsVertical() const
+{
+    return m_direction == Upwards || m_direction == Downwards;
+}
 
=== added file 'plugins/Ubuntu/Gestures/DirectionalDragArea.h'
--- plugins/Ubuntu/Gestures/DirectionalDragArea.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/DirectionalDragArea.h	2013-05-20 13:14:26 +0000
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2013 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 DIRECTIONAL_DRAG_AREA_H
+#define DIRECTIONAL_DRAG_AREA_H
+
+#include <QtQuick/QQuickItem>
+#include "UbuntuGesturesGlobal.h"
+#include "Damper.h"
+
+/*
+ An area that detects axis-aligned single-finger drag gestures
+
+ If a drag deviates too much from the components' direction recognition will
+ fail. It will also fail if the drag or flick is too short. E.g. a noisy or
+ fidgety click
+
+ See doc/DirectionalDragArea.svg
+ */
+class UBUNTUGESTURES_EXPORT DirectionalDragArea : public QQuickItem {
+    Q_OBJECT
+
+    // The direction in which the gesture should move in order to be recognized.
+    Q_PROPERTY(Direction direction READ direction WRITE setDirection NOTIFY directionChanged)
+
+    // The distance travelled by the finger along the axis specified by
+    // DirectionalDragArea's direction.
+    Q_PROPERTY(qreal distance READ distance NOTIFY distanceChanged)
+
+    // Position of the touch point performing the drag.
+    Q_PROPERTY(qreal touchX READ touchX NOTIFY touchXChanged)
+    Q_PROPERTY(qreal touchY READ touchY NOTIFY touchYChanged)
+
+    // The current status of the directional drag gesture area.
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+
+    // Whether a drag gesture is taking place (regardless of whether it's a correct
+    // single-finger directional drag or not)
+    Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)
+
+    /////
+    // stuff that will be set in stone at some point
+
+    // How far the touch point can move away from its expected position before
+    // it causes a rejection in the gesture recognition. This is to compensate
+    // for both noise in the touch input signal and for the natural irregularities
+    // in the finger movement.
+    // Proper value is likely device-specific.
+    Q_PROPERTY(qreal maxDeviation READ maxDeviation WRITE setMaxDeviation NOTIFY maxDeviationChanged)
+
+    // Widening angle, in degrees
+    // It's roughly the maximum angle a touch point can make relative to the
+    // axis defined by the compoment's direction for it to be recognized as a
+    // directional drag.
+    Q_PROPERTY(qreal wideningAngle READ wideningAngle WRITE setWideningAngle
+               NOTIFY wideningAngleChanged)
+
+    // How far a touch point has to move from its initial position in order for
+    // it to be recognized as a directional drag.
+    Q_PROPERTY(qreal distanceThreshold READ distanceThreshold WRITE setDistanceThreshold
+               NOTIFY distanceThresholdChanged)
+
+    //
+    /////
+
+    Q_ENUMS(Direction)
+    Q_ENUMS(Status)
+public:
+    DirectionalDragArea(QQuickItem *parent = 0);
+
+    enum Direction { Rightwards, // Along the positive direction of the X axis
+                     Leftwards, // Along the negative direction of the X axis
+                     Downwards, // Along the positive direction of the Y axis
+                     Upwards }; // Along the negative direction of the Y axis
+    Direction direction() const;
+    void setDirection(Direction);
+
+    // Describes the state of the directional drag gesture.
+    enum Status {
+        // There's no touch point over this area.
+        WaitingForTouch,
+
+        // A touch point has landed on this area but it's not know yet whether it is
+        // performing a drag in the correct direction.
+        Undecided, //Recognizing,
+
+        // There's a touch point in this area and it performed a drag in the correct
+        // direction.
+        //
+        // Once recognized, the gesture state will move back to Absent only once
+        // that touch point ends. The gesture will remain in the Recognized state even if
+        // the touch point starts moving in other directions or halts.
+        Recognized,
+
+        // A gesture was performed but it wasn't a single-touch drag in the correct
+        // direction.
+        // It will remain in this state until there are no more touch points over this
+        // area, at which point it will move to Absent state.
+        Rejected
+    };
+    Status status() const { return m_status; }
+
+    qreal distance() const;
+
+    qreal touchX() const;
+    qreal touchY() const;
+
+    bool dragging() const { return (m_status == Undecided) || (m_status == Recognized); }
+
+    qreal maxDeviation() const { return m_dampedPos.maxDelta(); }
+    void setMaxDeviation(qreal value);
+
+    qreal wideningAngle() const;
+    void setWideningAngle(qreal value);
+
+    qreal distanceThreshold() const { return m_distanceThreshold; }
+    void setDistanceThreshold(qreal value);
+
+Q_SIGNALS:
+    void directionChanged(Direction direction);
+    void statusChanged(Status value);
+    void draggingChanged(bool value);
+    void distanceChanged(qreal value);
+    void maxDeviationChanged(qreal value);
+    void wideningAngleChanged(qreal value);
+    void distanceThresholdChanged(qreal value);
+    void touchXChanged(qreal value);
+    void touchYChanged(qreal value);
+
+protected:
+    virtual void touchEvent(QTouchEvent *event);
+
+private:
+    void touchEvent_absent(QTouchEvent *event);
+    void touchEvent_undecided(QTouchEvent *event);
+    void touchEvent_recognized(QTouchEvent *event);
+    void touchEvent_rejected(QTouchEvent *event);
+    bool pointInsideAllowedArea() const;
+    bool movingInRightDirection() const;
+    bool movedFarEnough(const QPointF &point) const;
+    const QTouchEvent::TouchPoint *fetchTargetTouchPoint(QTouchEvent *event);
+    void setStatus(Status newStatus);
+    void setPreviousPos(QPointF point);
+
+    // convenience functions
+    bool directionIsHorizontal() const;
+    bool directionIsVertical() const;
+
+    Status m_status;
+
+    QPointF m_startPos;
+    QPointF m_previousPos;
+    int m_touchId;
+
+    // A movement damper is used in some of the gesture recognition calculations
+    // to get rid of noise or small oscillations in the touch position.
+    DampedPointF m_dampedPos;
+    QPointF m_previousDampedPos;
+
+    Direction m_direction;
+    qreal m_wideningAngle; // in degrees
+    qreal m_wideningFactor; // it's tan(degreesToRadian(m_wideningAngle))
+    qreal m_distanceThreshold;
+};
+
+#endif // DIRECTIONAL_DRAG_AREA_H
 
=== added file 'plugins/Ubuntu/Gestures/UbuntuGesturesGlobal.h'
--- plugins/Ubuntu/Gestures/UbuntuGesturesGlobal.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/UbuntuGesturesGlobal.h	2013-05-20 13:14:26 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2013 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 'plugins/Ubuntu/Gestures/plugin.cpp'
--- plugins/Ubuntu/Gestures/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/plugin.cpp	2013-05-20 13:14:26 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2013 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 "plugin.h"
+#include "DirectionalDragArea.h"
+
+#include <qqml.h>
+
+void UbuntuGestureQmlPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<DirectionalDragArea>(uri, 0, 1, "DirectionalDragArea");
+}
 
=== added file 'plugins/Ubuntu/Gestures/plugin.h'
--- plugins/Ubuntu/Gestures/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/plugin.h	2013-05-20 13:14:26 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2013 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 PLUGIN_H
+#define PLUGIN_H
+
+#include <QtQml/QQmlExtensionPlugin>
+
+class UbuntuGestureQmlPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+public:
+    void registerTypes(const char *uri);
+};
+
+
+#endif
 
=== added file 'plugins/Ubuntu/Gestures/qmldir'
--- plugins/Ubuntu/Gestures/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Ubuntu/Gestures/qmldir	2013-05-20 13:14:26 +0000
@@ -0,0 +1,2 @@
+module Ubuntu.Gestures
+plugin UbuntuGestureQml
 
=== modified file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt	2013-04-16 14:22:23 +0000
+++ tests/plugins/CMakeLists.txt	2013-05-20 13:14:26 +0000
@@ -1,1 +1,2 @@
 add_subdirectory(Utils)
+add_subdirectory(Ubuntu)
 
=== added directory 'tests/plugins/Ubuntu'
=== added file 'tests/plugins/Ubuntu/CMakeLists.txt'
--- tests/plugins/Ubuntu/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/CMakeLists.txt	2013-05-20 13:14:26 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(Gestures)
 
=== added directory 'tests/plugins/Ubuntu/Gestures'
=== added file 'tests/plugins/Ubuntu/Gestures/CMakeLists.txt'
--- tests/plugins/Ubuntu/Gestures/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2013-05-20 13:14:26 +0000
@@ -0,0 +1,38 @@
+########## tst_DirectionalDragArea
+
+include_directories(
+    ${CMAKE_SOURCE_DIR}/plugins/Ubuntu/Gestures
+    ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+set(testCommand
+      LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
+      ${CMAKE_CURRENT_BINARY_DIR}/DirectionalDragAreaTestExec
+      -o ${CMAKE_BINARY_DIR}/DirectionalDragAreaTest.xml,xunitxml
+      -o -,txt)
+
+add_custom_target(DirectionalDragAreaTest ${testCommand})
+add_dependencies(qmluitests DirectionalDragAreaTest)
+add_dependencies(DirectionalDragAreaTest DirectionalDragAreaTestExec UbutunGesturesTestQmlFiles)
+
+add_executable(DirectionalDragAreaTestExec tst_DirectionalDragArea.cpp)
+qt5_use_modules(DirectionalDragAreaTestExec Test Core Qml Gui Quick)
+target_link_libraries(DirectionalDragAreaTestExec UbuntuGestureQml)
+
+add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
+
+file(GLOB qmlFiles *.qml)
+add_custom_target(UbuntuGesturesTestQmlFiles ALL
+    COMMAND cp ${qmlFiles} ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${qmlFiles}
+)
+
+########## tst_Damper
+
+set(damperTestCommand
+    DamperTestExec -o ${CMAKE_BINARY_DIR}/DamperTest.xml,xunitxml -o -,txt)
+
+add_test(NAME DamperTest COMMAND ${damperTestCommand})
+
+add_executable(DamperTestExec tst_Damper.cpp)
+qt5_use_modules(DamperTestExec Test Core)
 
=== added file 'tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2013-05-20 13:14:26 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2013 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
+import Ubuntu.Components 0.1
+
+Item {
+
+    function reset() { launcher.y = -launcher.height }
+
+    Rectangle {
+        id: launcher
+        color: "blue"
+        width: parent.width
+        height: units.gu(15)
+        x: 0
+        y: followDragArea()
+
+        function followDragArea() {
+            if (dragArea.status === DirectionalDragArea.Rejected)
+                return -height
+            else
+                return dragArea.distance < height ? -height + dragArea.distance : 0
+        }
+    }
+
+    Rectangle {
+        id: dragAreaRect
+        color: "yellow"
+        opacity: 0.0
+        anchors.fill: dragArea
+    }
+
+    DirectionalDragArea {
+        id: dragArea
+        objectName: "vpDragArea"
+
+        height: units.gu(5)
+
+        direction: DirectionalDragArea.Downwards
+        maxDeviation: units.gu(2)
+        wideningAngle: 10
+        distanceThreshold: units.gu(4)
+
+        onStatusChanged: {
+            switch (status) {
+                case DirectionalDragArea.WaitingForTouch:
+                    dragAreaRect.opacity = 0.0
+                    break;
+                case DirectionalDragArea.Undecided:
+                    dragAreaRect.color = "yellow"
+                    dragAreaRect.opacity = 0.3
+                    launcher.y = Qt.binding(launcher.followDragArea)
+                    break;
+                case DirectionalDragArea.Recognized:
+                    dragAreaRect.color = "green"
+                    dragAreaRect.opacity = 0.5
+                    break;
+                default: //case DirectionalDragArea.Rejected:
+                    dragAreaRect.color = "red"
+                    dragAreaRect.opacity = 0.5
+                    launcher.y = -launcher.height
+                    break;
+            }
+        }
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+    }
+}
 
=== added file 'tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2013-05-20 13:14:26 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2013 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
+import Ubuntu.Components 0.1
+
+Item {
+    id: root
+
+    function reset() { launcher.x = root.width }
+
+    Rectangle {
+        id: launcher
+        color: "blue"
+        width: units.gu(15)
+        height: parent.height
+        x: root.width
+        y: 0
+
+        function followDragArea() {
+            if (dragArea.status === DirectionalDragArea.Rejected)
+                return root.width
+            else
+                return dragArea.distance > -width ?
+                            root.width + dragArea.distance
+                        :
+                            root.width - width
+        }
+    }
+
+    Rectangle {
+        id: dragAreaRect
+        opacity: 0.0
+        anchors.fill: dragArea
+    }
+
+    DirectionalDragArea {
+        id: dragArea
+        objectName: "hnDragArea"
+
+        width: units.gu(5)
+
+        direction: DirectionalDragArea.Leftwards
+        maxDeviation: units.gu(2)
+        wideningAngle: 10
+        distanceThreshold: units.gu(4)
+
+        onStatusChanged: {
+            switch (status) {
+                case DirectionalDragArea.WaitingForTouch:
+                    dragAreaRect.opacity = 0.0
+                    break;
+                case DirectionalDragArea.Undecided:
+                    dragAreaRect.color = "yellow"
+                    dragAreaRect.opacity = 0.3
+                    launcher.x = Qt.binding(launcher.followDragArea)
+                    break;
+                case DirectionalDragArea.Recognized:
+                    dragAreaRect.color = "green"
+                    dragAreaRect.opacity = 0.5
+                    break;
+                default: //case DirectionalDragArea.Rejected:
+                    dragAreaRect.color = "red"
+                    dragAreaRect.opacity = 0.5
+                    launcher.x = -launcher.height
+                    break;
+            }
+        }
+
+        anchors {
+            right: parent.right
+            top: parent.top
+            bottom: parent.bottom
+        }
+    }
+}
 
=== added file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2013-05-20 13:14:26 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2013 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
+import Ubuntu.Components 0.1
+
+Item {
+
+    function reset() { launcher.x = -launcher.width }
+
+    Rectangle {
+        id: launcher
+        color: "blue"
+        width: units.gu(15)
+        height: parent.height
+        x: followDragArea()
+        y: 0
+
+        function followDragArea() {
+            if (dragArea.status === DirectionalDragArea.Rejected)
+                return -width
+            else
+                return dragArea.distance < width ? -width + dragArea.distance : 0
+        }
+    }
+
+    Rectangle {
+        id: dragAreaRect
+        opacity: 0.0
+        anchors.fill: dragArea
+    }
+
+    DirectionalDragArea {
+        id: dragArea
+        objectName: "hpDragArea"
+
+        width: units.gu(5)
+
+        direction: DirectionalDragArea.Rightwards
+        maxDeviation: units.gu(2)
+        wideningAngle: 10
+        distanceThreshold: units.gu(4)
+
+        onStatusChanged: {
+            switch (status) {
+                case DirectionalDragArea.WaitingForTouch:
+                    dragAreaRect.opacity = 0.0
+                    break;
+                case DirectionalDragArea.Undecided:
+                    dragAreaRect.color = "yellow"
+                    dragAreaRect.opacity = 0.3
+                    launcher.x = Qt.binding(launcher.followDragArea)
+                    break;
+                case DirectionalDragArea.Recognized:
+                    dragAreaRect.color = "green"
+                    dragAreaRect.opacity = 0.5
+                    break;
+                default: //case DirectionalDragArea.Rejected:
+                    dragAreaRect.color = "red"
+                    dragAreaRect.opacity = 0.5
+                    launcher.x = -launcher.height
+                    break;
+            }
+        }
+
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
+    }
+}
 
=== added file 'tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml'
--- tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2013-05-20 13:14:26 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2013 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
+import Ubuntu.Components 0.1
+
+Item {
+    id: root
+
+    function reset() { launcher.y = root.height }
+
+    Rectangle {
+        id: launcher
+        color: "blue"
+        width: parent.width
+        height: units.gu(15)
+        x: 0
+        y: root.height
+
+        function followDragArea() {
+            if (dragArea.status === DirectionalDragArea.Rejected)
+                return root.height
+            else
+                return dragArea.distance > -height ?
+                            root.height + dragArea.distance
+                        :
+                            root.height - height
+        }
+    }
+
+    Rectangle {
+        id: dragAreaRect
+        opacity: 0.0
+        anchors.fill: dragArea
+    }
+
+    DirectionalDragArea {
+        id: dragArea
+        objectName: "vnDragArea"
+
+        height: units.gu(5)
+
+        direction: DirectionalDragArea.Upwards
+        maxDeviation: units.gu(2)
+        wideningAngle: 10
+        distanceThreshold: units.gu(4)
+
+        onStatusChanged: {
+            switch (status) {
+                case DirectionalDragArea.WaitingForTouch:
+                    dragAreaRect.opacity = 0.0
+                    break;
+                case DirectionalDragArea.Undecided:
+                    dragAreaRect.color = "yellow"
+                    dragAreaRect.opacity = 0.3
+                    launcher.y = Qt.binding(launcher.followDragArea)
+                    break;
+                case DirectionalDragArea.Recognized:
+                    dragAreaRect.color = "green"
+                    dragAreaRect.opacity = 0.5
+                    break;
+                default: //case DirectionalDragArea.Rejected:
+                    dragAreaRect.color = "red"
+                    dragAreaRect.opacity = 0.5
+                    launcher.y = -launcher.height
+                    break;
+            }
+        }
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+    }
+}
 
=== added file 'tests/plugins/Ubuntu/Gestures/edgeDragExample.qml'
--- tests/plugins/Ubuntu/Gestures/edgeDragExample.qml	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/edgeDragExample.qml	2013-05-20 13:14:26 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2013 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.Components 0.1
+
+Rectangle {
+    //width: units.gu(40)
+    //height: units.gu(71)
+    color: "white"
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: {
+            hpLauncher.reset()
+            hnLauncher.reset()
+            vpLauncher.reset()
+            vnLauncher.reset()
+        }
+    }
+
+    RightwardsLauncher { id: hpLauncher; anchors.fill: parent }
+    LeftwardsLauncher { id: hnLauncher; anchors.fill: parent }
+    DownwardsLauncher { id: vpLauncher; anchors.fill: parent }
+    UpwardsLauncher { id: vnLauncher; anchors.fill: parent }
+}
 
=== added file 'tests/plugins/Ubuntu/Gestures/tst_Damper.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_Damper.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_Damper.cpp	2013-05-20 13:14:26 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2013 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/QtTest>
+
+#include <Damper.h>
+
+class tst_Damper : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void negativeMovement();
+};
+
+void tst_Damper::negativeMovement()
+{
+    Damper<qreal> damper;
+
+    damper.setMaxDelta(3.0);
+    damper.reset(0.0);
+    damper.update(-5.0);
+    QCOMPARE(damper.value(), -2.0);
+}
+
+QTEST_MAIN(tst_Damper)
+
+#include "tst_Damper.moc"
 
=== added file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp'
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp	2013-05-20 13:14:26 +0000
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2013 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/QtTest>
+#include <QtCore/QObject>
+#include <qpa/qwindowsysteminterface.h>
+#include <QtQuick/QQuickView>
+#include <QtQml/QQmlEngine>
+
+#include <DirectionalDragArea.h>
+
+class tst_DirectionalDragArea: public QObject
+{
+    Q_OBJECT
+public:
+    tst_DirectionalDragArea() : device(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 edgeDrag();
+    void edgeDrag_data();
+    void dragWithShortDirectionChange();
+
+private:
+    QQuickView *createView();
+    QTouchDevice *device;
+};
+
+void tst_DirectionalDragArea::initTestCase()
+{
+    if (!device) {
+        device = new QTouchDevice;
+        device->setType(QTouchDevice::TouchScreen);
+        QWindowSystemInterface::registerTouchDevice(device);
+    }
+}
+
+void tst_DirectionalDragArea::cleanupTestCase()
+{
+}
+
+QQuickView *tst_DirectionalDragArea::createView()
+{
+    QQuickView *window = new QQuickView(0);
+    window->setResizeMode(QQuickView::SizeRootObjectToView);
+    window->resize(600, 600);
+    window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));
+
+    return window;
+}
+
+namespace {
+QPointF calculateInitialTouchPos(DirectionalDragArea *edgeDragArea, QQuickView *view)
+{
+    switch (edgeDragArea->direction()) {
+        case DirectionalDragArea::Upwards:
+            return QPointF(view->width()/2.0f, view->height() - (edgeDragArea->height()/2.0f));
+        case DirectionalDragArea::Downwards:
+            return QPointF(view->width()/2.0f, edgeDragArea->height()/2.0f);
+        case DirectionalDragArea::Leftwards:
+            return QPointF(view->width() - (edgeDragArea->width()/2.0f), view->height()/2.0f);
+        default: // DirectionalDragArea::Rightwards:
+            return QPointF(edgeDragArea->width()/2.0f, view->height()/2.0f);
+    }
+}
+
+QPointF calculateDirectionVector(DirectionalDragArea *edgeDragArea,
+                                 qreal wideningAngleMultiplier)
+{
+    qreal angleRadians = edgeDragArea->wideningAngle() * wideningAngleMultiplier
+        * M_PI / 180.0;
+
+    qreal angleCos = qCos(angleRadians);
+    qreal angleSin = qSin(angleRadians);
+
+    switch (edgeDragArea->direction()) {
+        case DirectionalDragArea::Upwards:
+            return QPointF(angleSin, -angleCos);
+        case DirectionalDragArea::Downwards:
+            return QPointF(angleSin, angleCos);
+        case DirectionalDragArea::Leftwards:
+            return QPointF(-angleCos, angleSin);
+        default: // DirectionalDragArea::Rightwards:
+            return QPointF(angleCos, angleSin);
+    }
+}
+
+QPointF createTouchDeviation(DirectionalDragArea *edgeDragArea)
+{
+    qreal deviation = edgeDragArea->maxDeviation() * 0.8;
+
+    if (edgeDragArea->direction() == DirectionalDragArea::Leftwards
+            || edgeDragArea->direction() == DirectionalDragArea::Rightwards) {
+        return QPointF(0, deviation);
+    } else {
+        return QPointF(deviation, 0);
+    }
+}
+}
+
+void tst_DirectionalDragArea::edgeDrag()
+{
+    QFETCH(QString, dragAreaObjectName);
+    QFETCH(qreal, wideningAngleMultiplier);
+    QFETCH(qreal, dragDistanceFactor);
+    QFETCH(int, expectedGestureRecognition);
+
+    QQuickView *view = createView();
+    QScopedPointer<QQuickView> scope(view);
+    view->setSource(QUrl::fromLocalFile("edgeDragExample.qml"));
+    view->show();
+    QVERIFY(QTest::qWaitForWindowExposed(view));
+    QVERIFY(view->rootObject() != 0);
+    qApp->processEvents();
+
+    DirectionalDragArea *edgeDragArea =
+        view->rootObject()->findChild<DirectionalDragArea*>(dragAreaObjectName);
+    QVERIFY(edgeDragArea != 0);
+
+    QSignalSpy draggingSpy(edgeDragArea, SIGNAL(draggingChanged(bool)));
+
+    QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
+    QPointF touchPoint = initialTouchPos;
+
+    qreal desiredDragDistance = edgeDragArea->distanceThreshold()*dragDistanceFactor;
+    QPointF dragDirectionVector = calculateDirectionVector(edgeDragArea,
+                                                           wideningAngleMultiplier);
+    QPointF touchMovement = dragDirectionVector * (edgeDragArea->distanceThreshold() * 0.1f);
+
+    QTest::touchEvent(view, device).press(0, touchPoint.toPoint());
+
+    QCOMPARE(draggingSpy.count(), 1);
+    QCOMPARE(edgeDragArea->dragging(), true);
+
+    if (wideningAngleMultiplier > 0) {
+        // go close to the border of the valid area for this touch point
+        // in order to make it easier to leave it by dragging at an angle
+        // slightly bigger than the widening angle
+        touchPoint += createTouchDeviation(edgeDragArea);
+        QTest::touchEvent(view, device).move(0, touchPoint.toPoint());
+    }
+
+    do {
+        touchPoint += touchMovement;
+        QTest::touchEvent(view, device).move(0, touchPoint.toPoint());
+    } while ((touchPoint - initialTouchPos).manhattanLength() < desiredDragDistance);
+
+    if (expectedGestureRecognition)
+        QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Recognized);
+
+    if (edgeDragArea->status() == DirectionalDragArea::Rejected)
+        QCOMPARE(edgeDragArea->dragging(), false);
+
+    QTest::touchEvent(view, device).release(0, touchPoint.toPoint());
+
+    QCOMPARE(draggingSpy.count(), 2);
+    QCOMPARE(edgeDragArea->dragging(), false);
+}
+
+void tst_DirectionalDragArea::edgeDrag_data()
+{
+    QTest::addColumn<QString>("dragAreaObjectName");
+    QTest::addColumn<qreal>("wideningAngleMultiplier");
+    QTest::addColumn<qreal>("dragDistanceFactor");
+    QTest::addColumn<int>("expectedGestureRecognition");
+
+    QTest::newRow("rightwards, tiny drag")
+        << "hpDragArea" << 0.0 << 0.2 << 0;
+
+    QTest::newRow("rightwards, straight drag")
+        << "hpDragArea" << 0.0 << 3.0 << 1;
+
+    QTest::newRow("rightwards, diagonal drag")
+        << "hpDragArea" << 0.9 << 3.0 << 1;
+
+    QTest::newRow("rightwards, overly diagonal drag")
+        << "hpDragArea" << 2.0 << 3.0 << 0;
+
+    QTest::newRow("leftwards, tiny drag")
+        << "hnDragArea" << 0.0 << 0.2 << 0;
+
+    QTest::newRow("leftwards, straight drag")
+        << "hnDragArea" << 0.0 << 3.0 << 1;
+
+    QTest::newRow("leftwards, diagonal drag")
+        << "hnDragArea" << 0.9 << 3.0 << 1;
+
+    QTest::newRow("downwards, tiny drag")
+        << "vpDragArea" << 0.0 << 0.2 << 0;
+
+    QTest::newRow("downwards, straight drag")
+        << "vpDragArea" << 0.0 << 3.0 << 1;
+
+    QTest::newRow("downwards, diagonal drag")
+        << "vpDragArea" << 0.9 << 3.0 << 1;
+
+    QTest::newRow("upwards, tiny drag")
+        << "vnDragArea" << 0.0 << 0.2 << 0;
+
+    QTest::newRow("upwards, straight drag")
+        << "vnDragArea" << 0.0 << 3.0 << 1;
+
+    QTest::newRow("upwards, diagonal drag")
+        << "vnDragArea" << 0.9 << 3.0 << 1;
+
+    QTest::newRow("upwards, overly diagonal drag")
+        << "vnDragArea" << 2.0 << 3.0 << 0;
+}
+
+/*
+  A directional drag should still be recognized if there is a momentaneous, small,
+  change in the direction of a drag. That should be accounted as input noise and
+  therefore ignored.
+ */
+void tst_DirectionalDragArea::dragWithShortDirectionChange()
+{
+    QQuickView *view = createView();
+    QScopedPointer<QQuickView> scope(view);
+    view->setSource(QUrl::fromLocalFile("edgeDragExample.qml"));
+    view->show();
+    QVERIFY(QTest::qWaitForWindowExposed(view));
+    QVERIFY(view->rootObject() != 0);
+    qApp->processEvents();
+
+    DirectionalDragArea *edgeDragArea =
+        view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");
+    QVERIFY(edgeDragArea != 0);
+
+    QPointF initialTouchPos = calculateInitialTouchPos(edgeDragArea, view);
+    QPointF touchPoint = initialTouchPos;
+
+    qreal desiredDragDistance = edgeDragArea->distanceThreshold()*2.0;
+    QPointF dragDirectionVector(1.0, 0.0);
+    QPointF touchMovement = dragDirectionVector * (edgeDragArea->distanceThreshold() * 0.1f);
+
+    QTest::touchEvent(view, device).press(0, touchPoint.toPoint());
+
+    // Move a bit in the proper direction
+    for (int i=0; i < 3; ++i) {
+        touchPoint += touchMovement;
+        QTest::touchEvent(view, device).move(0, touchPoint.toPoint());
+    }
+
+    // Then a sudden and small movement to the opposite direction
+    touchPoint -= dragDirectionVector * (edgeDragArea->maxDeviation() * 0.7);
+    QTest::touchEvent(view, device).move(0, touchPoint.toPoint());
+
+    // And then resume movment in the correct direction until it crosses the distance threshold.
+    do {
+        touchPoint += touchMovement;
+        QTest::touchEvent(view, device).move(0, touchPoint.toPoint());
+    } while ((touchPoint - initialTouchPos).manhattanLength() < desiredDragDistance);
+
+    QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Recognized);
+
+    QTest::touchEvent(view, device).release(0, touchPoint.toPoint());
+}
+
+QTEST_MAIN(tst_DirectionalDragArea)
+
+#include "tst_DirectionalDragArea.moc"